Changeset 32130 in osm for applications/editors/josm/plugins

Timestamp:

2016-03-27T23:17:02+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm12694 - robustness to invalid KML colors

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (modified) (5 diffs)
• test/data/regress/12694 (added)
• test/data/regress/12694/Alvinรณpolis_314946.kml (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import javax.xml.stream.FactoryConfigurationError;
@@ -32 +33 @@
 
     public static final String KML_PLACEMARK   = "Placemark";
-    public static final String KML_NAME           = "name";
+    public static final String KML_NAME        = "name";
     public static final String KML_COLOR       = "color";
     public static final String KML_SIMPLE_DATA = "SimpleData";
@@ -43 +44 @@
     public static final String KML_COORDINATES = "coordinates";
     
+    public static Pattern COLOR_PATTERN = Pattern.compile("\\p{XDigit}{8}");
 
     private XMLStreamReader parser;
@@ -54 +56 @@
         InputStreamReader ir = UTFInputStreamReader.create(in);
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir);
-        //XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(in, UTF8);
         return new KmlReader(parser).parseDoc();
     }
@@ -92 +93 @@
                 if (parser.getLocalName().equals(KML_COLOR)) {
                     String s = parser.getElementText();
-                    // KML color format is aabbggrr, convert it to OSM (web) format: #rrggbb
-                    String rgbColor = '#'+s.substring(6,8)+s.substring(4,6)+s.substring(2,4);
-                    tags.put(KML_COLOR, rgbColor);
+                    if (COLOR_PATTERN.matcher(s).matches()) {
+                        // KML color format is aabbggrr, convert it to OSM (web) format: #rrggbb
+                        tags.put(KML_COLOR, '#'+s.substring(6,8)+s.substring(4,6)+s.substring(2,4));
+                    }
                 } else if (parser.getLocalName().equals(KML_NAME)) {
                     tags.put(KML_NAME, parser.getElementText());

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.core.io.geographic;
 
-import java.io.File;
-import java.io.FileInputStream;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.io.InputStream;
@@ -28 +29 @@
         JOSMFixture.createUnitTestFixture().init();
     }
+
+    /**
+     * Unit test of {@link KmlReader#COLOR_PATTERN}
+     */
+    @Test
+    public void testColorPattern() {
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("00112233").matches());
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("44556677").matches());
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("8899aabb").matches());
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("CCDDEEFF").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("0011223").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("001122330").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("gg112233").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("red").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("yellow").matches());
+    }
     
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12694">#12694</a>
+     * @throws IOException if an error occurs during reading
+     */
+    @Test
+    public void testTicket12694() throws IOException, XMLStreamException, FactoryConfigurationError {
+        try (InputStream is = TestUtils.getRegressionDataStream(12694, "Alvinรณpolis_314946.kml")) {
+            NonRegFunctionalTests.testGeneric("#12694", KmlReader.parseDataSet(is, null));
+        }
+    }
+
     /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a>
@@ -39 +67 @@
         }
     }
-    
+
     /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/7714">#7714</a>