Repository: cxf Updated Branches: refs/heads/3.0.x-fixes bd26eadf9 -> ed682ac7e
If a named principal is available then keep the existing sec context Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed682ac7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed682ac7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed682ac7 Branch: refs/heads/3.0.x-fixes Commit: ed682ac7e4d37c59cf79c8028f2a55471cdbbc93 Parents: bd26ead Author: Sergey Beryozkin <[email protected]> Authored: Tue Dec 1 21:15:16 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Dec 1 21:17:16 2015 +0000 ---------------------------------------------------------------------- .../rs/security/jose/jaxrs/JwsContainerRequestFilter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ed682ac7/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsContainerRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsContainerRequestFilter.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsContainerRequestFilter.java index 003e674..44ba01a 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsContainerRequestFilter.java +++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsContainerRequestFilter.java @@ -60,9 +60,12 @@ public class JwsContainerRequestFilter extends AbstractJwsReaderProvider impleme context.getHeaders().putSingle("Content-Type", ct); } - SecurityContext securityContext = configureSecurityContext(theSigVerifier); - if (securityContext != null) { - JAXRSUtils.getCurrentMessage().put(SecurityContext.class, securityContext); + Principal currentPrincipal = context.getSecurityContext().getUserPrincipal(); + if (currentPrincipal != null && currentPrincipal.getName() != null) { + SecurityContext securityContext = configureSecurityContext(theSigVerifier); + if (securityContext != null) { + JAXRSUtils.getCurrentMessage().put(SecurityContext.class, securityContext); + } } }
