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 DADCDDB7A for ; Thu, 23 May 2013 16:43:43 +0000 (UTC) Received: (qmail 66566 invoked by uid 500); 23 May 2013 16:43:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 65870 invoked by uid 500); 23 May 2013 16:43:39 -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 65382 invoked by uid 99); 23 May 2013 16:43:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 May 2013 16:43:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 May 2013 16:43:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BB2972388906; Thu, 23 May 2013 16:43:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1485776 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Date: Thu, 23 May 2013 16:43:14 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130523164314.BB2972388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Thu May 23 16:43:14 2013 New Revision: 1485776 URL: http://svn.apache.org/r1485776 Log: [CXF-5037] - DefaultSecurityContext Principal is incorrectly set from Subject Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java?rev=1485776&r1=1485775&r2=1485776&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java Thu May 23 16:43:14 2013 @@ -48,6 +48,9 @@ public class DefaultSecurityContext impl public DefaultSecurityContext(Principal p, Subject subject) { this.p = p; this.subject = subject; + if (p == null) { + this.p = findPrincipal(subject); + } } private static Principal findPrincipal(Subject subject) { Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1485776&r1=1485775&r2=1485776&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Thu May 23 16:43:14 2013 @@ -469,7 +469,7 @@ public class WSS4JInInterceptor extends new RolePrefixSecurityContextImpl(subject, roleClassifier, roleClassifierType) ); } else { - msg.put(SecurityContext.class, new DefaultSecurityContext(subject)); + msg.put(SecurityContext.class, new DefaultSecurityContext(p, subject)); } break; } else if (p != null && isSecurityContextPrincipal(p, wsResult)) {