Handled SYSTEM in external entities

Author: rmraya

lib/xmljava.jar

@@ -40,7 +40,8 @@ public class Catalog implements EntityResolver2 {
     private Map<String, String> publicCatalog;
     private Map<String, String> uriCatalog;
     private Map<String, String> dtdCatalog;
-    private Map<String, String> dtdEntities;
+    private Map<String, String> dtdPublicEntities;
+    private Map<String, String> dtdSystemEntities;
     private Set<String> parsedDTDs;
     private List<String[]> uriRewrites;
     private List<String[]> systemRewrites;
@@ -327,8 +328,11 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
         } catch (IOException | URISyntaxException | IllegalArgumentException | NullPointerException e) {
             // ignore
         }
-        if (dtdEntities != null && publicId != null && dtdEntities.containsKey(publicId)) {
-            return new InputSource(new FileInputStream(dtdEntities.get(publicId)));
+        if (dtdPublicEntities != null && publicId != null && dtdPublicEntities.containsKey(publicId)) {
+            return new InputSource(new FileInputStream(dtdPublicEntities.get(publicId)));
+        }
+        if (dtdSystemEntities != null && systemId != null && dtdSystemEntities.containsKey(systemId)) {
+            return new InputSource(new FileInputStream(dtdSystemEntities.get(systemId)));
         }
         return null;
     }
@@ -423,12 +427,21 @@ public String getDTD(String name) {
         return null;
     }
 
-    public void addDtdEntity(String publicId, String path) {
-        if (dtdEntities == null) {
-            dtdEntities = new Hashtable<>();
+    public void addDtdPublicEntity(String publicId, String path) {
+        if (dtdPublicEntities == null) {
+            dtdPublicEntities = new Hashtable<>();
+        }
+        if (!dtdPublicEntities.containsKey(publicId)) {
+            dtdPublicEntities.put(publicId, path);
+        }
+    }
+
+    public void addDtdSystemEntity(String systemId, String path) {
+        if (dtdSystemEntities == null) {
+            dtdSystemEntities = new Hashtable<>();
         }
-        if (!dtdEntities.containsKey(publicId)) {
-            dtdEntities.put(publicId, path);
+        if (!dtdSystemEntities.containsKey(systemId)) {
+            dtdSystemEntities.put(systemId, path);
         }
     }
 
@@ -448,7 +461,13 @@ public void parseDTD(String publicId) {
                     EntityDecl entity = it.next();
                     String path = XMLUtils.getAbsolutePath(dtdFile.getParentFile().getAbsolutePath(),
                             entity.getValue());
-                    addDtdEntity(entity.getPublicId(), path);
+                    addDtdPublicEntity(entity.getPublicId(), path);
+                }
+                entities = grammar.getSytemEntities();
+                it = entities.iterator();
+                while (it.hasNext()) {
+                    EntityDecl entity = it.next();
+                    addDtdSystemEntity(entity.getValue(), entity.getSystemId());
                 }
             } catch (IOException | SAXException e) {
                 // do nothing

src/com/maxprograms/xml/Catalog.java

@@ -14,6 +14,6 @@
 
 public class Constants {
 
-    public static final String VERSION = "1.2.0";
-    public static final String BUILD = "20230606_0952";
+    public static final String VERSION = "1.3.0";
+    public static final String BUILD = "20230609_1500";
 }

src/com/maxprograms/xml/Constants.java

@@ -103,6 +103,28 @@ public Grammar parse(File file) throws SAXException, IOException {
                 }
                 String entityDeclText = source.substring(pointer, index + ">".length());
                 EntityDecl entityDecl = new EntityDecl(entityDeclText);
+                if (entityDecl.getType() == EntityDecl.SYSTEM) {
+                    String module = entityDecl.getValue();
+                    if (module == null || module.isBlank()) {
+                        MessageFormat mf = new MessageFormat(Messages.getString("DTDParser.2"));
+                        throw new IOException(mf.format(new String[] { entityDecl.getName() }));
+                    }
+                    String path = XMLUtils.getAbsolutePath(file.getParentFile().getAbsolutePath(), module);
+                    File mod = new File(path);
+                    if (mod.exists()) {
+                        entityDecl.setSystemId(mod.getAbsolutePath()  );
+                        Grammar moduleGrammar = parse(mod);
+                        elementDeclMap.putAll(moduleGrammar.getElementDeclMap());
+                        attributeListMap.putAll(moduleGrammar.getAttributeListMap());
+                        entitiesMap.putAll(moduleGrammar.getEntitiesMap());
+                        notationsMap.putAll(moduleGrammar.getNotationsMap());                        
+                    } else {
+                        if (debug) {
+                            MessageFormat mf = new MessageFormat(Messages.getString("DTDParser.3"));
+                            logger.log(Level.WARNING, mf.format(new String[] { mod.getAbsolutePath() }));
+                        }
+                    }
+                }
                 if (!entitiesMap.containsKey(entityDecl.getName())) {
                     entitiesMap.put(entityDecl.getName(), entityDecl);
                 } else {

src/com/maxprograms/xml/DTDParser.java

@@ -26,10 +26,11 @@ public class EntityDecl implements XMLNode {
     private String type;
     private String value;
     private String publicId;
+    private String systemId;
     private String ndataValue;
     boolean parameterEntity = false;
 
-    public EntityDecl(String declaration) throws IndexOutOfBoundsException{
+    public EntityDecl(String declaration) throws IndexOutOfBoundsException {
         int i = "<!ENTITY".length();
         char c = declaration.charAt(i);
         while (XMLUtils.isXmlSpace(c)) {
@@ -132,6 +133,10 @@ public String getType() {
         return type;
     }
 
+    protected void setValue(String value) {
+        this.value = value;
+    }
+
     public String getValue() {
         return value;
     }
@@ -140,6 +145,14 @@ public String getPublicId() {
         return publicId;
     }
 
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+    
+    public String getSystemId() {
+        return systemId;
+    }
+
     public String getNDATA() {
         return ndataValue;
     }

src/com/maxprograms/xml/EntityDecl.java

@@ -62,7 +62,7 @@ public List<EntityDecl> getEntities() {
         List<EntityDecl> result = new Vector<>();
         result.addAll(entitiesMap.values());
         return result;
-    }    
+    }
 
     public List<ElementDecl> getElements() {
         List<ElementDecl> result = new Vector<>();
@@ -73,4 +73,20 @@ public List<ElementDecl> getElements() {
         }
         return result;
     }
+
+    public Map<String, ElementDecl> getElementDeclMap() {
+        return elementDeclMap;
+    }
+
+    public Map<String, AttlistDecl> getAttributeListMap() {
+        return attributeListMap;
+    }
+
+    public Map<String, EntityDecl> getEntitiesMap() {
+        return entitiesMap;
+    }
+
+    public Map<String, NotationDecl> getNotationsMap() {
+        return notationsMap;
+    }
 }