/hg/icedtea-web: show security dialogs using the main AppContext
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Fri Oct 22 07:44:19 PDT 2010
changeset eb998ed0ab1a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=eb998ed0ab1a
author: Omair Majid <omajid at redhat.com>
date: Fri Oct 22 10:44:12 2010 -0400
show security dialogs using the main AppContext
2010-10-22 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/NetxPanel.java (runLoader): Do
not initialize JNLPRuntime here. (createAppletThreads):
Initialize JNLPRuntim here.
* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
Switch from SecurityWarningDialog.AccessType to
SecurityWarning.AccessType.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
(getInstance(JNLPFile,UpdatePolicy)): Switch to SecurityWarning.
(initializeResources): Likewise. (checkTrustWithUser): Likewise.
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Add
securityDialogMesasgeHandler. (initialize): Set System look and
feel. Start security thread. (startSecurityThread): New method.
Starts a thread to show security dialogs.
(getSecurityDialogHandler): Returns the
securityDialogMessageHandler.
* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
Switch from SecurityWarningDialog.AccessType to
SecurityWarning.AccessType. (checkAwtEventQueueAccess): New
method. Skeleton code for allowing EventQueue acccess to
applets.
* netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
Switch from SecurityWarningDialog.AccessType to
SecurityWarning.AccessType.
* netx/net/sourceforge/jnlp/security/CertWarningPane.java:
Likewise.
* netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java:
Move DialogType and AccessType to SecurityWarning.
(SecurityWarningDialog(DialogType,AccessType,JNLPFile,CertVerifier,
X509Certificate,Object[])): New method. The catch-all construction.
(SecurityWarningDialog(DialogType,AccessType,JNLPFile): Delegate to
the new constructor. (SecurityWarningDialog(DialogType,AccessTyp
e,JNLPFile,CertVerifier)): Likewise.
(SecurityWarningDialog(DialogType,AccessType,CertVerifier)):
Likewise.
(SecurityWarningDialog(DialogType,AccessType,JNLPFile,Object[])):
Likewise. (SecurityWarningDialog(DialogType,X509Certificate)):
Likewise. (showAccessWarningDialog(AccessType,JNLPFile)): Move
to SecurityWarning class.
(showAccessWarningDialog(AccessType,JNLPFile,Object[])): Likewise.
(showNotAllSignedWarningDialog(JNLPFile)): Likewise.
(showCertWarningDialog(AccessType,JNLPFile,CertVerifier)): Likewise.
(showAppletWarning): Likewise. (initDialog): Make dialog non
modal and remove window closing listener. (getValue): Make
public. (dispose): New method. Notify listeners.
(notifySelectionMade): New method. Notify listeners that user has
made a decision. (addActionListener): New method. Add a
listener to be notified when user makes a decision about this
security warning.
* netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
Switch from SecurityWarningDialog.AccessType to
SecurityWarning.AccessType.
* netx/net/sourceforge/jnlp/services/ServiceUtil.java: Likewise.
* netx/net/sourceforge/jnlp/services/XClipboardService.java: Likewise.
* netx/net/sourceforge/jnlp/services/XExtendedService.java: Likewise.
* netx/net/sourceforge/jnlp/services/XFileOpenService.java: Likewise.
* netx/net/sourceforge/jnlp/services/XFileSaveService.java: Likewise.
* netx/net/sourceforge/jnlp/security/SecurityDialogMessage.java:
New class.
* netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java
: New class. (run): New method. Runs the security message
loop. (handleMessage): New method. Handles a
SecurityDialogMessage to show a security warning.
(postMessage): New method. Posts a message to sthe security message
queue.
* netx/net/sourceforge/jnlp/security/SecurityWarning.java: New class.
Move AccessType and DialogType from SecurityWarningDialog to here.
(showAccessWarningDialog): Moved from SecurityWarningDialog to here.
(showAccessWarningDialog): Moved from SecurityWarningDialog to here.
Modified to post messages to the security queue instead of showing a
SecurityWarningDialog directly. (showNotAllSignedWarningDialog):
Likewise. (showCertWarningDialog): Likewise.
(showAppletWarning): Likewise. (getUserReponse): New method.
Posts a message to the security thread and blocks until it gets
a response from the user.
diffstat:
18 files changed, 778 insertions(+), 246 deletions(-)
ChangeLog | 82 ++
netx/net/sourceforge/jnlp/NetxPanel.java | 27
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 2
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 19
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 45 +
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 33 +
netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 3
netx/net/sourceforge/jnlp/security/CertWarningPane.java | 3
netx/net/sourceforge/jnlp/security/SecurityDialogMessage.java | 44 +
netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java | 141 ++++
netx/net/sourceforge/jnlp/security/SecurityWarning.java | 298 ++++++++++
netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 284 ++-------
netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 6
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 13
netx/net/sourceforge/jnlp/services/XClipboardService.java | 6
netx/net/sourceforge/jnlp/services/XExtendedService.java | 5
netx/net/sourceforge/jnlp/services/XFileOpenService.java | 6
netx/net/sourceforge/jnlp/services/XFileSaveService.java | 7
diffs (truncated from 1446 to 500 lines):
diff -r 85db7b3a1c93 -r eb998ed0ab1a ChangeLog
--- a/ChangeLog Thu Oct 21 21:12:21 2010 +0100
+++ b/ChangeLog Fri Oct 22 10:44:12 2010 -0400
@@ -1,3 +1,85 @@ 2010-10-20 Andrew John Hughes <ahughes
+2010-10-22 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/NetxPanel.java
+ (runLoader): Do not initialize JNLPRuntime here.
+ (createAppletThreads): Initialize JNLPRuntim here.
+ * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
+ Switch from SecurityWarningDialog.AccessType to
+ SecurityWarning.AccessType.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (getInstance(JNLPFile,UpdatePolicy)): Switch to SecurityWarning.
+ (initializeResources): Likewise.
+ (checkTrustWithUser): Likewise.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java:
+ Add securityDialogMesasgeHandler.
+ (initialize): Set System look and feel. Start security thread.
+ (startSecurityThread): New method. Starts a thread to show security
+ dialogs.
+ (getSecurityDialogHandler): Returns the securityDialogMessageHandler.
+ * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
+ Switch from SecurityWarningDialog.AccessType to
+ SecurityWarning.AccessType.
+ (checkAwtEventQueueAccess): New method. Skeleton code for allowing
+ EventQueue acccess to applets.
+ * netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
+ Switch from SecurityWarningDialog.AccessType to
+ SecurityWarning.AccessType.
+ * netx/net/sourceforge/jnlp/security/CertWarningPane.java:
+ Likewise.
+ * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java:
+ Move DialogType and AccessType to SecurityWarning.
+ (SecurityWarningDialog(DialogType,AccessType,JNLPFile,CertVerifier,
+ X509Certificate,Object[])): New method. The catch-all construction.
+ (SecurityWarningDialog(DialogType,AccessType,JNLPFile): Delegate to
+ the new constructor.
+ (SecurityWarningDialog(DialogType,AccessType,JNLPFile,CertVerifier)):
+ Likewise.
+ (SecurityWarningDialog(DialogType,AccessType,CertVerifier)): Likewise.
+ (SecurityWarningDialog(DialogType,AccessType,JNLPFile,Object[])):
+ Likewise.
+ (SecurityWarningDialog(DialogType,X509Certificate)): Likewise.
+ (showAccessWarningDialog(AccessType,JNLPFile)): Move to SecurityWarning
+ class.
+ (showAccessWarningDialog(AccessType,JNLPFile,Object[])): Likewise.
+ (showNotAllSignedWarningDialog(JNLPFile)): Likewise.
+ (showCertWarningDialog(AccessType,JNLPFile,CertVerifier)): Likewise.
+ (showAppletWarning): Likewise.
+ (initDialog): Make dialog non modal and remove window closing listener.
+ (getValue): Make public.
+ (dispose): New method. Notify listeners.
+ (notifySelectionMade): New method. Notify listeners that user has made
+ a decision.
+ (addActionListener): New method. Add a listener to be notified when
+ user makes a decision about this security warning.
+ * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
+ Switch from SecurityWarningDialog.AccessType to
+ SecurityWarning.AccessType.
+ * netx/net/sourceforge/jnlp/services/ServiceUtil.java: Likewise.
+ * netx/net/sourceforge/jnlp/services/XClipboardService.java: Likewise.
+ * netx/net/sourceforge/jnlp/services/XExtendedService.java: Likewise.
+ * netx/net/sourceforge/jnlp/services/XFileOpenService.java: Likewise.
+ * netx/net/sourceforge/jnlp/services/XFileSaveService.java: Likewise.
+ * netx/net/sourceforge/jnlp/security/SecurityDialogMessage.java:
+ New class.
+ * netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java:
+ New class.
+ (run): New method. Runs the security message loop.
+ (handleMessage): New method. Handles a SecurityDialogMessage to show a
+ security warning.
+ (postMessage): New method. Posts a message to sthe security message
+ queue.
+ * netx/net/sourceforge/jnlp/security/SecurityWarning.java: New class.
+ Move AccessType and DialogType from SecurityWarningDialog to here.
+ (showAccessWarningDialog): Moved from SecurityWarningDialog to here.
+ (showAccessWarningDialog): Moved from SecurityWarningDialog to here.
+ Modified to post messages to the security queue instead of showing a
+ SecurityWarningDialog directly.
+ (showNotAllSignedWarningDialog): Likewise.
+ (showCertWarningDialog): Likewise.
+ (showAppletWarning): Likewise.
+ (getUserReponse): New method. Posts a message to the security thread and
+ blocks until it gets a response from the user.
+
2010-10-20 Andrew John Hughes <ahughes at redhat.com>
* netx/javax/jnlp/ServiceManager.java:
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/NetxPanel.java
--- a/netx/net/sourceforge/jnlp/NetxPanel.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/NetxPanel.java Fri Oct 22 10:44:12 2010 -0400
@@ -84,19 +84,6 @@ public class NetxPanel extends AppletVie
getHeight(),
atts);
- synchronized(JNLPRuntime.initMutex) {
- //The custom NetX Policy and SecurityManager are set here.
- if (!JNLPRuntime.isInitialized()) {
- if (JNLPRuntime.isDebug())
- System.out.println("initializing JNLPRuntime...");
-
- JNLPRuntime.initialize(false);
- } else {
- if (JNLPRuntime.isDebug())
- System.out.println("JNLPRuntime already initialized");
- }
- }
-
doInit = true;
dispatchAppletEvent(APPLET_LOADING, null);
status = APPLET_LOAD;
@@ -146,6 +133,20 @@ public class NetxPanel extends AppletVie
*/
// Reminder: Relax visibility in sun.applet.AppletPanel
protected synchronized void createAppletThread() {
+ // initialize JNLPRuntime in the main threadgroup
+ synchronized(JNLPRuntime.initMutex) {
+ //The custom NetX Policy and SecurityManager are set here.
+ if (!JNLPRuntime.isInitialized()) {
+ if (JNLPRuntime.isDebug())
+ System.out.println("initializing JNLPRuntime...");
+
+ JNLPRuntime.initialize(false);
+ } else {
+ if (JNLPRuntime.isDebug())
+ System.out.println("JNLPRuntime already initialized");
+ }
+ }
+
// when this was being done (incorrectly) in Launcher, the call was
// new AppThreadGroup(mainGroup, file.getTitle());
ThreadGroup tg = new AppThreadGroup(Launcher.mainGroup,
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
--- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Fri Oct 22 10:44:12 2010 -0400
@@ -35,7 +35,7 @@ import net.sourceforge.jnlp.ShortcutDesc
import net.sourceforge.jnlp.ShortcutDesc;
import net.sourceforge.jnlp.event.ApplicationEvent;
import net.sourceforge.jnlp.event.ApplicationListener;
-import net.sourceforge.jnlp.security.SecurityWarningDialog.AccessType;
+import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
import net.sourceforge.jnlp.services.ServiceUtil;
import net.sourceforge.jnlp.util.WeakList;
import net.sourceforge.jnlp.util.XDesktopEntry;
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Oct 22 10:44:12 2010 -0400
@@ -57,7 +57,8 @@ import net.sourceforge.jnlp.cache.CacheU
import net.sourceforge.jnlp.cache.CacheUtil;
import net.sourceforge.jnlp.cache.ResourceTracker;
import net.sourceforge.jnlp.cache.UpdatePolicy;
-import net.sourceforge.jnlp.security.SecurityWarningDialog;
+import net.sourceforge.jnlp.security.SecurityWarning;
+import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
import net.sourceforge.jnlp.tools.JarSigner;
import net.sourceforge.jnlp.util.FileUtils;
import sun.misc.JarIndex;
@@ -292,7 +293,7 @@ public class JNLPClassLoader extends URL
if (extLoader != null && extLoader != loader) {
if (loader.signing && !extLoader.signing)
- if (!SecurityWarningDialog.showNotAllSignedWarningDialog(file))
+ if (!SecurityWarning.showNotAllSignedWarningDialog(file))
throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
loader.merge(extLoader);
@@ -439,7 +440,7 @@ public class JNLPClassLoader extends URL
signing = true;
if (!js.allJarsSigned() &&
- !SecurityWarningDialog.showNotAllSignedWarningDialog(file))
+ !SecurityWarning.showNotAllSignedWarningDialog(file))
throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
@@ -493,19 +494,19 @@ public class JNLPClassLoader extends URL
private void checkTrustWithUser(JarSigner js) throws LaunchException {
if (!js.getRootInCacerts()) { //root cert is not in cacerts
- boolean b = SecurityWarningDialog.showCertWarningDialog(
- SecurityWarningDialog.AccessType.UNVERIFIED, file, js);
+ boolean b = SecurityWarning.showCertWarningDialog(
+ AccessType.UNVERIFIED, file, js);
if (!b)
throw new LaunchException(null, null, R("LSFatal"),
R("LCLaunching"), R("LNotVerified"), "");
} else if (js.getRootInCacerts()) { //root cert is in cacerts
boolean b = false;
if (js.noSigningIssues())
- b = SecurityWarningDialog.showCertWarningDialog(
- SecurityWarningDialog.AccessType.VERIFIED, file, js);
+ b = SecurityWarning.showCertWarningDialog(
+ AccessType.VERIFIED, file, js);
else if (!js.noSigningIssues())
- b = SecurityWarningDialog.showCertWarningDialog(
- SecurityWarningDialog.AccessType.SIGNING_ERROR, file, js);
+ b = SecurityWarning.showCertWarningDialog(
+ AccessType.SIGNING_ERROR, file, js);
if (!b)
throw new LaunchException(null, null, R("LSFatal"),
R("LCLaunching"), R("LCancelOnUserRequest"), "");
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Oct 22 10:44:12 2010 -0400
@@ -25,9 +25,11 @@ import java.util.List;
import java.util.List;
import java.security.*;
import javax.jnlp.*;
+import javax.swing.UIManager;
import net.sourceforge.jnlp.*;
import net.sourceforge.jnlp.cache.*;
+import net.sourceforge.jnlp.security.SecurityDialogMessageHandler;
import net.sourceforge.jnlp.services.*;
import net.sourceforge.jnlp.util.*;
@@ -62,6 +64,9 @@ public class JNLPRuntime {
/** the security policy */
private static JNLPPolicy policy;
+
+ /** handles all security message to show appropriate security dialogs */
+ private static SecurityDialogMessageHandler securityDialogMessageHandler;
/** the base dir for cache, etc */
private static File baseDir;
@@ -165,6 +170,8 @@ public class JNLPRuntime {
* security manager and security policy, initializing the JNLP
* standard services, etc.<p>
*
+ * This method should be called from the main AppContext/Thread. <p>
+ *
* This method cannot be called more than once. Once
* initialized, methods that alter the runtime can only be
* called by the exit class.<p>
@@ -206,12 +213,37 @@ public class JNLPRuntime {
policy = new JNLPPolicy();
security = new JNLPSecurityManager(); // side effect: create JWindow
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception e) {
+ // ignore it
+ }
+
if (securityEnabled) {
Policy.setPolicy(policy); // do first b/c our SM blocks setPolicy
System.setSecurityManager(security);
}
+ securityDialogMessageHandler = startSecurityThreads();
+
initialized = true;
+ }
+
+ /**
+ * This must NOT be called form the application ThreadGroup. An application
+ * can inject events into its {@link EventQueue} and bypass the security
+ * dialogs.
+ *
+ * @return a {@link SecurityDialogMessageHandler} that can be used to post
+ * security messages
+ */
+ private static SecurityDialogMessageHandler startSecurityThreads() {
+ ThreadGroup securityThreadGroup = new ThreadGroup("NetxSecurityThreadGroup");
+ SecurityDialogMessageHandler runner = new SecurityDialogMessageHandler();
+ Thread securityThread = new Thread(securityThreadGroup, runner, "NetxSecurityThread");
+ securityThread.setDaemon(true);
+ securityThread.start();
+ return runner;
}
/**
@@ -318,6 +350,19 @@ public class JNLPRuntime {
public static void setSecurityEnabled(boolean enabled) {
checkInitialized();
securityEnabled = enabled;
+ }
+
+ /**
+ *
+ * @return the {@link SecurityDialogMessageHandler} that should be used to
+ * post security dialog messages
+ */
+ public static SecurityDialogMessageHandler getSecurityDialogHandler() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new AllPermission());
+ }
+ return securityDialogMessageHandler;
}
/**
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Fri Oct 22 10:44:12 2010 -0400
@@ -34,7 +34,7 @@ import javax.swing.JWindow;
import javax.swing.JWindow;
import net.sourceforge.jnlp.JNLPFile;
-import net.sourceforge.jnlp.security.SecurityWarningDialog;
+import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
import net.sourceforge.jnlp.services.ServiceUtil;
import net.sourceforge.jnlp.util.WeakList;
import sun.awt.AWTSecurityManager;
@@ -393,7 +393,7 @@ class JNLPSecurityManager extends AWTSec
ApplicationInstance app = getApplication();
if (app != null && !app.isSigned()) {
if (perm instanceof SocketPermission
- && ServiceUtil.checkAccess(SecurityWarningDialog.AccessType.NETWORK, perm.getName())) {
+ && ServiceUtil.checkAccess(AccessType.NETWORK, perm.getName())) {
return true;
}
}
@@ -435,7 +435,7 @@ class JNLPSecurityManager extends AWTSec
Window w = (Window) window;
if (JNLPRuntime.isDebug())
- System.err.println("SM: app: "+app.getTitle()+" is adding a window: "+window);
+ System.err.println("SM: app: "+app.getTitle()+" is adding a window: "+window+" with appContext "+AppContext.getAppContext());
weakWindows.add(w); // for mapping window -> app
weakApplications.add(app);
@@ -539,4 +539,31 @@ class JNLPSecurityManager extends AWTSec
}
+ /**
+ * Tests if a client can get access to the AWT event queue. This version allows
+ * complete access to the EventQueue for its own AppContext-specific EventQueue.
+ *
+ * FIXME there are probably huge security implications for this. Eg:
+ * http://hg.openjdk.java.net/jdk7/awt/jdk/rev/8022709a306d
+ *
+ * @exception SecurityException if the caller does not have
+ * permission to accesss the AWT event queue.
+ */
+ public void checkAwtEventQueueAccess() {
+ /*
+ * this is the templace of the code that should allow applets access to
+ * eventqueues
+ */
+
+ // AppContext appContext = AppContext.getAppContext();
+ // ApplicationInstance instance = getApplication();
+
+ // if ((appContext == mainAppContext) && (instance != null)) {
+ // If we're about to allow access to the main EventQueue,
+ // and anything untrusted is on the class context stack,
+ // disallow access.
+ super.checkAwtEventQueueAccess();
+ // }
+ }
+
}
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/security/AccessWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Fri Oct 22 10:44:12 2010 -0400
@@ -56,6 +56,7 @@ import javax.swing.SwingConstants;
import javax.swing.SwingConstants;
import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
import net.sourceforge.jnlp.util.FileUtils;
/**
@@ -86,7 +87,7 @@ public class AccessWarningPane extends S
* Creates the actual GUI components, and adds it to this panel
*/
private void addComponents() {
- SecurityWarningDialog.AccessType type = parent.getAccessType();
+ AccessType type = parent.getAccessType();
JNLPFile file = parent.getFile();
String name = "";
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/security/CertWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/CertWarningPane.java Thu Oct 21 21:12:21 2010 +0100
+++ b/netx/net/sourceforge/jnlp/security/CertWarningPane.java Fri Oct 22 10:44:12 2010 -0400
@@ -60,6 +60,7 @@ import net.sourceforge.jnlp.JNLPFile;
import net.sourceforge.jnlp.JNLPFile;
import net.sourceforge.jnlp.PluginBridge;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
import net.sourceforge.jnlp.tools.KeyTool;
/**
@@ -85,7 +86,7 @@ public class CertWarningPane extends Sec
* Creates the actual GUI components, and adds it to this panel
*/
private void addComponents() {
- SecurityWarningDialog.AccessType type = parent.getAccessType();
+ AccessType type = parent.getAccessType();
JNLPFile file = parent.getFile();
Certificate c = parent.getJarSigner().getPublisher();
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/security/SecurityDialogMessage.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogMessage.java Fri Oct 22 10:44:12 2010 -0400
@@ -0,0 +1,44 @@
+package net.sourceforge.jnlp.security;
+
+import java.security.cert.X509Certificate;
+import java.util.concurrent.Semaphore;
+
+import javax.swing.JDialog;
+
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
+import net.sourceforge.jnlp.security.SecurityWarning.DialogType;
+
+/**
+ * Represents a message to the security framework to show a specific security
+ * dialog
+ */
+final class SecurityDialogMessage {
+
+ /*
+ * These fields contain information need to display the correct dialog type
+ */
+
+ public DialogType dialogType;
+ public AccessType accessType;
+ public JNLPFile file;
+ public CertVerifier certVerifier;
+ public X509Certificate certificate;
+ public Object[] extras;
+
+ /*
+ * Volatile because this is shared between threads and we dont want threads
+ * to use a cached value of this.
+ */
+ public volatile Object userResponse;
+
+ /*
+ * These two fields are used to block/unblock the application or the applet.
+ * If either of them is not null, call release() or dispose() on it to allow
+ * the application/applet to continue.
+ */
+
+ public Semaphore lock;
+ public JDialog toDispose;
+
+}
diff -r 85db7b3a1c93 -r eb998ed0ab1a netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java Fri Oct 22 10:44:12 2010 -0400
@@ -0,0 +1,141 @@
+/* SecurityDialogMessageHandler.java
+ Copyright (C) 2010 Red Hat, Inc.
+
+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, version 2.
+
+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.
+*/
+
+package net.sourceforge.jnlp.security;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import sun.awt.AppContext;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+/**
+ * Handles {@link SecurityDialogMessage}s and shows appropriate security
+ * dialogs.
+ * <p>
More information about the distro-pkg-dev
mailing list