svn commit: r1299250 - /webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java

[giger]

Author: giger
Date: Sat Mar 10 18:43:09 2012
New Revision: 1299250

URL: http://svn.apache.org/viewvc?rev=1299250&view=rev
Log:
AuthenticationType is optional and can be null therefore...

Modified:
    
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java

Modified: 
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java?rev=1299250&r1=1299249&r2=1299250&view=diff
==============================================================================
--- 
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java
 (original)
+++ 
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/HttpsTokenAssertionState.java
 Sat Mar 10 18:43:09 2012
@@ -57,25 +57,27 @@ public class HttpsTokenAssertionState ex
             setAsserted(false);
             setErrorMessage("IssuerName in Policy (" + 
httpsToken.getIssuerName() + ") didn't match with the one in the HttpsToken (" 
+ httpsTokenSecurityEvent.getIssuerName() + ")");
         }
-        switch (httpsToken.getAuthenticationType()) {
-            case HttpBasicAuthentication:
-                if (httpsTokenSecurityEvent.getAuthenticationType() != 
HttpsTokenSecurityEvent.AuthenticationType.HttpBasicAuthentication) {
-                    setAsserted(false);
-                    setErrorMessage("Policy enforces HttpBasicAuthentication 
but we got " + httpsTokenSecurityEvent.getAuthenticationType());
-                }
-                break;
-            case HttpDigestAuthentication:
-                if (httpsTokenSecurityEvent.getAuthenticationType() != 
HttpsTokenSecurityEvent.AuthenticationType.HttpDigestAuthentication) {
-                    setAsserted(false);
-                    setErrorMessage("Policy enforces HttpDigestAuthentication 
but we got " + httpsTokenSecurityEvent.getAuthenticationType());
-                }
-                break;
-            case RequireClientCertificate:
-                if (httpsTokenSecurityEvent.getAuthenticationType() != 
HttpsTokenSecurityEvent.AuthenticationType.HttpsClientCertificateAuthentication)
 {
-                    setAsserted(false);
-                    setErrorMessage("Policy enforces 
HttClientCertificateAuthentication but we got " + 
httpsTokenSecurityEvent.getAuthenticationType());
-                }
-                break;
+        if (httpsToken.getAuthenticationType() != null) {
+            switch (httpsToken.getAuthenticationType()) {
+                case HttpBasicAuthentication:
+                    if (httpsTokenSecurityEvent.getAuthenticationType() != 
HttpsTokenSecurityEvent.AuthenticationType.HttpBasicAuthentication) {
+                        setAsserted(false);
+                        setErrorMessage("Policy enforces 
HttpBasicAuthentication but we got " + 
httpsTokenSecurityEvent.getAuthenticationType());
+                    }
+                    break;
+                case HttpDigestAuthentication:
+                    if (httpsTokenSecurityEvent.getAuthenticationType() != 
HttpsTokenSecurityEvent.AuthenticationType.HttpDigestAuthentication) {
+                        setAsserted(false);
+                        setErrorMessage("Policy enforces 
HttpDigestAuthentication but we got " + 
httpsTokenSecurityEvent.getAuthenticationType());
+                    }
+                    break;
+                case RequireClientCertificate:
+                    if (httpsTokenSecurityEvent.getAuthenticationType() != 
HttpsTokenSecurityEvent.AuthenticationType.HttpsClientCertificateAuthentication)
 {
+                        setAsserted(false);
+                        setErrorMessage("Policy enforces 
HttClientCertificateAuthentication but we got " + 
httpsTokenSecurityEvent.getAuthenticationType());
+                    }
+                    break;
+            }
         }
         return isAsserted();
     }