Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 483A4200C4C for ; Tue, 4 Apr 2017 13:06:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 46C41160B81; Tue, 4 Apr 2017 11:06:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 95407160B90 for ; Tue, 4 Apr 2017 13:06:49 +0200 (CEST) Received: (qmail 91400 invoked by uid 500); 4 Apr 2017 11:06:48 -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 91288 invoked by uid 99); 4 Apr 2017 11:06:48 -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; Tue, 04 Apr 2017 11:06:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7ED29DFEE9; Tue, 4 Apr 2017 11:06:48 +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: Tue, 04 Apr 2017 11:06:50 -0000 Message-Id: <35e350dae7b34bacb51ef4edb9817ab3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Fixing merge archived-at: Tue, 04 Apr 2017 11:06:50 -0000 Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9ee4e026 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9ee4e026 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9ee4e026 Branch: refs/heads/3.1.x-fixes Commit: 9ee4e026f3a82cbec5ad9f0efca136a216d84956 Parents: d370505 Author: Colm O hEigeartaigh Authored: Tue Apr 4 12:06:41 2017 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 4 12:06:41 2017 +0100 ---------------------------------------------------------------------- .../DefaultWSS4JSecurityContextCreator.java | 22 -------------------- 1 file changed, 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9ee4e026/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java index 2cbebd7..75fbc33 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java @@ -94,38 +94,17 @@ public class DefaultWSS4JSecurityContextCreator implements WSS4JSecurityContextC List foundResults = actionResults.get(resultPriority); if (foundResults != null && !foundResults.isEmpty()) { for (WSSecurityEngineResult result : foundResults) { -<<<<<<< HEAD - final Object binarySecurity = result.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN); - PublicKey publickey = - (PublicKey)result.get(WSSecurityEngineResult.TAG_PUBLIC_KEY); - X509Certificate cert = - (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE); - - if ((resultPriority == WSConstants.BST && !(binarySecurity instanceof KerberosSecurity)) - || (resultPriority == WSConstants.SIGN && publickey == null && cert == null)) { - continue; - } - SecurityContext context = createSecurityContext(msg, useJAASSubject, result); - if (context != null) { - msg.put(SecurityContext.class, context); - return; -======= - if (!skipResult(resultPriority, result)) { SecurityContext context = createSecurityContext(msg, useJAASSubject, result); if (context != null) { msg.put(SecurityContext.class, context); return; } ->>>>>>> d1b8ff6... CXF-7314 - Custom BinarySecurityTokens are not used to set up the security context } } } } } -<<<<<<< HEAD - -======= private boolean skipResult(Integer resultPriority, WSSecurityEngineResult result) { Object binarySecurity = result.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN); @@ -139,7 +118,6 @@ public class DefaultWSS4JSecurityContextCreator implements WSS4JSecurityContextC || resultPriority == WSConstants.SIGN && publickey == null && cert == null; } ->>>>>>> d1b8ff6... CXF-7314 - Custom BinarySecurityTokens are not used to set up the security context protected SecurityContext createSecurityContext( SoapMessage msg, boolean useJAASSubject, WSSecurityEngineResult wsResult ) {