/hg/icedtea-web: Fix PR1513, signed applets with external main-c...

[aazores at icedtea.classpath.org]

changeset 39ff18bc291f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=39ff18bc291f
author: Andrew Azores <aazores at redhat.com>
date: Tue Oct 29 17:30:18 2013 -0400

	Fix PR1513, signed applets with external main-class support

	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
	(initializeResources) ask for user approval rather than throwing
	LaunchException for signed applets with external main-class


diffstat:

 ChangeLog                                              |   7 +++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  23 ++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (59 lines):

diff -r cdb796a6195b -r 39ff18bc291f ChangeLog
--- a/ChangeLog	Fri Oct 25 12:19:15 2013 +0200
+++ b/ChangeLog	Tue Oct 29 17:30:18 2013 -0400
@@ -1,3 +1,10 @@
+2013-10-29  Andrew Azores  <aazores at redhat.com>
+
+	Fix PR1513, signed applets with external main-class support
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(initializeResources) ask for user approval rather than throwing
+	LaunchException for signed applets with external main-class
+
 2013-10-25  Jiri Vanek  <jvanek at redhat.com>
 
 	Plugin debug can now be controlled from itw_settings, in same way java side.
diff -r cdb796a6195b -r 39ff18bc291f netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Oct 25 12:19:15 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Oct 29 17:30:18 2013 -0400
@@ -682,33 +682,26 @@
             if (jcv.isFullySigned()) {
                 signing = true;
 
-                if (!jcv.allJarsSigned() &&
-                                    !SecurityDialogs.showNotAllSignedWarningDialog(file))
-                    throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
-
                 // Check for main class in the downloaded jars, and check/verify signed JNLP fill
                 checkForMain(initialJars);
 
                 // If jar with main class was not found, check available resources
-                while (!foundMainJar && available != null && available.size() != 0) 
+                while (!foundMainJar && available != null && available.size() != 0)
                     addNextResource();
 
                 // If the jar with main class was not found, check extension
                 // jnlp's resources
                 foundMainJar = foundMainJar || hasMainInExtensions();
 
-                // If jar with main class was not found and there are no more
-                // available jars, throw a LaunchException
-                if (file.getLaunchInfo() != null) {
-                    if (!foundMainJar
-                            && (available == null || available.size() == 0))
-                        throw new LaunchException(file, null, R("LSFatal"),
-                                R("LCClient"), R("LCantDetermineMainClass"),
-                                R("LCantDetermineMainClassInfo"));
-                }
+                boolean externalMainClass = (file.getLaunchInfo() != null && !foundMainJar
+                        && (available == null || available.size() == 0));
+
+                if ((!jcv.allJarsSigned() || externalMainClass) &&
+                                    !SecurityDialogs.showNotAllSignedWarningDialog(file))
+                    throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
 
                 // If main jar was found, but a signed JNLP file was not located
-                if (!isSignedJNLP && foundMainJar) 
+                if (!isSignedJNLP && foundMainJar)
                     file.setSignedJNLPAsMissing();
 
                 //user does not trust this publisher