[PATCH] Better jar URL parsing.

[Mark Wielaard]

Hi,

The following is a patch that already went into kaffe and libgcj.

2003-12-25  Guilhem Lavaux <address@hidden>
 
        * gnu/java/net/URLParseError.java: New file.
        * gnu/java/net/protocol/jar/Handler.java
        (parseURL): Throw URLParseError if needed, fix '/' handling.
        * java/net/URL.java (URL): Catch URLParseError and
        transform it into a MalformedURLException.
 
        * gnu/java/net/Makefile.am (EXTRA_DIST): Add URLParseError.java.

I am committing this.

Cheers,

Mark

Index: gnu/java/net/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- gnu/java/net/Makefile.am    9 Oct 2003 16:04:22 -0000       1.6
+++ gnu/java/net/Makefile.am    25 Dec 2003 16:33:01 -0000
@@ -5,5 +5,5 @@
 EXTRA_DIST = \
 HeaderFieldHelper.java \
 PlainDatagramSocketImpl.java \
-PlainSocketImpl.java
-
+PlainSocketImpl.java \
+URLParseError.java
Index: gnu/java/net/URLParseError.java
===================================================================
RCS file: gnu/java/net/URLParseError.java
diff -N gnu/java/net/URLParseError.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/java/net/URLParseError.java     25 Dec 2003 16:33:01 -0000
@@ -0,0 +1,57 @@
+/* URLParseError.java -- Helps bypassing the exception limitation for
+                         URLStreamHandler.parseURL().
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.net;
+
+/**
+ * This class helps the people writing protocols to report URL parse
+ * errors in parseUrl as this method cannot report other exceptions
+ * than Errors.
+ *
+ * The main drawback is that it uses the Error mechanism which should not
+ * be used for that type of error reporting.
+ *
+ * @author Guilhem Lavaux <address@hidden>
+ */
+public class URLParseError extends Error
+{
+  public URLParseError(String msg)
+  {
+    super(msg);
+  }
+}
Index: gnu/java/net/protocol/jar/Handler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/jar/Handler.java,v
retrieving revision 1.7
diff -u -r1.7 Handler.java
--- gnu/java/net/protocol/jar/Handler.java      2 Dec 2003 09:01:51 -0000       
1.7
+++ gnu/java/net/protocol/jar/Handler.java      25 Dec 2003 16:33:01 -0000
@@ -38,7 +38,9 @@
 
 package gnu.java.net.protocol.jar;
 
+import gnu.java.net.URLParseError;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
@@ -70,7 +72,7 @@
   }
 
   /**
-   * This method overrides URLStreamHandler's for parsing url of protocol 
"file"
+   * This method overrides URLStreamHandler's for parsing url of protocol "jar"
    *
    * @param url The URL object in which to store the results
    * @param url_string The String-ized URL to parse
@@ -91,10 +93,11 @@
         if (url_string.startsWith("/"))
           { //url string is an absolute path
             int idx = file.lastIndexOf ("!/");
-            if (idx == -1) //context path is weird
-                file = file + "!" + url_string; 
-            else
-                file = file.substring (0, idx + 1) + url_string;
+           
+           if (idx < 0)
+             throw new URLParseError("no !/ in spec");
+           
+           file = file.substring (0, idx + 1) + url_string;
           }
         else
           {
@@ -108,7 +111,7 @@
               // according to Java API Documentation, here is a little 
different 
               // with URLStreamHandler.parseURL
               // but JDK seems doesn't handle it well
-              file = file + "/" + url_string;
+              file = file.substring(0, idx + 1) + url_string;
           }
         
         setURL (url, "jar", url.getHost(), url.getPort(), file, null);
@@ -125,9 +128,22 @@
     
     // Skip remains of protocol
     url_string = url_string.substring (start, end);
+
+    int jar_stop;
+    if ((jar_stop = url_string.indexOf("!/")) < 0)
+      throw new URLParseError("no !/ in spec");
+
+    try
+      {
+       new URL(url_string.substring (0, jar_stop));
+      }
+    catch (MalformedURLException e)
+      {
+       throw new URLParseError("invalid inner URL: " + e.getMessage());
+      }
     
     if (!url.getProtocol().equals ("jar") )
-      return;
+      throw new URLParseError("unexpected protocol " + url.getProtocol());
         
     setURL (url, "jar", url.getHost(), url.getPort(), url_string, null);
   }
Index: java/net/URL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URL.java,v
retrieving revision 1.23
diff -u -r1.23 URL.java
--- java/net/URL.java   26 Nov 2003 16:00:28 -0000      1.23
+++ java/net/URL.java   25 Dec 2003 16:33:02 -0000
@@ -38,6 +38,7 @@
 
 package java.net;
 
+import gnu.java.net.URLParseError;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.Serializable;
@@ -432,8 +433,17 @@
     // is to be excluded by passing the 'limit' as the indexOf the '#'
     // if one exists, otherwise pass the end of the string.
     int hashAt = spec.indexOf('#', colon + 1);
-    this.ph.parseURL(this, spec, colon + 1,
-                    hashAt < 0 ? spec.length() : hashAt);
+
+    try
+      {
+       this.ph.parseURL(this, spec, colon + 1,
+                        hashAt < 0 ? spec.length() : hashAt);
+      }
+    catch (URLParseError e)
+      {
+       throw new MalformedURLException(e.getMessage());
+      }
+    
     if (hashAt >= 0)
       ref = spec.substring(hashAt + 1);

signature.asc
Description: This is a digitally signed message part