Changeset 13901 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-06-08T22:43:20+02:00 (6 years ago)

Author:

Don-vip

Message:

add new XmlUtils class with more "safe factories" methods

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• imagery/GetCapabilitiesParseHelper.java (modified) (2 diffs)
• preferences/PreferencesReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java

@@ -9 +9 @@
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.XmlUtils;
 
 /**
@@ -82 +82 @@
      */
     public static XMLStreamReader getReader(InputStream in) throws XMLStreamException {
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        // do not try to load external entities, nor validate the XML
-        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
-        factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
-        return factory.createXMLStreamReader(in);
+        return XmlUtils.newSafeXMLInputFactory().createXMLStreamReader(in);
     }
 

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

@@ -21 +21 @@
 
 import javax.xml.XMLConstants;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -37 +36 @@
 import org.openstreetmap.josm.spi.preferences.StringSetting;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.XmlUtils;
 import org.xml.sax.SAXException;
 
@@ -97 +96 @@
     public static void validateXML(Reader in) throws IOException, SAXException {
         try (CachedFile cf = new CachedFile("resource://data/preferences.xsd"); InputStream xsdStream = cf.getInputStream()) {
-            Schema schema = Utils.newXmlSchemaFactory().newSchema(new StreamSource(xsdStream));
+            Schema schema = XmlUtils.newXmlSchemaFactory().newSchema(new StreamSource(xsdStream));
             Validator validator = schema.newValidator();
             validator.validate(new StreamSource(in));
@@ -127 +126 @@
     public void parse() throws XMLStreamException, IOException {
         if (reader != null) {
-            this.parser = XMLInputFactory.newInstance().createXMLStreamReader(reader);
+            this.parser = XmlUtils.newSafeXMLInputFactory().createXMLStreamReader(reader);
             doParse();
         } else {
             try (BufferedReader in = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
-                this.parser = XMLInputFactory.newInstance().createXMLStreamReader(in);
+                this.parser = XmlUtils.newSafeXMLInputFactory().createXMLStreamReader(in);
                 doParse();
             }