Improved entitity resolution from the web

Author: rmraya

lib/xmljava.jar

@@ -16,9 +16,11 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Hashtable;
@@ -29,6 +31,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import javax.net.ssl.HttpsURLConnection;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.InputSource;
@@ -37,6 +40,8 @@
 
 public class Catalog implements EntityResolver2 {
 
+    Logger logger = System.getLogger(Catalog.class.getName());
+
     private Map<String, String> systemCatalog;
     private Map<String, String> publicCatalog;
     private Map<String, String> uriCatalog;
@@ -321,6 +326,9 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
         try {
             URI uri = new URI(baseURI != null ? baseURI : "").resolve(systemId).normalize();
             if (uri.toURL().getProtocol() != null) {
+                if (uri.toURL().getProtocol().startsWith("http")) {
+                    return resolveHttp(uri);
+                }
                 return new InputSource(uri.toURL().openStream());
             }
             return new InputSource(new FileInputStream(uri.toURL().toString()));
@@ -344,6 +352,27 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
         return null;
     }
 
+    private InputSource resolveHttp(URI uri) throws MalformedURLException, IOException {
+        MessageFormat mf = new MessageFormat(Messages.getString("Catalog.3"));
+        logger.log(Level.WARNING, mf.format(new String[] { uri.toURL().toString() }));
+        URL url = uri.toURL();
+        try {
+            HttpURLConnection con = url.getProtocol().equals("https") ? (HttpsURLConnection) url.openConnection()
+                    : (HttpURLConnection) url.openConnection();
+            con.setReadTimeout(5000);
+            con.connect();
+            con.getResponseCode();
+            if (con.getResponseCode() != 200) {
+                mf = new MessageFormat(Messages.getString("Catalog.2"));
+                throw new IOException(mf.format(new String[] { con.getResponseCode() + "", url.toString() }));
+            }
+            return new InputSource(con.getInputStream());
+        } catch (IOException e) {
+            mf = new MessageFormat(Messages.getString("Catalog.1"));
+            throw new IOException(mf.format(new String[] { url.toString(), e.getMessage() }));
+        }
+    }
+
     public String matchPublic(String publicId) {
         if (publicId != null) {
             if (publicId.startsWith("urn:publicid:")) {
@@ -478,7 +507,6 @@ public void parseDTD(String publicId) {
                 }
             } catch (IOException | SAXException e) {
                 // do nothing
-                Logger logger = System.getLogger(Catalog.class.getName());
                 MessageFormat mf = new MessageFormat(Messages.getString("Catalog.0"));
                 logger.log(Level.WARNING, mf.format(new String[] { publicId }));
             }

src/com/maxprograms/xml/Catalog.java

@@ -14,8 +14,8 @@
 
 public class Constants {
 
-    public static final String VERSION = "2.1.1";
-    public static final String BUILD = "20250221_1014";
+    public static final String VERSION = "2.2.0";
+    public static final String BUILD = "20250227_1029";
 
     private Constants() {
         // private for security

src/com/maxprograms/xml/Constants.java

@@ -1,4 +1,7 @@
 Catalog.0=Error parsing DTD ''{0}''
+Calatalog.1=Error connecting to ''{0}'': {1}
+Calatalog.2=Error  {0} for: {1}
+Catalog.3=Resolving from URL ''{0}''
 CustomContentHandler.0=Malformed content found
 Document.0=Prolog contains wrong content type
 DTDParser.0=Malformed entity reference

src/com/maxprograms/xml/xmljava.properties

@@ -1,4 +1,7 @@
 Catalog.0=Error al analizar DTD ''{0}''
+Calatalog.1=Error conectando a ''{0}'': {1}
+Calatalog.2=Error  {0} para: {1}
+Catalog.3=Resolviendo desde URL ''{0}''
 CustomContentHandler.0=Se ha encontrado contenido con formato incorrecto
 Document.0=Prólogo contiene un tipo de contenido incorrecto
 DTDParser.0=Referencia de entidad con formato incorrecto