[rfc][icedtea-web] Fix regression in SpacesCanBeEveryWhere reproducer

[Jiri Vanek]

On 04/24/2013 09:30 PM, Adam Domurad wrote:
> 2013-XX-XX  Adam Domurad <adomurad at redhat.com>
>
>      * netx/net/sourceforge/jnlp/cache/ResourceTracker.java
>      (getCacheFile): Use decodeUrlAsFile instead of toURI().getPath().
>      * netx/net/sourceforge/jnlp/util/UrlUtils.java
>      (decodeUrlAsFile): New, tolerates ill-formed URLs.
>      * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java:
>      (testDecodeUrlAsFile): Test for (decodeUrlAsFile)
>
> Sorry this wasn't caught sooner, and thanks to Jiri for pointing it out.
> The problem was that archives can't be guaranteed to be encoded URLs.
> We instead use an encoding-tolerant function.
>
> Note that the headache is caused because Java allows essentially invalid URLs to be created (and, on
> our side, that we allow them to be created).
>
> Happy hacking,
> -Adam
>
> fix-paths-with-spaces-regression.patch
>
>
> diff --git a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java
> --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java
> +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java
> @@ -390,7 +390,7 @@ public class ResourceTracker {
>                   return resource.localFile;
>
>               if (location.getProtocol().equalsIgnoreCase("file")) {
> -                File file = new File(location.toURI().getPath());
> +                File file = UrlUtils.decodeUrlAsFile(location);
>                   if (file.exists())
>                       return file;
>               }
> @@ -401,9 +401,6 @@ public class ResourceTracker {
>                   ex.printStackTrace();
>
>               return null; // need an error exception to throw
> -        } catch (URISyntaxException e) {
> -            e.printStackTrace();
> -            return null;
>           }


Just ensuring about the removal of the exception:

When decodeUrlQuietly "fails" it prints out exception (not throw) and return original url.
So no NPE is thrown during the  getCacheFile method propcessing.
However  returning of null was expected when url was wrong.  However now "strange" url is returned....

Checking the usage of getCacheFile it is probably more usfeul.. and we will recieve "some strange 
exception" instead of NPE...

J.

After this explained, looks good to go.

>       }
>
> diff --git a/netx/net/sourceforge/jnlp/util/UrlUtils.java b/netx/net/sourceforge/jnlp/util/UrlUtils.java
> --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java
> +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java
> @@ -37,6 +37,7 @@ exception statement from your version.
>
>   package net.sourceforge.jnlp.util;
>
> +import java.io.File;
>   import java.io.IOException;
>   import java.io.UnsupportedEncodingException;
>   import java.net.MalformedURLException;
> @@ -134,4 +135,8 @@ public class UrlUtils {
>           return normalizeUrlQuietly(url, false);
>       }
>
> +    /* Decode a URL as a file, being tolerant of URLs with mixed encoded & decoded portions. */
> +    public static File decodeUrlAsFile(URL url) {
> +        return new File(decodeUrlQuietly(url).getFile());
> +    }
>   }
> diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java
> --- a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java
> +++ b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java
> @@ -1,9 +1,11 @@
>   package net.sourceforge.jnlp.util;
>
> -import static org.junit.Assert.*;
> +import static org.junit.Assert.assertEquals;
> +import static org.junit.Assert.assertFalse;
>
> +import java.io.File;
>   import java.net.URL;
> -
> +
>   import org.junit.Test;
>
>   public class UrlUtilsTest {
> @@ -57,10 +59,24 @@ public class UrlUtilsTest {
>           assertEquals("file://example/%20test",
>                     UrlUtils.normalizeUrl(new URL("file://example/ test"), true).toString());
>       }
> +
>       @Test
>       public void testNormalizeUrlQuietly() throws Exception {
>           // This is a wrapper over UrlUtils.normalizeUrl(), simple test suffices
>           assertEquals("http://example.com/%20test%20test",
>                   UrlUtils.normalizeUrl(new URL("http://example.com/ test%20test")).toString());
>       }
> +
> +    @Test
> +    public void testDecodeUrlAsFile() throws Exception {
> +        String[] testPaths = {"/simple", "/ with spaces", "/with /multiple=/ odd characters?"};
> +
> +        for (String testPath : testPaths) {
> +            File testFile = new File(testPath);
> +            URL notEncodedUrl = testFile.toURL();
> +            URL encodedUrl = testFile.toURI().toURL();
> +            assertEquals(testFile, UrlUtils.decodeUrlAsFile(notEncodedUrl));
> +            assertEquals(testFile, UrlUtils.decodeUrlAsFile(encodedUrl));
> +        }
> +    }
>   }
> \ No newline at end of file
>