/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Apr 24 14:54:54 UTC 2017
changeset 0789465aecc8 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0789465aecc8
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Apr 24 17:01:19 2017 +0200
ResourceUrlCreator.java: https preffered over http
changeset f85171464566 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f85171464566
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Apr 24 17:04:13 2017 +0200
javaws made to understand jnlp "network protokol"
* NEWS: mentioned jnlp protocol
* netx/net/sourceforge/jnlp/runtime/Boot.java: when main or jnlp argument starts with
jnlp(s): then it is substituted by htt
diffstat:
ChangeLog | 11 ++++
NEWS | 1 +
netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java | 46 +++++++++++++---
netx/net/sourceforge/jnlp/runtime/Boot.java | 8 ++-
4 files changed, 54 insertions(+), 12 deletions(-)
diffs (164 lines):
diff -r 1e0fcdc4f72e -r f85171464566 ChangeLog
--- a/ChangeLog Mon Apr 24 10:06:48 2017 +0200
+++ b/ChangeLog Mon Apr 24 17:04:13 2017 +0200
@@ -1,3 +1,14 @@
+2017-04-24 Jiri Vanek <jvanek at redhat.com>
+
+ javaws made to understand jnlp "network protokol"
+ * NEWS: mentioned jnlp protocol
+ * netx/net/sourceforge/jnlp/runtime/Boot.java: when main or jnlp argument starts with
+ jnlp(s): then it is substituted by http(s)
+
+2017-04-24 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: https preffered over http
+
2017-04-24 Jiri Vanek <jvanek at redhat.com>
fixed PR3365
diff -r 1e0fcdc4f72e -r f85171464566 NEWS
--- a/NEWS Mon Apr 24 10:06:48 2017 +0200
+++ b/NEWS Mon Apr 24 17:04:13 2017 +0200
@@ -9,6 +9,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.7 (2015-XX-XX):
+* added experimental support for jnlp protocol (see https://bugs.openjdk.java.net/browse/JDK-8055464)
* restricted to JDK8 and higher
* all connection restrictions now consider also port
* Enabled Entry-Point attribute check
diff -r 1e0fcdc4f72e -r f85171464566 netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Mon Apr 24 10:06:48 2017 +0200
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Mon Apr 24 17:04:13 2017 +0200
@@ -34,7 +34,6 @@
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 net.sourceforge.jnlp.cache;
import java.net.MalformedURLException;
@@ -43,6 +42,7 @@
import java.util.List;
import net.sourceforge.jnlp.DownloadOptions;
+import net.sourceforge.jnlp.util.logging.OutputController;
public class ResourceUrlCreator {
@@ -55,9 +55,10 @@
}
/**
- * Returns a list of URLs that the resources might be downloadable from.
- * The Resources may not be downloadable from any of them. The returned order is the order
- * the urls should be attempted in.
+ * Returns a list of URLs that the resources might be downloadable from. The
+ * Resources may not be downloadable from any of them. The returned order is
+ * the order the urls should be attempted in.
+ *
* @return a list of URLs that the resources might be downloadable from
*/
public List<URL> getUrls() {
@@ -94,15 +95,29 @@
urls.add(resource.getLocation());
+ //preffering https and owerriding case, when applciation was moved to https, but the jnlp stayed intacted
+ List<URL> urlsCopy = new LinkedList<>(urls);
+ for (URL u : urlsCopy) {
+ if (u.getProtocol().equals("http")) {
+ try {
+ urls.add(0, copyUrltoHttps(u));
+ } catch (Exception ex) {
+ OutputController.getLogger().log(ex);
+ }
+ }
+ }
return urls;
}
/**
* Returns a url for the resource.
+ *
* @param resource the resource
* @param usePack whether the URL should point to the pack200 file
- * @param useVersion whether the URL should be modified to include the version
- * @return a URL for the resource or null if an appropriate URL can not be found
+ * @param useVersion whether the URL should be modified to include the
+ * version
+ * @return a URL for the resource or null if an appropriate URL can not be
+ * found
*/
static URL getUrl(Resource resource, boolean usePack, boolean useVersion) {
if (!(usePack || useVersion)) {
@@ -123,7 +138,7 @@
for (int i = 0; i < parts.length; i++) {
sb.append(parts[i]);
// Append __V<number> before last '.'
- if (i == parts.length -2) {
+ if (i == parts.length - 2) {
sb.append("__V").append(resource.getRequestVersion());
}
sb.append('.');
@@ -146,8 +161,10 @@
}
/**
- * Returns the URL for this resource, including the resource's version number in the query string
- * @return url with version cared about
+ * Returns the URL for this resource, including the resource's version
+ * number in the query string
+ *
+ * @return url with version cared about
*/
protected URL getVersionedUrl() {
URL resourceUrl = resource.getLocation();
@@ -185,9 +202,18 @@
}
private static String uriPartToString(String part) {
- if (part == null)
+ if (part == null) {
return "";
+ }
return part;
}
+ private URL copyUrltoHttps(URL u) throws MalformedURLException {
+ if (u.getPort() < 0) {
+ return new URL("https", u.getHost(), u.getFile());
+ } else {
+ return new URL("https", u.getHost(), u.getPort(), u.getFile(), null);
+ }
+ }
+
}
diff -r 1e0fcdc4f72e -r f85171464566 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Apr 24 10:06:48 2017 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Apr 24 17:04:13 2017 +0200
@@ -232,6 +232,10 @@
OutputController.getLogger().printOut(itwInfoMessage);
}
+ private static String fixJnlpProtocol(String param) {
+ return param.replaceFirst("^jnlp:", "http:").replaceFirst("^jnlps:", "https:");
+ }
+
/**
* The privileged part (jdk1.3 compatibility).
*/
@@ -310,11 +314,11 @@
|| (optionParser.hasOption(OptionsDefinitions.OPTIONS.JNLP) && optionParser.hasOption(OptionsDefinitions.OPTIONS.HTML))) {
throw new InvalidArgumentException(optionParser.getMainArgs().toString());
} else if (optionParser.hasOption(OptionsDefinitions.OPTIONS.JNLP)) {
- return optionParser.getParam(OptionsDefinitions.OPTIONS.JNLP);
+ return fixJnlpProtocol(optionParser.getParam(OptionsDefinitions.OPTIONS.JNLP));
} else if (optionParser.hasOption(OptionsDefinitions.OPTIONS.HTML)) {
return optionParser.getParam(OptionsDefinitions.OPTIONS.HTML);
} else if (optionParser.mainArgExists()) {
- return optionParser.getMainArg();
+ return fixJnlpProtocol(optionParser.getMainArg());
}
handleMessage();
More information about the distro-pkg-dev
mailing list