[jboss-svn-commits] JBL Code SVN: r21291 - in labs/jbossesb/workspace/dbevenius/security/product/rosetta: src/org/jboss/soa/esb/services/security/auth/http and 1 other directories.

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

Author: beve
Date: 2008-07-30 03:36:27 -0400 (Wed, 30 Jul 2008)
New Revision: 21291

Modified:
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java
Log:
changed password to be a char[]


Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java	2008-07-30 06:39:41 UTC (rev 21290)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java	2008-07-30 07:36:27 UTC (rev 21291)
@@ -55,7 +55,13 @@
             else if (callbacks[i] instanceof PasswordCallback) 
             {
                 PasswordCallback pc = (PasswordCallback) callbacks[i];
-                pc.setPassword(authRequest.getCredentials().iterator().next().toString().toCharArray());
+                for (Object object : authRequest.getCredentials() )
+				{
+                	if ( object instanceof char[] )
+                	{
+                        pc.setPassword((char[]) object);
+                	}
+				}
             } 
             else 
             {

Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java	2008-07-30 06:39:41 UTC (rev 21290)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java	2008-07-30 07:36:27 UTC (rev 21291)
@@ -49,12 +49,12 @@
 		if ( username != null )
 		{
 			User user = new User((String)username);
-			Set<String> credentials = new HashSet<String>();
+			Set<char[]> credentials = new HashSet<char[]>();
 			
 			String passwd = (String) request.get(PASSWORD_KEY);
 			if ( passwd != null )
 			{
-    			credentials.add(passwd);
+    			credentials.add(passwd.toCharArray());
     			Object remove = request.remove(PASSWORD_KEY);
     			if ( remove == null )
     			{ 

Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java	2008-07-30 06:39:41 UTC (rev 21290)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java	2008-07-30 07:36:27 UTC (rev 21291)
@@ -53,7 +53,8 @@
 		
 		assertNotNull(authRequest); 
 		assertEquals(username, authRequest.getPrincipal().getName());
-		assertEquals(password, authRequest.getCredentials().iterator().next());
+		char[] passwd = (char[]) authRequest.getCredentials().iterator().next();
+		assertEquals(password, new String(passwd));
 	}
 	
 	private Map<String,Object> createRequestMap(final String username, final String password)