[DEL] fn:doc: options dropped. qt#2223

Author: ChristianGruen

basex-core/src/main/java/org/basex/core/CommonOptions.java

@@ -16,12 +16,8 @@ public interface CommonOptions {
   /** XSD validation option value. */
   String STRICT = "strict";
 
-  /** Internal option: {@link MainOptions#EXTERNALENT}. */
-  BooleanOption ALLOW_EXTERNAL_ENTITIES = new BooleanOption("allow-external-entities", true);
   /** Internal option: {@link MainOptions#DTDVALIDATION}. */
   BooleanOption DTD_VALIDATION = new BooleanOption("dtd-validation", false);
-  /** Internal option: {@link MainOptions#ENTEXPANSION}. */
-  NumberOption ENTITY_EXPANSION_LIMIT = new NumberOption("entity-expansion-limit", -1);
   /** Internal option: {@link MainOptions#STRIPNS}. */
   BooleanOption STRIP_SPACE = new BooleanOption("strip-space", false);
   /** Internal option: {@link MainOptions#XINCLUDE}. */

basex-core/src/main/java/org/basex/core/MainOptions.java

@@ -61,10 +61,6 @@ public final class MainOptions extends Options {
   public static final BooleanOption STRIPWS = new BooleanOption("STRIPWS", false);
   /** Strip namespaces. */
   public static final BooleanOption STRIPNS = new BooleanOption("STRIPNS", false);
-  /** Whether external entities are permitted or rejected. */
-  public static final BooleanOption EXTERNALENT = new BooleanOption("EXTENTITIES", true);
-  /** Limit on the maximum number of entity references that may be expanded. */
-  public static final NumberOption ENTEXPANSION = new NumberOption("ENTEXPANSION", -1);
   /** Flag for parsing DTDs. */
   public static final BooleanOption DTD = new BooleanOption("DTD", false);
   /** Flag for DTD validation. */
@@ -204,8 +200,6 @@ public final class MainOptions extends Options {
     XMLPARSINGMAP.put(CommonOptions.INTPARSE, INTPARSE);
     XMLPARSINGMAP.put(CommonOptions.STRIP_SPACE, STRIPWS);
     XMLPARSINGMAP.put(CommonOptions.STRIPNS, STRIPNS);
-    XMLPARSINGMAP.put(CommonOptions.ALLOW_EXTERNAL_ENTITIES, EXTERNALENT);
-    XMLPARSINGMAP.put(CommonOptions.ENTITY_EXPANSION_LIMIT, ENTEXPANSION);
     XMLPARSINGMAP.put(CommonOptions.DTD, DTD);
     XMLPARSINGMAP.put(CommonOptions.DTD_VALIDATION, DTDVALIDATION);
     XMLPARSINGMAP.put(CommonOptions.XSD_VALIDATION, XSDVALIDATION);

basex-core/src/main/java/org/basex/io/parse/xml/XmlParser.java

@@ -60,21 +60,17 @@ public void parse(final InputStream stream) throws IOException, SAXException {
   public static XMLReader reader(final MainOptions options)
       throws SAXException, ParserConfigurationException {
 
-    final int entExpansion = options.get(MainOptions.ENTEXPANSION);
-    final boolean extEntities = options.get(MainOptions.EXTERNALENT);
     final boolean dtd = options.get(MainOptions.DTD);
     final boolean dtdValidation = options.get(MainOptions.DTDVALIDATION);
     final boolean xinclude = options.get(MainOptions.XINCLUDE);
     final boolean xsdValidation = CommonOptions.STRICT.equals(
         options.get(MainOptions.XSDVALIDATION));
     final boolean xsiLocation = options.get(MainOptions.XSILOCATION);
     final SAXParserFactory f = SAXParserFactory.newDefaultInstance();
-    if(extEntities) {
-      // setting these options to false will ignore external entities, rather than rejecting them
-      f.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", dtd);
-      f.setFeature("http://xml.org/sax/features/external-general-entities", dtd);
-      f.setFeature("http://xml.org/sax/features/external-parameter-entities", dtd);
-    }
+    // setting these options to false will ignore external entities, rather than rejecting them
+    f.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", dtd);
+    f.setFeature("http://xml.org/sax/features/external-general-entities", dtd);
+    f.setFeature("http://xml.org/sax/features/external-parameter-entities", dtd);
     f.setFeature("http://xml.org/sax/features/validation", dtdValidation);
     f.setFeature("http://xml.org/sax/features/use-entity-resolver2", false);
     f.setNamespaceAware(true);
@@ -86,9 +82,7 @@ public static XMLReader reader(final MainOptions options)
       f.setSchema(sf.newSchema());
     }
     final XMLReader xr = f.newSAXParser().getXMLReader();
-    if(entExpansion != -1) xr.setProperty(
-        "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit", entExpansion);
-    if(xsdValidation && !xsiLocation || !extEntities) {
+    if(xsdValidation && !xsiLocation) {
       xr.setEntityResolver((pubId, sysId) -> {
         throw new SAXException("External access not allowed: " + sysId);
       });

basex-core/src/main/java/org/basex/query/func/fn/DocOptions.java

@@ -16,10 +16,6 @@
 public final class DocOptions extends Options {
   /** DTD validation. */
   public static final BooleanOption DTD_VALIDATION = CommonOptions.DTD_VALIDATION;
-  /** Whether external entities are permitted or rejected. */
-  public static final BooleanOption ALLOW_EXTERNAL_ENTITIES = CommonOptions.ALLOW_EXTERNAL_ENTITIES;
-  /** Limit on the maximum number of entity references that may be expanded. */
-  public static final NumberOption ENTITY_EXPANSION_LIMIT = CommonOptions.ENTITY_EXPANSION_LIMIT;
   /** Remove whitespace-only text nodes. */
   public static final BooleanOption STRIP_SPACE = CommonOptions.STRIP_SPACE;
   /** Flag for using XInclude. */

basex-core/src/main/java/org/basex/query/func/fn/Docs.java

@@ -92,9 +92,7 @@ void check(final Options options, final boolean fragment, final QueryContext qc)
     final Predicate<BooleanOption> bool = o -> options.get(o) == Boolean.TRUE;
     final boolean dtd = bool.test(CommonOptions.DTD) || bool.test(MainOptions.DTD);
     final boolean xinclude = bool.test(CommonOptions.XINCLUDE) || bool.test(MainOptions.XINCLUDE);
-    final boolean externalent = bool.test(CommonOptions.ALLOW_EXTERNAL_ENTITIES) ||
-        bool.test(MainOptions.EXTERNALENT);
-    if(dtd || xinclude || externalent) checkPerm(qc, Perm.CREATE);
+    if(dtd || xinclude) checkPerm(qc, Perm.CREATE);
 
     final boolean intparse = fragment || bool.test(CommonOptions.INTPARSE) ||
         bool.test(MainOptions.INTPARSE);

basex-core/src/main/java/org/basex/query/func/fn/FnParseXml.java

@@ -17,11 +17,6 @@ public final class FnParseXml extends FnParseXmlFragment {
   public static final class ParseXmlOptions extends ParseXmlFragmentOptions {
     /** DTD validation. */
     public static final BooleanOption DTD_VALIDATION = CommonOptions.DTD_VALIDATION;
-    /** Whether external entities are permitted. */
-    public static final BooleanOption ALLOW_EXTERNAL_ENTITIES =
-        CommonOptions.ALLOW_EXTERNAL_ENTITIES;
-    /** Limit on the maximum number of entity references that may be expanded. */
-    public static final NumberOption ENTITY_EXPANSION_LIMIT = CommonOptions.ENTITY_EXPANSION_LIMIT;
     /** Whether any xi:include elements in the input are to be processed. */
     public static final BooleanOption XINCLUDE = CommonOptions.XINCLUDE;
     /** XSD validation. */

basex-core/src/test/java/org/basex/core/CatalogTest.java

@@ -1,6 +1,5 @@
 package org.basex.core;
 
-import static org.basex.query.QueryError.*;
 import static org.basex.query.func.Function.*;
 
 import org.basex.*;
@@ -107,8 +106,6 @@ public final class CatalogTest extends SandboxTest {
     set(MainOptions.CATALOG, CATALOG);
     query(func.args("http://doc.xml", " { 'dtd': true() }"), "<doc>X</doc>");
     query(func.args("http://doc.xml", " { 'dtd': false() }"), "<doc/>");
-    query(func.args("http://doc.xml", " { 'allow-external-entities': true() }"), "<doc>X</doc>");
-    error(func.args("http://doc.xml", " { 'allow-external-entities': false() }"), IOERR_X);
   }
 
   /** Test method.*/
@@ -120,9 +117,5 @@ public final class CatalogTest extends SandboxTest {
         " { 'dtd': true() }"), "<doc>X</doc>");
     query(func.args("<!DOCTYPE xml SYSTEM 'http://dtd.dtd'><doc>&amp;x;</doc>",
         " { 'dtd': 'no' }"), "<doc/>");
-    query(func.args("<!DOCTYPE xml SYSTEM 'http://dtd.dtd'><doc>&amp;x;</doc>",
-        " { 'allow-external-entities': true() }"), "<doc>X</doc>");
-    error(func.args("<!DOCTYPE xml SYSTEM 'http://dtd.dtd'><doc>&amp;x;</doc>",
-        " { 'allow-external-entities': 'no' }"), SAXERR_X);
   }
 }