Issue ehcache#3242 : Validate user provided DOM trees

chrisdennis · Aug 21, 2024 · d5dc57a · d5dc57a
1 parent 60c7bfd
commit d5dc57a
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 45 deletions.
diff --git a/ehcache-xml/src/main/java/org/ehcache/xml/ConfigurationParser.java b/ehcache-xml/src/main/java/org/ehcache/xml/ConfigurationParser.java
@@ -58,6 +58,7 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
 import java.io.BufferedReader;
@@ -228,6 +229,10 @@ public Document uriToDocument(URI uri) throws IOException, SAXException {
   }
 
   public XmlConfigurationWrapper documentToConfig(Document document, ClassLoader classLoader, Map<String, ClassLoader> cacheClassLoaders) throws JAXBException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    Validator validator = schema.newValidator();
+    validator.setErrorHandler(new FatalErrorHandler());
+    validator.validate(new DOMSource(document));
+
     Document annotatedDocument = stampExternalConfigurations(copyAndValidate(document));
     Element root = annotatedDocument.getDocumentElement();
 

diff --git a/ehcache-xml/src/main/java/org/ehcache/xml/XmlConfiguration.java b/ehcache-xml/src/main/java/org/ehcache/xml/XmlConfiguration.java
@@ -29,6 +29,7 @@
 import org.ehcache.xml.exceptions.XmlConfigurationException;
 import org.w3c.dom.Document;
 
+import javax.xml.transform.dom.DOMSource;
 import java.lang.reflect.Array;
 import java.net.URL;
 import java.util.Collection;
@@ -202,7 +203,11 @@ public XmlConfiguration(Configuration configuration) throws XmlConfigurationExce
     try {
       ConfigurationParser parser = new ConfigurationParser();
       this.configuration = configuration;
-      this.templates = emptyMap();
+      if (configuration instanceof XmlConfiguration) {
+        this.templates = ((XmlConfiguration) configuration).templates;
+      } else {
+        this.templates = emptyMap();
+      }
 
       this.document = parser.configToDocument(configuration);
       this.renderedDocument = documentToText(document);