Skip to content

Commit d83285f

Browse files
committed
fix for #3195 CQLXML XXE vulnerability
1 parent 04dc8a8 commit d83285f

File tree

1 file changed

+50
-3
lines changed

1 file changed

+50
-3
lines changed

h2/src/main/org/h2/jdbc/JdbcSQLXML.java

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@
1616
import java.io.Writer;
1717
import java.sql.SQLException;
1818
import java.sql.SQLXML;
19+
import java.util.HashMap;
20+
import java.util.Map;
1921

22+
import javax.xml.XMLConstants;
23+
import javax.xml.parsers.DocumentBuilder;
2024
import javax.xml.parsers.DocumentBuilderFactory;
2125
import javax.xml.stream.XMLInputFactory;
2226
import javax.xml.stream.XMLOutputFactory;
2327
import javax.xml.transform.Result;
2428
import javax.xml.transform.Source;
2529
import javax.xml.transform.Transformer;
2630
import javax.xml.transform.TransformerFactory;
31+
import javax.xml.transform.URIResolver;
2732
import javax.xml.transform.dom.DOMResult;
2833
import javax.xml.transform.dom.DOMSource;
2934
import javax.xml.transform.sax.SAXResult;
@@ -39,13 +44,29 @@
3944
import org.h2.message.TraceObject;
4045
import org.h2.value.Value;
4146
import org.w3c.dom.Node;
47+
import org.xml.sax.EntityResolver;
4248
import org.xml.sax.InputSource;
49+
import org.xml.sax.XMLReader;
50+
import org.xml.sax.helpers.DefaultHandler;
51+
import org.xml.sax.helpers.XMLReaderFactory;
4352

4453
/**
4554
* Represents a SQLXML value.
4655
*/
4756
public final class JdbcSQLXML extends JdbcLob implements SQLXML {
4857

58+
private static final Map<String,Boolean> secureFeatureMap = new HashMap<>();
59+
private static final EntityResolver NOOP_ENTITY_RESOLVER = (publicId, systemId) -> new InputSource(new StringReader(""));
60+
private static final URIResolver NOOP_URI_RESOLVER = (href, base) -> new StreamSource(new StringReader(""));
61+
62+
static {
63+
secureFeatureMap.put(XMLConstants.FEATURE_SECURE_PROCESSING, true);
64+
secureFeatureMap.put("http://apache.org/xml/features/disallow-doctype-decl", true);
65+
secureFeatureMap.put("http://xml.org/sax/features/external-general-entities", false);
66+
secureFeatureMap.put("http://xml.org/sax/features/external-parameter-entities", false);
67+
secureFeatureMap.put("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
68+
}
69+
4970
private DOMResult domResult;
5071

5172
/**
@@ -107,15 +128,41 @@ public <T extends Source> T getSource(Class<T> sourceClass) throws SQLException
107128
"getSource(" + (sourceClass != null ? sourceClass.getSimpleName() + ".class" : "null") + ')');
108129
}
109130
checkReadable();
131+
// According to https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
110132
if (sourceClass == null || sourceClass == DOMSource.class) {
111133
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
112-
return (T) new DOMSource(dbf.newDocumentBuilder().parse(new InputSource(value.getInputStream())));
134+
for (Map.Entry<String,Boolean> entry : secureFeatureMap.entrySet()) {
135+
try {
136+
dbf.setFeature(entry.getKey(), entry.getValue());
137+
} catch (Exception ignore) {/**/}
138+
}
139+
dbf.setXIncludeAware(false);
140+
dbf.setExpandEntityReferences(false);
141+
dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
142+
DocumentBuilder db = dbf.newDocumentBuilder();
143+
db.setEntityResolver(NOOP_ENTITY_RESOLVER);
144+
return (T) new DOMSource(db.parse(new InputSource(value.getInputStream())));
113145
} else if (sourceClass == SAXSource.class) {
114-
return (T) new SAXSource(new InputSource(value.getInputStream()));
146+
XMLReader reader = XMLReaderFactory.createXMLReader();
147+
for (Map.Entry<String,Boolean> entry : secureFeatureMap.entrySet()) {
148+
try {
149+
reader.setFeature(entry.getKey(), entry.getValue());
150+
} catch (Exception ignore) {/**/}
151+
}
152+
reader.setEntityResolver(NOOP_ENTITY_RESOLVER);
153+
return (T) new SAXSource(reader, new InputSource(value.getInputStream()));
115154
} else if (sourceClass == StAXSource.class) {
116155
XMLInputFactory xif = XMLInputFactory.newInstance();
156+
xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
157+
xif.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
158+
xif.setProperty("javax.xml.stream.isSupportingExternalEntities", false);
117159
return (T) new StAXSource(xif.createXMLStreamReader(value.getInputStream()));
118160
} else if (sourceClass == StreamSource.class) {
161+
TransformerFactory tf = TransformerFactory.newInstance();
162+
tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
163+
tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
164+
tf.setURIResolver(NOOP_URI_RESOLVER);
165+
tf.newTransformer().transform(new StreamSource(value.getInputStream()), new SAXResult(new DefaultHandler()));
119166
return (T) new StreamSource(value.getInputStream());
120167
}
121168
throw unsupported(sourceClass.getName());
@@ -165,7 +212,7 @@ public <T extends Result> T setResult(Class<T> resultClass) throws SQLException
165212
try {
166213
if (isDebugEnabled()) {
167214
debugCode(
168-
"getSource(" + (resultClass != null ? resultClass.getSimpleName() + ".class" : "null") + ')');
215+
"setResult(" + (resultClass != null ? resultClass.getSimpleName() + ".class" : "null") + ')');
169216
}
170217
checkEditable();
171218
if (resultClass == null || resultClass == DOMResult.class) {

0 commit comments

Comments
 (0)