[jboss-cvs] Picketbox SVN: r342 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi.

[jboss-cvs-commits at lists.jboss.org]

Author: sguilhen at redhat.com
Date: 2012-08-13 17:50:30 -0400 (Mon, 13 Aug 2012)
New Revision: 342

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java
Log:
Fixed regressions in AS tests

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java	2012-08-13 21:49:29 UTC (rev 341)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java	2012-08-13 21:50:30 UTC (rev 342)
@@ -22,6 +22,7 @@
 package org.jboss.security.auth.spi;
 
 
+import org.jboss.logging.Logger;
 import org.jboss.security.*;
 
 import javax.security.auth.Subject;
@@ -98,6 +99,8 @@
    /** the principal to use when a null username and password are seen */
    protected Principal unauthenticatedIdentity;
 
+   protected Logger log = Logger.getLogger(AbstractServerLoginModule.class);
+
 //--- Begin LoginModule interface methods
    /** Initialize the login module. This stores the subject, callbackHandler
     * and sharedState and options for the login session. Subclasses should override

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java	2012-08-13 21:49:29 UTC (rev 341)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java	2012-08-13 21:50:30 UTC (rev 342)
@@ -21,28 +21,23 @@
 */
 package org.jboss.security.auth.spi;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginException;
-
 import org.jboss.crypto.digest.DigestCallback;
 import org.jboss.security.PicketBoxLogger;
 import org.jboss.security.PicketBoxMessages;
 import org.jboss.security.vault.SecurityVaultException;
 import org.jboss.security.vault.SecurityVaultUtil;
 
+import javax.security.auth.Subject;
+import javax.security.auth.callback.*;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
 
+
 /** An abstract subclass of AbstractServerLoginModule that imposes
  * an identity == String username, credentials == String password view on
  * the login process.
@@ -154,7 +149,7 @@
          hashCharset = (String) options.get(HASH_CHARSET);
 
          PicketBoxLogger.LOGGER.debugPasswordHashing(hashAlgorithm, hashEncoding, hashCharset,
-                 options.get(DIGEST_CALLBACK).toString(), options.get(STORE_DIGEST_CALLBACK).toString());
+                 (String) options.get(DIGEST_CALLBACK), (String) options.get(STORE_DIGEST_CALLBACK));
       }
       String flag = (String) options.get(IGNORE_PASSWORD_CASE);
       ignorePasswordCase = Boolean.valueOf(flag).booleanValue();