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/aaf7e663 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaf7e663 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaf7e663 Branch: refs/heads/2.7.x-fixes Commit: aaf7e6638eba5d1c91f8e4f132ca9fc8b513914f Parents: e01a6ce Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Jun 26 15:27:30 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Jun 26 15:27:30 2014 +0100 ---------------------------------------------------------------------- .../interceptors/IssuedTokenInterceptorProvider.java | 14 -------------- 1 file changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/aaf7e663/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 2c37826..9130a2d 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 @@ -544,13 +544,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 = @@ -559,10 +553,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); @@ -581,10 +571,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);
