Merge branch '1.8' into 1.8

martinhickson · Mar 29, 2021 · 0dbbd91 · 0dbbd91
2 parents b7e0bca + ebcb613
commit 0dbbd91
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 47 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -333,14 +333,25 @@ jobs:
           path: C:\cygwin_packages
           key: cygwin-packages-${{ runner.os }}-v1
 
-      - name: Install Cygwin
+      - name: Download Cygwin
         run: |
           Invoke-WebRequest -UseBasicParsing 'https://cygwin.com/setup-x86_64.exe' -OutFile 'C:\temp\cygwin.exe'
           Invoke-WebRequest -UseBasicParsing 'https://cygwin.com/setup-x86_64.exe.sig' -OutFile 'C:\temp\cygwin.exe.sig'
-          # These steps are too flaky. keys.gnupg.net seems to be constantly down.
-          # gpg --keyserver keys.gnupg.net --recv-key 1A698DE9E2E56300
-          # gpg --keyserver keys.gnupg.net --recv-key 676041BA
-          # gpg --keyid-format=long --with-fingerprint --verify 'C:\temp\cygwin.exe.sig' 'C:\temp\cygwin.exe'
+
+      - name: Download Cygwin keys
+        shell: bash {0}
+        run: |
+          gpg -v --keyserver keys.gnupg.net --recv-key 1A698DE9E2E56300
+          gpg -v --keyserver keys.gnupg.net --recv-key 676041BA
+          gpg -v --keyserver ipv4.pool.sks-keyservers.net --recv-key 1A698DE9E2E56300
+          gpg -v --keyserver ipv4.pool.sks-keyservers.net --recv-key 676041BA
+          gpg -v --keyserver keyserver.ubuntu.com --recv-key 1A698DE9E2E56300
+          gpg -v --keyserver keyserver.ubuntu.com --recv-key 676041BA
+          exit 0
+
+      - name: Check Cygwin sig
+        run: |
+          gpg --keyid-format=long --with-fingerprint --verify 'C:\temp\cygwin.exe.sig' 'C:\temp\cygwin.exe'
           Start-Process -Wait -FilePath 'C:\temp\cygwin.exe' -ArgumentList '--packages autoconf,automake,cpio,curl,gcc,git,gnupg,grep,libtool,make,mingw64-x86_64-gcc-core,perl,pkg-config,unzip,wget,zip --quiet-mode --download --local-install --delete-orphans --site https://mirrors.kernel.org/sourceware/cygwin/ --local-package-dir C:\cygwin_packages --root C:\cygwin64'
 
       - name: Set PATH

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-04 Philippe Doussot <[email protected]>
+
+        Release changes
+	* Webstarted application tries to load resources from server incorrectly : Backport of https://github.com/AdoptOpenJDK/IcedTea-Web/pull/467 fix https://github.com/AdoptOpenJDK/IcedTea-Web/issues/89
+
 2021-02-23  George Adams <[email protected]>
 
     Release changes

diff --git a/NEWS b/NEWS
@@ -8,6 +8,10 @@ GX  - http://bugs.gentoo.org/show_bug.cgi?id=X
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+
+New in release 1.8.7 (2021-03-04):
+* Backport of https://github.com/AdoptOpenJDK/IcedTea-Web/pull/467 fix https://github.com/AdoptOpenJDK/IcedTea-Web/issues/89
+
 New in release 1.8.6 (2021-02-23):
 * Fix missing mslinks in Windows build
 

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([icedtea-web],[1.8.6],[[email protected]], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.8.7],[[email protected]], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile netx.manifest])
 AM_MAINTAINER_MODE([enable])

diff --git a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
@@ -38,6 +38,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -101,6 +102,7 @@ public List<URL> getUrls() {
         if (!noHttpsPreffered) {
             //preffering https and  owerriding case, when applciation was moved to https, but the jnlp stayed intacted
             List<URL> urlsCopy = new LinkedList<>(urls);
+            Collections.reverse(urlsCopy);
             for (URL u : urlsCopy) {
                 if (u.getProtocol().equals("http") && u.getPort() < 0) {
                     try {

diff --git a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
@@ -43,7 +43,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.AccessController;
@@ -104,11 +103,9 @@ public java.util.jar.JarFile retrieve(URL url) throws IOException {
 
         if (UrlUtils.isLocalFile(localUrl)) {
             // if it is known to us, just return the cached file
-            JarFile returnFile=null;
+            JarFile returnFile = new JarFile(UrlUtils.decodeUrlQuietly(localUrl).getPath());
 
             try {
-            	localUrl.toURI().getPath();
-            	returnFile = new JarFile(localUrl.toURI().getPath());
 
                 // Blank out the class-path because:
                 // 1) Web Start does not support it
@@ -120,8 +117,6 @@ public java.util.jar.JarFile retrieve(URL url) throws IOException {
 
             } catch (NullPointerException npe) {
                 // Discard NPE here. Maybe there was no manifest, maybe there were no attributes, etc.
-			} catch (URISyntaxException e) {
-				// should not happen as localUrl was built using localFile.toURI().toURL(), see JNLPClassLoader.activateJars(List<JARDesc>)
             }
 
             return returnFile;

diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -14,7 +14,39 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package net.sourceforge.jnlp.runtime;
 
-import static net.sourceforge.jnlp.runtime.Translator.R;
+import net.sourceforge.jnlp.AppletDesc;
+import net.sourceforge.jnlp.ApplicationDesc;
+import net.sourceforge.jnlp.ExtensionDesc;
+import net.sourceforge.jnlp.JARDesc;
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.JNLPMatcher;
+import net.sourceforge.jnlp.JNLPMatcherException;
+import net.sourceforge.jnlp.LaunchDesc;
+import net.sourceforge.jnlp.LaunchException;
+import net.sourceforge.jnlp.NullJnlpFileException;
+import net.sourceforge.jnlp.OptionsDefinitions;
+import net.sourceforge.jnlp.ParseException;
+import net.sourceforge.jnlp.ParserSettings;
+import net.sourceforge.jnlp.PluginBridge;
+import net.sourceforge.jnlp.ResourcesDesc;
+import net.sourceforge.jnlp.SecurityDesc;
+import net.sourceforge.jnlp.Version;
+import net.sourceforge.jnlp.cache.CacheUtil;
+import net.sourceforge.jnlp.cache.IllegalResourceDescriptorException;
+import net.sourceforge.jnlp.cache.NativeLibraryStorage;
+import net.sourceforge.jnlp.cache.ResourceTracker;
+import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.jdk89acesses.JarIndexAccess;
+import net.sourceforge.jnlp.security.AppVerifier;
+import net.sourceforge.jnlp.security.JNLPAppVerifier;
+import net.sourceforge.jnlp.security.PluginAppVerifier;
+import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation;
+import net.sourceforge.jnlp.tools.JarCertVerifier;
+import net.sourceforge.jnlp.util.JarFile;
+import net.sourceforge.jnlp.util.StreamUtils;
+import net.sourceforge.jnlp.util.UrlUtils;
+import net.sourceforge.jnlp.util.logging.OutputController;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -57,39 +89,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.Manifest;
 
-import net.sourceforge.jnlp.AppletDesc;
-import net.sourceforge.jnlp.ApplicationDesc;
-import net.sourceforge.jnlp.ExtensionDesc;
-import net.sourceforge.jnlp.JARDesc;
-import net.sourceforge.jnlp.JNLPFile;
-import net.sourceforge.jnlp.JNLPMatcher;
-import net.sourceforge.jnlp.JNLPMatcherException;
-import net.sourceforge.jnlp.jdk89acesses.JarIndexAccess;
-import net.sourceforge.jnlp.LaunchDesc;
-import net.sourceforge.jnlp.LaunchException;
-import net.sourceforge.jnlp.NullJnlpFileException;
-import net.sourceforge.jnlp.OptionsDefinitions;
-import net.sourceforge.jnlp.ParseException;
-import net.sourceforge.jnlp.ParserSettings;
-import net.sourceforge.jnlp.PluginBridge;
-import net.sourceforge.jnlp.ResourcesDesc;
-import net.sourceforge.jnlp.SecurityDesc;
-import net.sourceforge.jnlp.Version;
-import net.sourceforge.jnlp.cache.CacheUtil;
-import net.sourceforge.jnlp.cache.IllegalResourceDescriptorException;
-import net.sourceforge.jnlp.cache.NativeLibraryStorage;
-import net.sourceforge.jnlp.cache.ResourceTracker;
-import net.sourceforge.jnlp.cache.UpdatePolicy;
-import net.sourceforge.jnlp.config.DeploymentConfiguration;
-import net.sourceforge.jnlp.security.AppVerifier;
-import net.sourceforge.jnlp.security.JNLPAppVerifier;
-import net.sourceforge.jnlp.security.PluginAppVerifier;
-import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation;
-import net.sourceforge.jnlp.tools.JarCertVerifier;
-import net.sourceforge.jnlp.util.JarFile;
-import net.sourceforge.jnlp.util.StreamUtils;
-import net.sourceforge.jnlp.util.UrlUtils;
-import net.sourceforge.jnlp.util.logging.OutputController;
 import static net.sourceforge.jnlp.runtime.Translator.R;
 
 /**
@@ -2084,7 +2083,9 @@ private void merge(JNLPClassLoader extLoader) {
         }
 
         // Codebase
-        addToCodeBaseLoader(extLoader.file.getCodeBase());
+        if (this.enableCodeBase) {
+            addToCodeBaseLoader(extLoader.file.getCodeBase());
+        }
 
         // native search paths
         for (File nativeDirectory : extLoader.nativeLibraryStorage.getSearchDirectories()) {