Skip to content

Commit

Permalink
eclipse-ee4j#606: make XmlUtil.newXMLInputFactory consistent with ot…
Browse files Browse the repository at this point in the history 
…her methods

Signed-off-by: Lukas Jungmann <[email protected]>
(cherry picked from commit 24d31bb)
  • Loading branch information
@lukasj
lukasj committed Feb 2, 2023
1 parent 88b967c commit a56a696
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 66 deletions.
6 changes: 3 additions & 3 deletions ...et/src/main/java/com/sun/xml/ws/transport/httpspi/servlet/DeploymentDescriptorParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -47,8 +47,8 @@ public class DeploymentDescriptorParser<A> {
private final ResourceLoader loader;
private final AdapterFactory<A> adapterFactory;

// securite xml processing always enabled - parsing deployment descriptor ...
private static final XMLInputFactory xif = XmlUtil.newXMLInputFactory(true);
// secure xml processing always enabled - parsing deployment descriptor ...
private static final XMLInputFactory xif = XmlUtil.newXMLInputFactory(false);

/**
* Endpoint names that are declared.
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/api/streaming/XMLStreamReaderFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private static XMLInputFactory getXMLInputFactory() {
}
}
if (xif == null) {
xif = XmlUtil.newXMLInputFactory(true);
xif = XmlUtil.newXMLInputFactory(false);
}
xif.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/assembler/MetroConfigLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private static MetroConfig loadMetroConfig(@NotNull URL resourceUrl) {
try (InputStream is = getConfigInputStream(resourceUrl)) {
JAXBContext jaxbContext = createJAXBContext();
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
XMLInputFactory factory = XmlUtil.newXMLInputFactory(true);
XMLInputFactory factory = XmlUtil.newXMLInputFactory(false);
JAXBElement<MetroConfig> configElement = unmarshaller.unmarshal(factory.createXMLStreamReader(is), MetroConfig.class);
return configElement.getValue();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/commons/xmlutil/Converter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public static byte[] toBytes(Message message, String encoding) throws XMLStreamE
* @return {@link com.sun.xml.ws.api.message.Message} object created from the data stream
*/
public static Message toMessage(@NotNull InputStream dataStream, String encoding) throws XMLStreamException {
XMLStreamReader xsr = XmlUtil.newXMLInputFactory(true).createXMLStreamReader(dataStream, encoding);
XMLStreamReader xsr = XmlUtil.newXMLInputFactory(false).createXMLStreamReader(dataStream, encoding);
return Messages.create(xsr);
}

Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/policy/jaxws/PolicyWSDLParserExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ private boolean readExternalFile(final String fileUrl) {
try {
final URL xmlURL = new URL(fileUrl);
ios = xmlURL.openStream();
reader = XmlUtil.newXMLInputFactory(true).createXMLStreamReader(ios);
reader = XmlUtil.newXMLInputFactory(false).createXMLStreamReader(ios);
while (reader.hasNext()) {
if (reader.isStartElement() && NamespaceVersion.resolveAsToken(reader.getName()) == XmlToken.Policy) {
readSinglePolicy(policyReader.readPolicyElement(reader, fileUrl), false);
Expand Down
42 changes: 21 additions & 21 deletions jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/server/EndpointFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -94,7 +94,7 @@
*/
public class EndpointFactory {
private static final EndpointFactory instance = new EndpointFactory();

public static EndpointFactory getInstance() {
return instance;
}
Expand Down Expand Up @@ -304,7 +304,7 @@ public <T> WSEndpoint<T> create(
}

protected <T> WSEndpoint<T> create(QName serviceName, QName portName, WSBinding binding, Container container, SEIModel seiModel, WSDLPort wsdlPort, Class<T> implType, ServiceDefinitionImpl serviceDefinition, EndpointAwareTube terminal, boolean isTransportSynchronous, PolicyMap policyMap) {
return new WSEndpointImpl<T>(serviceName, portName, binding, container, seiModel,
return new WSEndpointImpl<T>(serviceName, portName, binding, container, seiModel,
wsdlPort, implType, serviceDefinition, terminal, isTransportSynchronous, policyMap);
}

Expand Down Expand Up @@ -357,24 +357,24 @@ public Iterator<SDDocumentImpl> iterator() {
break;
}
}

if (doc == null) {
// old metadata doesn't have this imported doc, may be external
if (resolver != null) {
try {
InputSource source = resolver.resolveEntity(null, url);
if (source != null) {
MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
XMLStreamReader reader = XmlUtil.newXMLInputFactory(true).createXMLStreamReader(source.getByteStream());
xsb.createFromXMLStreamReader(reader);
SDDocumentSource sdocSource = SDDocumentImpl.create(new URL(url), xsb);
doc = SDDocumentImpl.create(sdocSource, null, null);
}
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (resolver != null) {
try {
InputSource source = resolver.resolveEntity(null, url);
if (source != null) {
MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
XMLStreamReader reader = XmlUtil.newXMLInputFactory(false).createXMLStreamReader(source.getByteStream());
xsb.createFromXMLStreamReader(reader);

SDDocumentSource sdocSource = SDDocumentImpl.create(new URL(url), xsb);
doc = SDDocumentImpl.create(sdocSource, null, null);
}
} catch (Exception ex) {
ex.printStackTrace();
}
}
}
}
// Check if new metadata already contains this doc
Expand All @@ -383,7 +383,7 @@ public Iterator<SDDocumentImpl> iterator() {
remaining.addAll(doc.getImports());
}
}

return newMap.values().iterator();
}

Expand Down Expand Up @@ -881,7 +881,7 @@ public Iterator<T> iterator() {
final Iterator<Collection<? extends T>> colIt = cols.iterator();
return new Iterator<T>() {
private Iterator<? extends T> current = null;

@Override
public boolean hasNext() {
if (current == null || !current.hasNext()) {
Expand Down
42 changes: 5 additions & 37 deletions jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/util/xml/XmlUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,7 @@
*/
public class XmlUtil {

// not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used
private static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";

private final static String LEXICAL_HANDLER_PROPERTY =
"http://xml.org/sax/properties/lexical-handler";
private final static String LEXICAL_HANDLER_PROPERTY = "http://xml.org/sax/properties/lexical-handler";

private static final String DISALLOW_DOCTYPE_DECL = "http://apache.org/xml/features/disallow-doctype-decl";
private static final String EXTERNAL_GE = "http://xml.org/sax/features/external-general-entities";
Expand Down Expand Up @@ -129,34 +125,6 @@ public static String getAttributeNSOrNull(
return a.getValue();
}

/* public static boolean matchesTagNS(Element e, String tag, String nsURI) {
try {
return e.getLocalName().equals(tag)
&& e.getNamespaceURI().equals(nsURI);
} catch (NullPointerException npe) {
// localname not null since parsing would fail before here
throw new WSDLParseException(
"null.namespace.found",
e.getLocalName());
}
}
public static boolean matchesTagNS(
Element e,
javax.xml.namespace.QName name) {
try {
return e.getLocalName().equals(name.getLocalPart())
&& e.getNamespaceURI().equals(name.getNamespaceURI());
} catch (NullPointerException npe) {
// localname not null since parsing would fail before here
throw new WSDLParseException(
"null.namespace.found",
e.getLocalName());
}
}*/

public static Iterator getAllChildren(Element element) {
return new NodeListIterator(element.getChildNodes());
}
Expand Down Expand Up @@ -384,7 +352,7 @@ public static XPathFactory newXPathFactory(boolean disableSecurity) {

public static XMLInputFactory newXMLInputFactory(boolean disableSecurity) {
XMLInputFactory factory = XMLInputFactory.newInstance();
if (xmlSecurityDisabled(disableSecurity)) {
if (!xmlSecurityDisabled(disableSecurity)) {
// TODO-Miran: are those apppropriate defaults?
factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
Expand Down Expand Up @@ -419,14 +387,14 @@ public static SchemaFactory allowExternalAccess(SchemaFactory sf, String value,
}

try {
sf.setProperty(ACCESS_EXTERNAL_SCHEMA, value);
sf.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, value);
if (LOGGER.isLoggable(Level.FINE)) {
LOGGER.log(Level.FINE, "Property \"{0}\" is supported and has been successfully set by used JAXP implementation.", new Object[]{ACCESS_EXTERNAL_SCHEMA});
LOGGER.log(Level.FINE, "Property \"{0}\" is supported and has been successfully set by used JAXP implementation.", new Object[]{XMLConstants.ACCESS_EXTERNAL_SCHEMA});
}
} catch (SAXException ignored) {
// nothing to do; support depends on version JDK or SAX implementation
if (LOGGER.isLoggable(Level.CONFIG)) {
LOGGER.log(Level.CONFIG, "Property \"{0}\" is not supported by used JAXP implementation.", new Object[]{ACCESS_EXTERNAL_SCHEMA});
LOGGER.log(Level.CONFIG, "Property \"{0}\" is not supported by used JAXP implementation.", new Object[]{XMLConstants.ACCESS_EXTERNAL_SCHEMA});
}
}
return sf;
Expand Down
49 changes: 48 additions & 1 deletion jaxws-ri/runtime/rt/src/test/java/com/sun/xml/ws/util/xml/XmlUtilTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand All @@ -14,6 +14,18 @@
import java.lang.reflect.Method;

import junit.framework.TestCase;
import org.junit.Assert;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;

import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.XMLInputFactory;
import javax.xml.transform.TransformerFactory;
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFactoryConfigurationException;

public class XmlUtilTest extends TestCase {

Expand Down Expand Up @@ -56,5 +68,40 @@ public void testXmlSecurityDisabled() throws InstantiationException, IllegalAcce
fieldDisabledBySetting.set(com.sun.xml.ws.util.xml.XmlUtil.class, disabledBySetting);
}
}

public void testNewDocumentBuilderFactory() {
DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory(false);
Assert.assertFalse(factory.isExpandEntityReferences());
factory = XmlUtil.newDocumentBuilderFactory(true);
Assert.assertTrue(factory.isExpandEntityReferences());
}

public void testNewTransformerFactory() {
TransformerFactory factory = XmlUtil.newTransformerFactory(false);
Assert.assertTrue(factory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
factory = XmlUtil.newTransformerFactory(true);
Assert.assertFalse(factory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
}

public void testNewSAXParserFactory() throws SAXNotSupportedException, SAXNotRecognizedException, ParserConfigurationException {
SAXParserFactory factory = XmlUtil.newSAXParserFactory(false);
Assert.assertTrue(factory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
factory = XmlUtil.newSAXParserFactory(true);
Assert.assertFalse(factory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
}

public void testNewXPathFactory() throws XPathFactoryConfigurationException {
XPathFactory factory = XmlUtil.newXPathFactory(false);
Assert.assertTrue(factory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
factory = XmlUtil.newXPathFactory(true);
Assert.assertFalse(factory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
}

public void testNewXMLInputFactory() {
XMLInputFactory factory = XmlUtil.newXMLInputFactory(false);
Assert.assertFalse((Boolean) factory.getProperty(XMLInputFactory.SUPPORT_DTD));
factory = XmlUtil.newXMLInputFactory(true);
Assert.assertTrue((Boolean) factory.getProperty(XMLInputFactory.SUPPORT_DTD));
}
}

0 comments on commit a56a696

Please sign in to comment.