Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2F6C3184C2 for ; Mon, 14 Mar 2016 17:24:05 +0000 (UTC) Received: (qmail 27667 invoked by uid 500); 14 Mar 2016 17:24:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27554 invoked by uid 500); 14 Mar 2016 17:24:00 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 27309 invoked by uid 99); 14 Mar 2016 17:23:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2016 17:23:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA480DFAEC; Mon, 14 Mar 2016 17:23:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Mon, 14 Mar 2016 17:24:01 -0000 Message-Id: <07ec2053ee9348a9877e3d26a8c5b212@git.apache.org> In-Reply-To: <39d250b76988480bb53d1f9f3c7ce029@git.apache.org> References: <39d250b76988480bb53d1f9f3c7ce029@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Revert "Some updates following WSS4J changes" Revert "Some updates following WSS4J changes" This reverts commit f4da2415cb0a7cf07873da2b330e7c3a15281639. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b1bac442 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b1bac442 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b1bac442 Branch: refs/heads/3.0.x-fixes Commit: b1bac442f3aed30d3405c9b4661d09bf809a4997 Parents: ac54794 Author: Colm O hEigeartaigh Authored: Mon Mar 14 17:23:42 2016 +0000 Committer: Colm O hEigeartaigh Committed: Mon Mar 14 17:23:42 2016 +0000 ---------------------------------------------------------------------- .../KerberosTokenInterceptorProvider.java | 2 +- .../policy/interceptors/NegotiationUtils.java | 2 +- .../ws/security/wss4j/StaxActionInInterceptor.java | 12 ++++++------ .../ws/security/wss4j/StaxCryptoCoverageChecker.java | 8 ++++---- .../wss4j/StaxSecurityContextInInterceptor.java | 15 +++++++-------- .../ws/security/wss4j/WSS4JStaxInInterceptor.java | 2 +- .../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 2 +- .../policyhandlers/StaxSymmetricBindingHandler.java | 12 ++++++------ .../cxf/sts/operation/TokenIssueOperation.java | 2 +- .../apache/cxf/sts/token/canceller/SCTCanceller.java | 2 +- 10 files changed, 29 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java index 4c73618..bd9a240 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java @@ -309,7 +309,7 @@ public class KerberosTokenInterceptorProvider extends AbstractPolicyInterceptorP (List)message.get(SecurityEvent.class.getName() + ".in"); if (incomingEventList != null) { for (SecurityEvent incomingEvent : incomingEventList) { - if (WSSecurityEventConstants.KERBEROS_TOKEN + if (WSSecurityEventConstants.KerberosToken == incomingEvent.getSecurityEventType()) { return incomingEvent; } http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java index 34d4e1f..68c05b8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java @@ -245,7 +245,7 @@ final class NegotiationUtils { (List) message.getExchange().get(SecurityEvent.class.getName() + ".in"); if (incomingEventList != null) { for (SecurityEvent incomingEvent : incomingEventList) { - if (WSSecurityEventConstants.SECURITY_CONTEXT_TOKEN + if (WSSecurityEventConstants.SecurityContextToken == incomingEvent.getSecurityEventType()) { return true; } http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java index 7559638..e64a71c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java @@ -73,10 +73,10 @@ public class StaxActionInInterceptor extends AbstractPhaseInterceptor timestampResults = - getEventFromResults(WSSecurityEventConstants.TIMESTAMP, incomingSecurityEventList); + getEventFromResults(WSSecurityEventConstants.Timestamp, incomingSecurityEventList); if (!timestampResults.isEmpty()) { checkSignedTimestamp(results); } @@ -122,7 +122,7 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor usernameTokenResults = - getEventFromResults(WSSecurityEventConstants.USERNAME_TOKEN, incomingSecurityEventList); + getEventFromResults(WSSecurityEventConstants.UsernameToken, incomingSecurityEventList); if (!usernameTokenResults.isEmpty()) { if (signUsernameToken) { checkSignedUsernameToken(results); http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java index 3a8b8a5..52d8cdb 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java @@ -91,10 +91,9 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor desiredSecurityEvents = new ArrayList(); - List desiredSecurityEvents = new ArrayList<>(); - desiredSecurityEvents.add(WSSecurityEventConstants.SAML_TOKEN); - desiredSecurityEvents.add(WSSecurityEventConstants.USERNAME_TOKEN); - desiredSecurityEvents.add(WSSecurityEventConstants.KERBEROS_TOKEN); + desiredSecurityEvents.add(WSSecurityEventConstants.SamlToken); + desiredSecurityEvents.add(WSSecurityEventConstants.UsernameToken); + desiredSecurityEvents.add(WSSecurityEventConstants.KerberosToken); desiredSecurityEvents.add(WSSecurityEventConstants.X509Token); desiredSecurityEvents.add(WSSecurityEventConstants.KeyValueToken); @@ -130,7 +129,7 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor tokenSecurityEvent = (TokenSecurityEvent)securityEvent; WSS4JUtils.parseAndStoreStreamingSecurityToken(tokenSecurityEvent.getSecurityToken(), msg); http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java index a6a77fe..c6171e0 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java @@ -172,7 +172,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { if (tok == null && !isRequestor()) { org.apache.xml.security.stax.securityToken.SecurityToken securityToken = - findInboundSecurityToken(WSSecurityEventConstants.SAML_TOKEN); + findInboundSecurityToken(WSSecurityEventConstants.SamlToken); tokenId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message); } } else if (encryptionToken instanceof SecureConversationToken @@ -185,7 +185,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { properties.addAction(actionToPerform); } else if (tok == null && !isRequestor()) { org.apache.xml.security.stax.securityToken.SecurityToken securityToken = - findInboundSecurityToken(WSSecurityEventConstants.SECURITY_CONTEXT_TOKEN); + findInboundSecurityToken(WSSecurityEventConstants.SecurityContextToken); tokenId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message); } } else if (encryptionToken instanceof X509Token) { @@ -298,7 +298,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { if (sigTok == null && !isRequestor()) { org.apache.xml.security.stax.securityToken.SecurityToken securityToken = - findInboundSecurityToken(WSSecurityEventConstants.SAML_TOKEN); + findInboundSecurityToken(WSSecurityEventConstants.SamlToken); sigTokId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message); } } else if (sigToken instanceof SecureConversationToken @@ -311,7 +311,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { properties.addAction(actionToPerform); } else if (sigTok == null && !isRequestor()) { org.apache.xml.security.stax.securityToken.SecurityToken securityToken = - findInboundSecurityToken(WSSecurityEventConstants.SECURITY_CONTEXT_TOKEN); + findInboundSecurityToken(WSSecurityEventConstants.SecurityContextToken); sigTokId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message); } } else if (sigToken instanceof X509Token) { @@ -618,7 +618,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { (List) message.getExchange().get(SecurityEvent.class.getName() + ".in"); if (incomingEventList != null) { for (SecurityEvent incomingEvent : incomingEventList) { - if (WSSecurityEventConstants.ENCRYPTED_PART == incomingEvent.getSecurityEventType() + if (WSSecurityEventConstants.EncryptedPart == incomingEvent.getSecurityEventType() || WSSecurityEventConstants.EncryptedElement == incomingEvent.getSecurityEventType()) { org.apache.xml.security.stax.securityToken.SecurityToken token = @@ -635,7 +635,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { // Fall back to a Signature in case there was no encrypted Element in the request for (SecurityEvent incomingEvent : incomingEventList) { - if (WSSecurityEventConstants.SIGNED_PART == incomingEvent.getSecurityEventType() + if (WSSecurityEventConstants.SignedPart == incomingEvent.getSecurityEventType() || WSSecurityEventConstants.SignedElement == incomingEvent.getSecurityEventType()) { org.apache.xml.security.stax.securityToken.SecurityToken token = http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java index 00588df..d15c9fd 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java @@ -407,7 +407,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera // Now try steaming results try { org.apache.xml.security.stax.securityToken.SecurityToken securityToken = - findInboundSecurityToken(WSSecurityEventConstants.SAML_TOKEN, messageContext); + findInboundSecurityToken(WSSecurityEventConstants.SamlToken, messageContext); if (securityToken instanceof SamlSecurityToken && ((SamlSecurityToken)securityToken).getSamlAssertionWrapper() != null) { return ((SamlSecurityToken)securityToken).getSamlAssertionWrapper(); http://git-wip-us.apache.org/repos/asf/cxf/blob/b1bac442/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java index 644236e..6836cec 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java @@ -186,7 +186,7 @@ public class SCTCanceller implements TokenCanceller { (List) messageContext.get(SecurityEvent.class.getName() + ".in"); if (incomingEventList != null) { for (SecurityEvent incomingEvent : incomingEventList) { - if (WSSecurityEventConstants.SIGNED_PART == incomingEvent.getSecurityEventType() + if (WSSecurityEventConstants.SignedPart == incomingEvent.getSecurityEventType() || WSSecurityEventConstants.SignedElement == incomingEvent.getSecurityEventType()) { org.apache.xml.security.stax.securityToken.SecurityToken token =