cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/5] git commit: Fixing IssuedToken commit
Date Thu, 26 Jun 2014 15:17:01 GMT
Fixing IssuedToken commit


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/45c1a5ca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/45c1a5ca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/45c1a5ca

Branch: refs/heads/2.6.x-fixes
Commit: 45c1a5ca5be23a7db38fb623b7e6f2d1933dd9e1
Parents: 7c309b5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Jun 26 15:27:30 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Jun 26 16:06:43 2014 +0100

----------------------------------------------------------------------
 .../interceptors/IssuedTokenInterceptorProvider.java  | 14 --------------
 1 file changed, 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/45c1a5ca/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index fb6697b..35fb3aa 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -498,13 +498,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
                 if (ais == null) {
                     return;
                 }
-<<<<<<< HEAD
-=======
                 
-                IssuedToken itok = (IssuedToken)ais.iterator().next().getAssertion();
-                assertIssuedToken(itok, aim);
-                
->>>>>>> 60bad6d... Fixing problem with IssuedToken policy validation
                 if (!isRequestor(message)) {
                     message.getExchange().remove(SecurityConstants.TOKEN);
                     List<WSHandlerResult> results = 
@@ -513,10 +507,6 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
                         parseHandlerResults(results.get(0), message, ais);
                     }
                 } else {
-                    for (AssertionInfo ai : ais) {
-                        ai.setAsserted(true);
-                    }
-                } else {
                     //client side should be checked on the way out
                     for (AssertionInfo ai : ais) {
                         ai.setAsserted(true);
@@ -537,10 +527,6 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
             
             IssuedTokenPolicyValidator issuedValidator = 
                 new IssuedTokenPolicyValidator(signedResults, message);
-<<<<<<< HEAD
-            Collection<AssertionInfo> issuedAis = aim.get(SP12Constants.ISSUED_TOKEN);
-=======
->>>>>>> 60bad6d... Fixing problem with IssuedToken policy validation
 
             for (AssertionWrapper assertionWrapper : findSamlTokenResults(rResult.getResults()))
{
                 boolean valid = issuedValidator.validatePolicy(issuedAis, assertionWrapper);


Mime
View raw message