/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri May 18 07:23:27 PDT 2012
changeset bcaec1cfd8f2 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bcaec1cfd8f2
author: Jiri Vanek <jvanek at redhat.com>
date: Fri May 18 16:18:29 2012 +0200
More tests for Spaces and characters in urls
changeset 3d01ef4139f4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3d01ef4139f4
author: Jiri Vanek <jvanek at redhat.com>
date: Fri May 18 16:23:30 2012 +0200
Fixed behavior when encoded/characters needed encoding included in url (PR811)
diffstat:
ChangeLog | 31 +
NEWS | 1 +
netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 4 +-
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 42 +-
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 128 ++++-
tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/NotOnly spaces can kill ěšÄřž too signed.jnlp | 61 ++
tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/Spaces can be everywhere1 signed.jnlp | 53 +
tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/Spaces can be everywhere2 signed.jnlp | 53 +
tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/SpacesCanBeEverywhere1signed.jnlp | 53 +
tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/spaces applet Tests signed.html | 42 +
tests/jnlp_tests/signed/Spaces can be everywhere signed/srcs/SpacesCanBeEverywhereSigned.java | 76 ++
tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java | 289 ++++++++++
tests/jnlp_tests/simple/Spaces can be everywhere/resources/NotOnly spaces can kill ěšÄřž too.jnlp | 61 ++
tests/jnlp_tests/simple/Spaces can be everywhere/resources/spaces applet Tests.html | 42 +
tests/jnlp_tests/simple/Spaces can be everywhere/srcs/SpacesCanBeEverywhere.java | 35 +-
tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java | 132 ++++-
tests/netx/unit/net/sourceforge/jnlp/cache/CacheUtilTest.java | 55 +
tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 98 +++
18 files changed, 1239 insertions(+), 17 deletions(-)
diffs (truncated from 1434 to 500 lines):
diff -r b67e12ff7837 -r 3d01ef4139f4 ChangeLog
--- a/ChangeLog Fri May 18 09:27:24 2012 -0400
+++ b/ChangeLog Fri May 18 16:23:30 2012 +0200
@@ -1,3 +1,34 @@
+2012-05-18 Jiri Vanek <jvanek at redhat.com>
+
+ Fixed behavior when encoded/characters needed encoding included in url
+ * NEWS: mentioned PR811
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (urlEquals) Enhanced
+ to be able compare encoded/decoded urls correctly.
+ (notNullUrlEquals) new method to separate comparing of individual parts of
+ url from null checks
+ * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: (addResource)
+ is now encoding url if needed. (normalizeUrl) new method to encode path in
+ url of all except file protocol. (normalizeChunk) New method for encoding
+ of atomic piece.
+
+2012-05-18 Jiri Vanek <jvanek at redhat.com>
+
+ More tests for Spaces and characters in urls
+ * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: and
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java: for unit-tests
+ purposes (cacheDir) make to point to tmp dir when no
+ DeploymentConfiguration exists.
+ * tests/jnlp_tests/signed/Spaces can be everywhere signed/:
+ couple of new test doing the same as simple "Spaces can be everywhere"
+ but are signed
+ * tests/jnlp_tests/simple/Spaces can be everywhere/: added new test-cases
+ and html/jnlp test files to try more combinations of encodable characters
+ x launches
+ * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java:
+ unittest for url encoder behavior
+ * tests/netx/unit/net/sourceforge/jnlp/cache/CacheUtilTest.java:
+ unittest for urlEquals function
+
2012-05-17 Adam Domurad <adomurad at redhat.com>
Fixed uses of == to compare String objects to .equals where
diff -r b67e12ff7837 -r 3d01ef4139f4 NEWS
--- a/NEWS Fri May 18 09:27:24 2012 -0400
+++ b/NEWS Fri May 18 16:23:30 2012 +0200
@@ -11,6 +11,7 @@
New in release 1.3 (2012-XX-XX):
* NetX
- PR898: signed applications with big jnlp-file doesn't start (webstart affect like "frozen")
+ - PR811: javaws is not handling urls with spaces (and other characters needing encoding) correctly
* Plugin
- PR820: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp
- PR895: IcedTea-Web searches for missing classes on each loadClass or findClass
diff -r b67e12ff7837 -r 3d01ef4139f4 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
--- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Fri May 18 09:27:24 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Fri May 18 16:23:30 2012 +0200
@@ -71,8 +71,8 @@
private FileLock fl = null;
/* location of cache directory */
- private final String cacheDir = new File(JNLPRuntime.getConfiguration()
- .getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR)).getPath();
+ private final String setCachePath = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
+ private final String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath();
/*
* back-end of how LRU is implemented This file is to keep track of the most
diff -r b67e12ff7837 -r 3d01ef4139f4 netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri May 18 09:27:24 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri May 18 16:23:30 2012 +0200
@@ -47,8 +47,8 @@
*/
public class CacheUtil {
- private static final String cacheDir = new File(JNLPRuntime.getConfiguration()
- .getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR)).getPath(); // Do this with file to standardize it.
+ private static final String setCacheDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
+ private static final String cacheDir = new File(setCacheDir != null ? setCacheDir : System.getProperty("java.io.tmpdir")).getPath(); // Do this with file to standardize it.
private static final CacheLRUWrapper lruHandler = CacheLRUWrapper.getInstance();
private static final HashMap<String, FileLock> propertiesLockPool = new HashMap<String, FileLock>();
@@ -61,22 +61,40 @@
* ie sourceforge.net and www.sourceforge.net).
*/
public static boolean urlEquals(URL u1, URL u2) {
- if (u1 == u2)
+ if (u1 == u2) {
return true;
- if (u1 == null || u2 == null)
+ }
+ if (u1 == null || u2 == null) {
return false;
+ }
- if (!compare(u1.getProtocol(), u2.getProtocol(), true) ||
- !compare(u1.getHost(), u2.getHost(), true) ||
- //u1.getDefaultPort() != u2.getDefaultPort() || // only in 1.4
- !compare(u1.getPath(), u2.getPath(), false) ||
- !compare(u1.getQuery(), u2.getQuery(), false) ||
- !compare(u1.getRef(), u2.getRef(), false))
- return false;
- else
+ if (notNullUrlEquals(u1, u2)) {
return true;
+ }
+ try {
+ URL nu1 = ResourceTracker.normalizeUrl(u1, false);
+ URL nu2 = ResourceTracker.normalizeUrl(u2, false);
+ if (notNullUrlEquals(nu1, nu2)) {
+ return true;
+ }
+ } catch (Exception ex) {
+ //keep silent here and return false
+ }
+ return false;
}
+ private static boolean notNullUrlEquals(URL u1, URL u2) {
+ if (!compare(u1.getProtocol(), u2.getProtocol(), true)
+ || !compare(u1.getHost(), u2.getHost(), true)
+ || //u1.getDefaultPort() != u2.getDefaultPort() || // only in 1.4
+ !compare(u1.getPath(), u2.getPath(), false)
+ || !compare(u1.getQuery(), u2.getQuery(), false)
+ || !compare(u1.getRef(), u2.getRef(), false)) {
+ return false;
+ } else {
+ return true;
+ }
+ }
/**
* Caches a resource and returns a URL for it in the cache;
* blocks until resource is cached. If the resource location is
diff -r b67e12ff7837 -r 3d01ef4139f4 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 18 09:27:24 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 18 16:23:30 2012 +0200
@@ -24,10 +24,13 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
@@ -108,6 +111,15 @@
private static final int ERROR = Resource.ERROR;
private static final int STARTED = Resource.STARTED;
+ // normalization of url
+ private static final char PATH_DELIMITER_MARK = '/';
+ private static final String PATH_DELIMITER = "" + PATH_DELIMITER_MARK;
+ private static final char QUERY_DELIMITER_MARK = '&';
+ private static final String QUERY_DELIMITER = "" + QUERY_DELIMITER_MARK;
+ private static final char QUERY_MARK = '?';
+ private static final char HREF_MARK = '#';
+ private static final String UTF8 = "utf-8";
+
/** max threads */
private static final int maxThreads = 5;
@@ -173,7 +185,12 @@
public void addResource(URL location, Version version, DownloadOptions options, UpdatePolicy updatePolicy) {
if (location == null)
throw new IllegalArgumentException("location==null");
-
+ try {
+ location = normalizeUrl(location, JNLPRuntime.isDebug());
+ } catch (Exception ex) {
+ System.err.println("Normalization of " + location.toString() + " have failed");
+ ex.printStackTrace();
+ }
Resource resource = Resource.getResource(location, version, updatePolicy);
boolean downloaded = false;
@@ -1127,4 +1144,113 @@
}
};
+ private static String normalizeChunk(String base, boolean debug) throws UnsupportedEncodingException {
+ if (base == null) {
+ return base;
+ }
+ if ("".equals(base)) {
+ return base;
+ }
+ String result = base;
+ String ssE = URLDecoder.decode(base, UTF8);
+ // System.out.println("*" + base + "*");
+ // System.out.println("-" + ssE + "-");
+ if (base.equals(ssE)) {
+ result = URLEncoder.encode(base, UTF8);
+ if (debug) {
+ System.out.println(base + " chunk needs to be encoded => " + result);
+ }
+ } else {
+ if (debug) {
+ System.out.println(base + " chunk already encoded");
+ }
+ }
+ return result;
+ }
+
+ public static URL normalizeUrl(URL u, boolean debug) throws MalformedURLException, UnsupportedEncodingException {
+ if (u == null) {
+ return null;
+ }
+ String protocol = u.getProtocol();
+ if (protocol == null || "file".equals(protocol)) {
+ return u;
+ }
+ String file = u.getPath();
+ if (file == null) {
+ return u;
+ }
+ String host = u.getHost();
+ String ref = u.getRef();
+ int port = u.getPort();
+ String query = u.getQuery();
+ String[] qq = {};
+ if (query != null) {
+ qq = query.split(QUERY_DELIMITER);
+ }
+ String[] ss = file.split(PATH_DELIMITER);
+ int normalized = 0;
+ if (debug) {
+ System.out.println("normalizing path " + file + " in " + u.toString());
+ }
+ for (int i = 0; i < ss.length; i++) {
+ String base = ss[i];
+ String r = normalizeChunk(base, debug);
+ if (!r.equals(ss[i])) {
+ normalized++;
+ }
+ ss[i] = r;
+ }
+ if (debug) {
+ System.out.println("normalizing query " + query + " in " + u.toString());
+ }
+ for (int i = 0; i < qq.length; i++) {
+ String base = qq[i];
+ String r = normalizeChunk(base, debug);
+ if (!r.equals(qq[i])) {
+ normalized++;
+ }
+ qq[i] = r;
+ }
+ if (normalized == 0) {
+ if (debug) {
+ System.out.println("Nothing was normalized in this url");
+ }
+ return u;
+ } else {
+ System.out.println(normalized + " chunks normalized, rejoining url");
+ }
+ StringBuilder composed = new StringBuilder("");
+ for (int i = 0; i < ss.length; i++) {
+ String string = ss[i];
+ if (ss.length <= 1 || (string != null && !"".equals(string))) {
+ composed.append(PATH_DELIMITER_MARK).append(string);
+ }
+ }
+ String composed1 = composed.toString();
+ if (query != null && !query.trim().equals("")) {
+ composed.append(QUERY_MARK);
+ for (int i = 0; i < qq.length; i++) {
+ String string = qq[i];
+ if ((string != null && !"".equals(string))) {
+ composed.append(string);
+ if (i != qq.length - 1) {
+ composed.append(QUERY_DELIMITER_MARK);
+ }
+ }
+ }
+ }
+ String composed2 = composed.substring(composed1.length() - 1);
+ if (ref != null && !ref.trim().equals("")) {
+ composed.append(HREF_MARK).append(ref);
+ }
+
+ URL result = new URL(protocol, host, port, composed.toString());
+
+ if (debug) {
+ System.out.println("normalized `" + composed1 + "` and `" + composed2 + "` in " + result.toString());
+ }
+ return result;
+
+ }
}
diff -r b67e12ff7837 -r 3d01ef4139f4 tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/NotOnly spaces can kill ěšÄřž too signed.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/NotOnly spaces can kill ěšÄřž too signed.jnlp Fri May 18 16:23:30 2012 +0200
@@ -0,0 +1,61 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea 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.
+
+IcedTea 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 IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="NotOnly spaces can kill ěšÄřž too signed.jnlp" codebase=".">
+ <information>
+ <title>Spaces can be everywhere test with few more chars for encoding signed</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>AppletTest</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="Spaces can be everywhere signed.jar"/>
+ </resources>
+ <applet-desc
+ documentBase="."
+ name="SpacesCanBeEverywhereSigned"
+ main-class="SpacesCanBeEverywhereSigned"
+ width="100"
+ height="100">
+ </applet-desc>
+</jnlp>
+
+
+</applet-desc>
diff -r b67e12ff7837 -r 3d01ef4139f4 tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/Spaces can be everywhere1 signed.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/Spaces can be everywhere1 signed.jnlp Fri May 18 16:23:30 2012 +0200
@@ -0,0 +1,53 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea 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.
+
+IcedTea 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 IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="Spaces can be everywhere1 signed.jnlp" codebase=".">
+ <information>
+ <title>Spaces can be everywhere1 signed</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>Spaces can be everywhere1 signed</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="SimpletestSigned1.jar"/>
+ </resources>
+ <application-desc main-class="SimpletestSigned1">
+ </application-desc>
+</jnlp>
diff -r b67e12ff7837 -r 3d01ef4139f4 tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/Spaces can be everywhere2 signed.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/Spaces can be everywhere2 signed.jnlp Fri May 18 16:23:30 2012 +0200
@@ -0,0 +1,53 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea 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.
+
+IcedTea 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 IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="Spaces can be everywhere2 signed.jnlp" codebase=".">
+ <information>
+ <title>Spaces can be everywhere2</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>Spaces can be everywhere2 signed</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="Spaces can be everywhere signed.jar"/>
+ </resources>
+ <application-desc main-class="SpacesCanBeEverywhereSigned">
+ </application-desc>
+</jnlp>
diff -r b67e12ff7837 -r 3d01ef4139f4 tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/SpacesCanBeEverywhere1signed.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/resources/SpacesCanBeEverywhere1signed.jnlp Fri May 18 16:23:30 2012 +0200
@@ -0,0 +1,53 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea 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.
+
+IcedTea 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 IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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
More information about the distro-pkg-dev
mailing list