[MOD] fn:parse-xml: dynamic permission check; use local defaults

Author: ChristianGruen

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

@@ -16,18 +16,19 @@ public final class FnParseXml extends FnParseXmlFragment {
   /** Function options. */
   public static final class ParseXmlOptions extends ParseXmlFragmentOptions {
     /** DTD validation. */
-    public static final BooleanOption DTD_VALIDATION = new BooleanOption("dtd-validation");
+    public static final BooleanOption DTD_VALIDATION = new BooleanOption("dtd-validation", false);
     /** XSD validation. */
-    public static final StringOption XSD_VALIDATION = new StringOption("xsd-validation");
+    public static final StringOption XSD_VALIDATION = new StringOption("xsd-validation",
+        MainOptions.SKIP);
 
-    /** Use internal XML parser (default: {@link MainOptions#INTPARSE}). */
-    public static final BooleanOption INTPARSE = new BooleanOption("intparse");
-    /** Flag for parsing DTDs (default: {@link MainOptions#DTD}). */
-    public static final BooleanOption DTD = new BooleanOption("dtd");
-    /** Flag for using XInclude (default: {@link MainOptions#XINCLUDE}). */
-    public static final BooleanOption XINCLUDE = new BooleanOption("xinclude");
-    /** Path to XML Catalog file (default: {@link MainOptions#CATALOG}). */
-    public static final StringOption CATALOG = new StringOption("catalog");
+    /** Custom option (see {@link MainOptions#INTPARSE}). */
+    public static final BooleanOption INTPARSE = new BooleanOption("intparse", false);
+    /** Custom option (see {@link MainOptions#DTD}). */
+    public static final BooleanOption DTD = new BooleanOption("dtd", false);
+    /** Custom option (see {@link MainOptions#XINCLUDE}). */
+    public static final BooleanOption XINCLUDE = new BooleanOption("xinclude", false);
+    /** Custom option (see {@link MainOptions#CATALOG}). */
+    public static final StringOption CATALOG = new StringOption("catalog", "");
   }
 
   @Override

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

@@ -37,8 +37,8 @@ public static class ParseXmlFragmentOptions extends Options {
     /** Remove whitespace-only text nodes. */
     public static final BooleanOption STRIP_SPACE = new BooleanOption("strip-space", false);
 
-    /** Strip namespaces (default: {@link MainOptions#STRIPNS}). */
-    public static final BooleanOption STRIPNS = new BooleanOption("stripns");
+    /** Custom option (see {@link MainOptions#STRIPNS}). */
+    public static final BooleanOption STRIPNS = new BooleanOption("stripns", false);
   }
 
   @Override
@@ -83,7 +83,8 @@ final Item parseXml(final QueryContext qc, final boolean fragment,
         ParseXmlOptions.CATALOG, MainOptions.CATALOG).forEach((opt, mopt) -> {
       if(options.contains(opt)) mopts.set(mopt, options.get(opt));
     });
-    if(mopts.get(MainOptions.DTD) || mopts.get(MainOptions.XINCLUDE)) checkPerm(qc, Perm.CREATE);
+    if(mopts.get(MainOptions.DTD) || mopts.get(MainOptions.XINCLUDE) ||
+        !mopts.get(MainOptions.CATALOG).isEmpty()) checkPerm(qc, Perm.CREATE);
 
     final boolean dtdVal = mopts.get(MainOptions.DTDVALIDATION);
     final String xsdVal = mopts.get(MainOptions.XSDVALIDATION);

basex-core/src/test/java/org/basex/query/func/FnModuleTest.java

@@ -2326,7 +2326,7 @@ public final class FnModuleTest extends SandboxTest {
         + "'/></a>", " {'xinclude': 'no'}"), "<a xmlns:xi=\"http://www.w3.org/2001/XInclude\">"
         + "<xi:include href=\"" + path + "\"/></a>");
     query(func.args("<a xmlns:xi='http://www.w3.org/2001/XInclude'><xi:include href='" + path
-        + "'/></a>"), "<a xmlns:xi=\"http://www.w3.org/2001/XInclude\">"
+        + "'/></a>", " {'xinclude': 'yes'}"), "<a xmlns:xi=\"http://www.w3.org/2001/XInclude\">"
         + "<b xml:base=\"src/test/resources/parse-xml.entity\"/></a>");
 
     error(func.args(dtd + "<b>&amp;e;</b>", " {'dtd-validation': 'yes'}"), DTDVALIDATIONERR_X);