From 6ef2d3457931d0cfed5319fd4b1899a10c7fc70c Mon Sep 17 00:00:00 2001 From: Jody Garnett Date: Wed, 3 Jun 2026 22:58:13 -0700 Subject: [PATCH] Make use of XMLUtils.supportDTD to maintain WMS DTD support --- .../service/wms/WMSGetCapabilitiesTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java b/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java index d2d384af9d..7cb3702fe9 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java @@ -16,7 +16,11 @@ import java.util.HashMap; import java.util.Map; import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import org.easymock.EasyMock; +import org.geotools.util.InternalEntityResolver; +import org.geotools.util.factory.GeoTools; +import org.geotools.util.factory.Hints; import org.geotools.xml.XMLUtils; import org.geowebcache.config.DefaultGridsets; import org.geowebcache.config.legends.LegendRawInfo; @@ -120,7 +124,11 @@ public void testEscapeXMLChars() throws Exception { String xml = capabilities.generateGetCapabilities(StandardCharsets.UTF_8); - DocumentBuilder builder = XMLUtils.newDocumentBuilder(); + DocumentBuilderFactory factory = XMLUtils.newDocumentBuilderFactory(); + + Hints hints = GeoTools.addDefaultHints(new Hints(Hints.ENTITY_RESOLVER, InternalEntityResolver.INSTANCE)); + XMLUtils.supportDTD(factory, true, hints); + DocumentBuilder builder = XMLUtils.newDocumentBuilder(factory, hints); InputSource is = new InputSource(); is.setCharacterStream(new StringReader(xml)); Document document = builder.parse(is);