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

[giger]

Author: giger
Date: Sat Mar 10 18:44:38 2012
New Revision: 1299251

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

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

Modified: 
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java?rev=1299251&r1=1299250&r2=1299251&view=diff
==============================================================================
--- 
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java
 (original)
+++ 
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java
 Sat Mar 10 18:44:38 2012
@@ -93,32 +93,34 @@ public class X509TokenAssertionState ext
                 setAsserted(false);
                 setErrorMessage("X509Certificate Version " + 
x509Certificate.getVersion() + " not supported");
             }
-            switch (x509Token.getTokenType()) {
-                case WssX509V3Token10:
-                case WssX509V3Token11:
-                    if (WSSConstants.X509V3Token != 
securityToken.getTokenType() || x509Certificate.getVersion() != 3) {
+            if (x509Token.getTokenType() != null) {
+                switch (x509Token.getTokenType()) {
+                    case WssX509V3Token10:
+                    case WssX509V3Token11:
+                        if (WSSConstants.X509V3Token != 
securityToken.getTokenType() || x509Certificate.getVersion() != 3) {
+                            setAsserted(false);
+                            setErrorMessage("X509Certificate Version " + 
x509Certificate.getVersion() + " mismatch; Policy enforces " + 
x509Token.getTokenType());
+                        }
+                        break;
+                    case WssX509V1Token11:
+                        if (WSSConstants.X509V1Token != 
securityToken.getTokenType() || x509Certificate.getVersion() != 1) {
+                            setAsserted(false);
+                            setErrorMessage("X509Certificate Version " + 
x509Certificate.getVersion() + " mismatch; Policy enforces " + 
x509Token.getTokenType());
+                        }
+                        break;
+                    case WssX509PkiPathV1Token10:
+                    case WssX509PkiPathV1Token11:
+                        if (securityToken.getTokenType() != 
WSSConstants.X509PkiPathV1Token) {
+                            setAsserted(false);
+                            setErrorMessage("Policy enforces " + 
x509Token.getTokenType() + " but we got " + securityToken.getTokenType());
+                        }
+                        break;
+                    case WssX509Pkcs7Token10:
+                    case WssX509Pkcs7Token11:
                         setAsserted(false);
-                        setErrorMessage("X509Certificate Version " + 
x509Certificate.getVersion() + " mismatch; Policy enforces " + 
x509Token.getTokenType());
-                    }
-                    break;
-                case WssX509V1Token11:
-                    if (WSSConstants.X509V1Token != 
securityToken.getTokenType() || x509Certificate.getVersion() != 1) {
-                        setAsserted(false);
-                        setErrorMessage("X509Certificate Version " + 
x509Certificate.getVersion() + " mismatch; Policy enforces " + 
x509Token.getTokenType());
-                    }
-                    break;
-                case WssX509PkiPathV1Token10:
-                case WssX509PkiPathV1Token11:
-                    if (securityToken.getTokenType() != 
WSSConstants.X509PkiPathV1Token) {
-                        setAsserted(false);
-                        setErrorMessage("Policy enforces " + 
x509Token.getTokenType() + " but we got " + securityToken.getTokenType());
-                    }
-                    break;
-                case WssX509Pkcs7Token10:
-                case WssX509Pkcs7Token11:
-                    setAsserted(false);
-                    setErrorMessage("Unsupported token type: " + 
securityToken.getTokenType());
-                    break;
+                        setErrorMessage("Unsupported token type: " + 
securityToken.getTokenType());
+                        break;
+                }
             }
         } catch (XMLSecurityException e) {
             setAsserted(false);