Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4cf2123f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4cf2123f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4cf2123f Branch: refs/heads/2.7.x-fixes Commit: 4cf2123f3a3f2c86ced916a0bd4af76f122aa0b0 Parents: c05942e Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Mar 9 15:46:56 2015 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Mar 9 15:46:56 2015 +0000 ---------------------------------------------------------------------- .../cxf/sts/token/delegation/SAMLDelegationHandler.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4cf2123f/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java index f078f8c..a7381b0 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java @@ -26,20 +26,14 @@ import java.util.logging.Logger; import org.w3c.dom.Element; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.sts.request.ReceivedToken; -<<<<<<< HEAD +import org.apache.cxf.sts.request.ReceivedToken.STATE; + import org.apache.ws.security.WSConstants; import org.apache.ws.security.WSSecurityException; import org.apache.ws.security.saml.ext.AssertionWrapper; import org.apache.ws.security.saml.ext.builder.SAML1Constants; import org.apache.ws.security.saml.ext.builder.SAML2Constants; -======= -import org.apache.cxf.sts.request.ReceivedToken.STATE; -import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.common.saml.builder.SAML1Constants; -import org.apache.wss4j.common.saml.builder.SAML2Constants; -import org.apache.wss4j.dom.WSConstants; ->>>>>>> 57822c1... Make sure delegation is only allowed if the token is valid for the SAML case + import org.opensaml.saml1.core.AudienceRestrictionCondition; /**
