You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ws.apache.org by co...@apache.org on 2012/03/16 10:32:43 UTC

svn commit: r1301391 - /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java

Author: coheigea
Date: Fri Mar 16 09:32:43 2012
New Revision: 1301391

URL: http://svn.apache.org/viewvc?rev=1301391&view=rev
Log:
[WSS-380] - SAML1 AuthenticationStatement only supports AuthenticationMethod Password
 - Patch applied, thanks

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java?rev=1301391&r1=1301390&r2=1301391&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java Fri Mar 16 09:32:43 2012
@@ -374,7 +374,6 @@ public class SAML1ComponentBuilder {
     /**
      * Method transformAuthenticationMethod transforms the user-supplied authentication method 
      * value into one of the supported specification-compliant values.
-     * NOTE: Only "Password" is supported at this time.
      *
      * @param sourceMethod of type String
      * @return String
@@ -384,6 +383,8 @@ public class SAML1ComponentBuilder {
 
         if ("Password".equals(sourceMethod)) {
             transformedMethod = SAML1Constants.AUTH_METHOD_PASSWORD;
+        } else if (sourceMethod != null && !"".equals(sourceMethod)) {
+            return sourceMethod;
         }
 
         return transformedMethod;