add configuration support for user prompts and other access control options

2010-11-18  Omair Majid  <[email protected]>

    * netx/net/sourceforge/jnlp/SecurityDesc.java: Remove window banner
    permissions from sandboxPermissions and j2eePermissions.
    (getSandBoxPermissions): Dynamically add window banner permissions
    if allowed by configuration.
    * netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java:
    Add KEY_SECURITY_PROMPT_USER,
    KEY_SECURITY_ALLOW_HIDE_WINDOW_WARNING,
    KEY_SECURITY_PROMPT_USER_FOR_JNLP, and
    KEY_SECURITY_INSTALL_AUTHENTICATOR.
    (loadDefaultProperties): Use the new constants.
    * netx/net/sourceforge/jnlp/security/SecurityWarning.java
    (showAccessWarningDialog): Check if the user should be prompted
    before prompting the user.
    (showNotAllSignedWarningDialog): Likewise.
    (showCertWarningDialog): Likewise.
    (showAppletWarning): Likewise.
    (shouldPromptUser): New method. Check if configuration allows
    showing user prompts.
    * netx/net/sourceforge/jnlp/services/ServiceUtil.java
    (checkAccess(AccessType,Object...)): Clarify javadocs.
    (checkAccess(ApplicationInstance,AccessType,Object...)): Clarify
    javadocs. Only prompt the user if showing JNLP prompts is ok.
    (shouldPromptUser): New method. Returns true if configuration allows
    for showing JNLP api prompts.
    * plugin/icedteanp/java/sun/applet/PluginMain.java
    (init): Only install custom authenticator if allowed by
    configuration.

1 files changed, 5 insertions, 1 deletions

diff --git a/plugin/icedteanp/java/sun/applet/PluginMain.java b/plugin/icedteanp/java/sun/applet/PluginMain.java
index 613a8f1..f270d9e 100644
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java
@@ -199,7 +199,11 @@ public class PluginMain
 		System.setProperties(avProps);
 
 		// plug in a custom authenticator and proxy selector
-        Authenticator.setDefault(new CustomAuthenticator());
+		boolean installAuthenticator = Boolean.valueOf(JNLPRuntime.getConfiguration()
+		        .getProperty(DeploymentConfiguration.KEY_SECURITY_INSTALL_AUTHENTICATOR));
+		if (installAuthenticator) {
+		    Authenticator.setDefault(new CustomAuthenticator());
+		}
         ProxySelector.setDefault(new PluginProxySelector());
         
         CookieManager ckManager = new PluginCookieManager();