This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/commons-xml.git
commit 7c82c2d53254ac82a384dd66f1a8a3ae83c43cf5 Author: Gary Gregory <[email protected]> AuthorDate: Fri Aug 28 17:54:23 2026 -0400 Javadoc: Use "secure" terminology. --- .../java/org/apache/commons/xml/XIncludeTest.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/apache/commons/xml/XIncludeTest.java b/src/test/java/org/apache/commons/xml/XIncludeTest.java index f883ad1..23529bc 100644 --- a/src/test/java/org/apache/commons/xml/XIncludeTest.java +++ b/src/test/java/org/apache/commons/xml/XIncludeTest.java @@ -253,10 +253,10 @@ void secureDomWithAllowListResolvesParseXml() throws Exception { void secureReaderAllowListResolvesParseXml() throws Exception { final String input = xiIncludeXml(REFERENCED_XML, "xml"); - final SAXParserFactory unhardenedFactory = SAXParserFactory.newInstance(); - unhardenedFactory.setNamespaceAware(true); - assumeXIncludeAware(unhardenedFactory); - final XMLReader reader = SecureSAXParserFactory.secure(unhardenedFactory.newSAXParser().getXMLReader()); + final SAXParserFactory unsecuredFactory = SAXParserFactory.newInstance(); + unsecuredFactory.setNamespaceAware(true); + assumeXIncludeAware(unsecuredFactory); + final XMLReader reader = SecureSAXParserFactory.secure(unsecuredFactory.newSAXParser().getXMLReader()); reader.setEntityResolver(new AllowListResolver()); final String captured = captureCharacters(reader, input); assertEquals(RESOLVED_MARKER, captured.trim(), @@ -268,10 +268,10 @@ void secureReaderAllowListResolvesParseXml() throws Exception { void secureReaderBlocksParseText() throws Exception { final String input = xiIncludeXml(REFERENCED_TEXT, "text"); - final SAXParserFactory unhardenedFactory = SAXParserFactory.newInstance(); - unhardenedFactory.setNamespaceAware(true); - assumeXIncludeAware(unhardenedFactory); - final XMLReader reader = SecureSAXParserFactory.secure(unhardenedFactory.newSAXParser().getXMLReader()); + final SAXParserFactory unsecuredFactory = SAXParserFactory.newInstance(); + unsecuredFactory.setNamespaceAware(true); + assumeXIncludeAware(unsecuredFactory); + final XMLReader reader = SecureSAXParserFactory.secure(unsecuredFactory.newSAXParser().getXMLReader()); final String captured = captureCharacters(reader, input); assertFalse(captured.contains(LEAKED_MARKER), "hardenReader parse=text must resolve the include to empty, not leak; got: " + captured); @@ -282,11 +282,11 @@ void secureReaderBlocksParseText() throws Exception { void secureReaderBlocksParseXml() throws Exception { final InputSource input = inputSource(xiIncludeXml(REFERENCED_XML, "xml")); - // Reader from an unhardened factory that already has XInclude enabled - final SAXParserFactory unhardenedFactory = SAXParserFactory.newInstance(); - unhardenedFactory.setNamespaceAware(true); - assumeXIncludeAware(unhardenedFactory); - final XMLReader reader = SecureSAXParserFactory.secure(unhardenedFactory.newSAXParser().getXMLReader()); + // Reader from an unsecured factory that already has XInclude enabled + final SAXParserFactory unsecuredFactory = SAXParserFactory.newInstance(); + unsecuredFactory.setNamespaceAware(true); + assumeXIncludeAware(unsecuredFactory); + final XMLReader reader = SecureSAXParserFactory.secure(unsecuredFactory.newSAXParser().getXMLReader()); assertThrows(SAXException.class, () -> reader.parse(input), "hardenReader should block XInclude parse=xml on reader with XInclude already enabled"); }
