[jboss-svn-commits] JBL Code SVN: r29652 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws.

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

Author: beve
Date: 2009-10-19 06:30:01 -0400 (Mon, 19 Oct 2009)
New Revision: 29652

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2890 "WSSecurityInfoExtractor: Revert check for security token element before attempting to extract security information"


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java	2009-10-19 10:12:28 UTC (rev 29651)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java	2009-10-19 10:30:01 UTC (rev 29652)
@@ -96,35 +96,28 @@
 			return null;
 		}
 		
-		if (soap.contains("UsernameToken") || soap.contains("BinarySecurityToken"))
+		final JavaResult javaResult = new JavaResult();
+		smooks.filterSource(new StreamSource(new StringReader(soap)), javaResult);
+		
+		UsernameToken token = (UsernameToken) javaResult.getBean("userNameToken");
+		User user = null;
+		Set<Object> credentials = new HashSet<Object>();
+		if (token != null)
 		{
-			final JavaResult javaResult = new JavaResult();
-			smooks.filterSource(new StreamSource(new StringReader(soap)), javaResult);
+    		user = new User(token.getUserName());
+        	credentials.add(token.getPassword());
+		}
 		
-			UsernameToken token = (UsernameToken) javaResult.getBean("userNameToken");
-			User user = null;
-			Set<Object> credentials = new HashSet<Object>();
-			if (token != null)
-			{
-	    		user = new User(token.getUserName());
-	        	credentials.add(token.getPassword());
-			}
-		
-			BinarySecurityToken binaryToken = (BinarySecurityToken) javaResult.getBean("binarySecurityToken");
-			if (binaryToken != null)
-			{
-	    		credentials.add(binaryToken.getKey());
-			}
-			if (credentials.isEmpty())
-			{
-				return null;
-			}
-			return new AuthenticationRequestImpl.Builder(user, credentials ).build();
+		BinarySecurityToken binaryToken = (BinarySecurityToken) javaResult.getBean("binarySecurityToken");
+		if (binaryToken != null)
+		{
+    		credentials.add(binaryToken.getKey());
 		}
-		else
+		if (credentials.isEmpty())
 		{
 			return null;
 		}
+		return new AuthenticationRequestImpl.Builder(user, credentials ).build();
 	}
 
 	private void createSmooks(final String configFile)