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 83F2A17DC4 for ; Wed, 4 Feb 2015 17:11:48 +0000 (UTC) Received: (qmail 38273 invoked by uid 500); 4 Feb 2015 17:11:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 38082 invoked by uid 500); 4 Feb 2015 17:11:49 -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 38057 invoked by uid 99); 4 Feb 2015 17:11:49 -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; Wed, 04 Feb 2015 17:11:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BF65E01CE; Wed, 4 Feb 2015 17:11:49 +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: Wed, 04 Feb 2015 17:11:51 -0000 Message-Id: <5dd1561293f149258e02ec4c33219de1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Fixing merge Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cfd1ae31 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cfd1ae31 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cfd1ae31 Branch: refs/heads/2.7.x-fixes Commit: cfd1ae31590e68df0a1c35e9393b21daf887ee78 Parents: b3d359e Author: Colm O hEigeartaigh Authored: Wed Feb 4 17:10:54 2015 +0000 Committer: Colm O hEigeartaigh Committed: Wed Feb 4 17:10:54 2015 +0000 ---------------------------------------------------------------------- .../rs/security/saml/AbstractSamlInHandler.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/cfd1ae31/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java index cc4e1f1..a1d108d 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java @@ -154,9 +154,6 @@ public abstract class AbstractSamlInHandler implements RequestHandler { } } -<<<<<<< HEAD - protected void checkSubjectConfirmationData(Message message, AssertionWrapper assertion) { -======= protected void configureAudienceRestriction(Message msg, RequestData reqData) { // Add Audience Restrictions for SAML boolean enableAudienceRestriction = @@ -172,21 +169,7 @@ public abstract class AbstractSamlInHandler implements RequestHandler { } } - protected SAMLKeyInfo createKeyInfoFromDefaultAlias(Crypto sigCrypto) throws WSSecurityException { - try { - X509Certificate[] certs = SecurityUtils.getCertificates(sigCrypto, - sigCrypto.getDefaultX509Identifier()); - SAMLKeyInfo samlKeyInfo = new SAMLKeyInfo(new X509Certificate[]{certs[0]}); - samlKeyInfo.setPublicKey(certs[0].getPublicKey()); - return samlKeyInfo; - } catch (Exception ex) { - LOG.log(Level.FINE, "Error in loading the certificates: " + ex.getMessage(), ex); - throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_SIGNATURE, ex); - } - } - - protected void checkSubjectConfirmationData(Message message, SamlAssertionWrapper assertion) { ->>>>>>> 0377022... Add the ability to validate SAML Audience Restrictions. Defaults to false unlike for SOAP + protected void checkSubjectConfirmationData(Message message, AssertionWrapper assertion) { Certificate[] tlsCerts = getTLSCertificates(message); if (!checkHolderOfKey(message, assertion, tlsCerts)) { throwFault("Holder Of Key claim fails", null);