From e1c4cc6aaa5a1f536407875bf9cf5799dc0fb54f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 2 Oct 2011 17:51:31 +0000 Subject: [PATCH] Improve login dialog git-svn-id: https://svn.argeo.org/commons/trunk@4771 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../ui/dialogs/AbstractLoginDialog.java | 2 +- .../ui/keyring/KeyringLoginModule.java | 66 ------------------- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java index 7c7104577..5c83066ee 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java +++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java @@ -171,6 +171,6 @@ public abstract class AbstractLoginDialog extends TrayDialog implements protected void configureShell(Shell shell) { super.configureShell(shell); - shell.setText("Autentication"); + shell.setText("Authentication"); } } diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java deleted file mode 100644 index ba06f887c..000000000 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.argeo.security.ui.keyring; - -import java.security.AccessController; -import java.util.Map; -import java.util.Set; - -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; - -import org.apache.commons.logging.LogConfigurationException; -import org.argeo.util.crypto.PasswordBasedEncryption; - -public class KeyringLoginModule implements LoginModule { - private Subject subject; - private CallbackHandler callbackHandler; - private PasswordBasedEncryption passwordBasedEncryption; - - public void initialize(Subject subject, CallbackHandler callbackHandler, - Map sharedState, Map options) { - this.subject = subject; - if (subject == null) { - subject = Subject.getSubject(AccessController.getContext()); - } - this.callbackHandler = callbackHandler; - } - - public boolean login() throws LoginException { - Set pbes = subject - .getPrivateCredentials(PasswordBasedEncryption.class); - if (pbes.size() > 0) - return true; - PasswordCallback pc = new PasswordCallback("Master password", false); - Callback[] callbacks = { pc }; - try { - callbackHandler.handle(callbacks); - passwordBasedEncryption = new PasswordBasedEncryption( - pc.getPassword()); - } catch (Exception e) { - throw new LogConfigurationException(e); - } - return true; - } - - public boolean commit() throws LoginException { - if (passwordBasedEncryption != null) - subject.getPrivateCredentials(PasswordBasedEncryption.class).add( - passwordBasedEncryption); - return true; - } - - public boolean abort() throws LoginException { - return true; - } - - public boolean logout() throws LoginException { - Set pbes = subject - .getPrivateCredentials(PasswordBasedEncryption.class); - pbes.clear(); - return true; - } - -} -- 2.39.2