svn commit: r1457825 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java

[coheigea]

Author: coheigea
Date: Mon Mar 18 15:46:26 2013
New Revision: 1457825

URL: http://svn.apache.org/r1457825
Log:
Merged revisions 1457781 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1457781 | coheigea | 2013-03-18 14:39:26 +0000 (Mon, 18 Mar 2013) | 2 lines

  SamlTokenInterceptor is not checking version of received token against the 
policy

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java?rev=1457825&r1=1457824&r2=1457825&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
 Mon Mar 18 15:46:26 2013
@@ -113,6 +113,20 @@ public class SamlTokenInterceptor extend
                         }
                         assertTokens(message, SP12Constants.SAML_TOKEN, 
signed);
                         
+                        // Check version against policy
+                        AssertionInfoMap aim = 
message.get(AssertionInfoMap.class);
+                        for (AssertionInfo ai : 
aim.getAssertionInfo(SP12Constants.SAML_TOKEN)) {
+                            SamlToken samlToken = (SamlToken)ai.getAssertion();
+                            for (WSSecurityEngineResult result : samlResults) {
+                                AssertionWrapper assertionWrapper = 
+                                    
(AssertionWrapper)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+
+                                if (!checkVersion(samlToken, 
assertionWrapper)) {
+                                    ai.setNotAsserted("Wrong SAML Version");
+                                }
+                            }
+                        }
+                        
                         Principal principal = 
                             
(Principal)samlResults.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
                         message.put(WSS4JInInterceptor.PRINCIPAL_RESULT, 
principal);                   
@@ -339,4 +353,19 @@ public class SamlTokenInterceptor extend
         return crypto;
     }
 
+    /**
+     * Check the policy version against the received assertion
+     */
+    private boolean checkVersion(SamlToken samlToken, AssertionWrapper 
assertionWrapper) {
+        if ((samlToken.isUseSamlVersion11Profile10()
+            || samlToken.isUseSamlVersion11Profile11())
+            && assertionWrapper.getSamlVersion() != SAMLVersion.VERSION_11) {
+            return false;
+        } else if (samlToken.isUseSamlVersion20Profile11()
+            && assertionWrapper.getSamlVersion() != SAMLVersion.VERSION_20) {
+            return false;
+        }
+        return true;
+    }
+    
 }