Changeset 14411 in josm

Timestamp:

2018-11-04T20:51:19+01:00 (6 years ago)

Author:

wiktorn

Message:

Skip unkown tags in WMS Getcapabilities

In Layer definition, if there is any other tag than ones that are interpreted,
move to the end of the tag, as it may be complex tag and affect further parsing.

Closes: #16940

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (2 diffs)
• test/data/regress/16940 (added)
• test/data/regress/16940/capabilities.xml (added)
• test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -461 +461 @@
                 if (tagEquals(QN_NAME, reader.getName())) {
                     ret.setName(reader.getElementText());
-                }
-                if (tagEquals(QN_ABSTRACT, reader.getName())) {
+                } else if (tagEquals(QN_ABSTRACT, reader.getName())) {
                     ret.setAbstract(GetCapabilitiesParseHelper.getElementTextWithSubtags(reader));
-                }
-                if (tagEquals(QN_TITLE, reader.getName())) {
+                } else if (tagEquals(QN_TITLE, reader.getName())) {
                     ret.setTitle(reader.getElementText());
-                }
-                if (tagEquals(QN_CRS, reader.getName())) {
+                } else if (tagEquals(QN_CRS, reader.getName())) {
                     ret.addCrs(reader.getElementText());
-                }
-                if (tagEquals(QN_SRS, reader.getName()) && belowWMS130()) {
+                } else if (tagEquals(QN_SRS, reader.getName()) && belowWMS130()) {
                     ret.addCrs(reader.getElementText());
-                }
-                if (tagEquals(QN_STYLE, reader.getName())) {
+                } else if (tagEquals(QN_STYLE, reader.getName())) {
                     parseAndAddStyle(reader, ret);
-                }
-                if (tagEquals(QN_LAYER, reader.getName())) {
+                } else if (tagEquals(QN_LAYER, reader.getName())) {
                     parseLayer(reader, ret);
-                }
-                if (tagEquals(QN_EX_GEOGRAPHIC_BBOX, reader.getName()) && ret.getBounds() == null) {
+                } else if (tagEquals(QN_EX_GEOGRAPHIC_BBOX, reader.getName()) && ret.getBounds() == null) {
                     ret.setBounds(parseExGeographic(reader));
-                }
-                if (tagEquals(QN_BOUNDINGBOX, reader.getName())) {
+                } else if (tagEquals(QN_BOUNDINGBOX, reader.getName())) {
                     Projection conv;
                     if (belowWMS130()) {
@@ -493 +485 @@
                         ret.setBounds(parseBoundingBox(reader, conv));
                     }
-                }
-                if (tagEquals(QN_LATLONBOUNDINGBOX, reader.getName()) && belowWMS130() && ret.getBounds() == null) {
+                } else if (tagEquals(QN_LATLONBOUNDINGBOX, reader.getName()) && belowWMS130() && ret.getBounds() == null) {
                     ret.setBounds(parseBoundingBox(reader, null));
+                } else {
+                    // unknown tag, move to its end as it may have child elements
+                    GetCapabilitiesParseHelper.moveReaderToEndCurrentTag(reader);
                 }
             }

trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java

@@ -118 +118 @@
         assertEquals("bag:Matching Street", wms.getLayers().get(0).getChildren().get(0).getName());
         assertEquals("Dichtstbijzijnde straat", wms.getLayers().get(0).getChildren().get(0).getTitle());
+    }
 
+    @Test
+    public void testForTitleWithinAttribution_ticket16940() throws IOException, WMSGetCapabilitiesException {
+        tileServer.stubFor(
+                WireMock.get(WireMock.anyUrl())
+                .willReturn(WireMock.aResponse().withBody(
+                        Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(16940, "capabilities.xml")))
+                ))
+        );
+        WMSImagery wms = new WMSImagery(tileServer.url("any"));
+        assertEquals("Hipsográfico", wms.getLayers().stream().findFirst().get().getTitle());
     }
 }