Changeset 14441 in josm

Timestamp:

2018-11-22T00:34:59+01:00 (6 years ago)

Author:

Don-vip

Message:

fix SonarQube issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/preferences/PreferencesReader.java (modified) (2 diffs)
• tools/OptionParser.java (modified) (1 diff)
• tools/XmlUtils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java

@@ -26 +26 @@
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
-import javax.xml.validation.Validator;
 
 import org.openstreetmap.josm.io.CachedFile;
@@ -97 +96 @@
         try (CachedFile cf = new CachedFile("resource://data/preferences.xsd"); InputStream xsdStream = cf.getInputStream()) {
             Schema schema = XmlUtils.newXmlSchemaFactory().newSchema(new StreamSource(xsdStream));
-            Validator validator = schema.newValidator();
-            validator.validate(new StreamSource(in));
+            XmlUtils.newSafeValidator(schema).validate(new StreamSource(in));
         }
     }

trunk/src/org/openstreetmap/josm/tools/OptionParser.java

@@ -64 +64 @@
     public OptionParser addFlagParameter(String optionName, Runnable handler) {
         checkOptionName(optionName);
-        availableOptions.put("--" + optionName, new AvailableOption() {
-            @Override
-            public void runFor(String parameter) {
-                handler.run();
-            }
-        });
+        availableOptions.put("--" + optionName, parameter -> handler.run());
         return this;
     }

trunk/src/org/openstreetmap/josm/tools/XmlUtils.java

@@ -14 +14 @@
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
+import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.SchemaFactoryConfigurationError;
+import javax.xml.validation.Validator;
 
 import org.w3c.dom.Document;
@@ -23 +25 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -146 +150 @@
 
     /**
+     * Returns a new secure {@link Validator}.
+     * @param schema XML schema
+     * @return a new secure {@link Validator}
+     * @since 14441
+     */
+    public static Validator newSafeValidator(Schema schema) {
+        Validator validator = schema.newValidator();
+        try {
+            validator.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+            validator.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+        } catch (SAXNotRecognizedException | SAXNotSupportedException e) {
+            // All implementations that implement JAXP 1.5 or newer are required to support these two properties
+            Logging.trace(e);
+        }
+        return validator;
+    }
+
+    /**
      * Get the first child element
      * @param parent parent node