Updating ContainerRequestContextImpl to try and make new security context visible to CXF interceptors too
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2ed93ca4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2ed93ca4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2ed93ca4 Branch: refs/heads/master-jaxrs-2.1 Commit: 2ed93ca443d4369203a7b927bfa335a6b4e4b540 Parents: f376b31 Author: Sergey Beryozkin <[email protected]> Authored: Tue Jul 19 21:30:38 2016 +0300 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Jul 19 21:30:38 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2ed93ca4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java index 9110e3e..1fa9557 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java @@ -134,6 +134,10 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl public void setSecurityContext(SecurityContext sc) { checkContext(); m.put(SecurityContext.class, sc); + if (sc instanceof org.apache.cxf.security.SecurityContext) { + m.put(org.apache.cxf.security.SecurityContext.class, + (org.apache.cxf.security.SecurityContext)sc); + } } private void checkNotPreMatch() {
