From eb79d5c6eeade1cbab1f58ce4ff3578618f19d65 Mon Sep 17 00:00:00 2001 From: "Katarina Valalikova (katkav)" Date: Tue, 22 Jul 2014 13:27:06 +0200 Subject: [PATCH] updated security handlers for REST after cxf upgrade.. --- .../security/MidpointRestAuthenticationHandler.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java index 7ba5a805d09..b5090383f6e 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java @@ -27,6 +27,7 @@ import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.jaxrs.model.OperationResourceInfo; +import org.apache.cxf.jaxrs.utils.JAXRSUtils; import org.apache.cxf.message.Message; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +52,7 @@ public class MidpointRestAuthenticationHandler implements ContainerRequestFilter @Autowired(required = true) private Protector protector; - public Response handleRequest(Message m, ClassResourceInfo resourceClass) { + public Response handleRequest(Message m) { AuthorizationPolicy policy = (AuthorizationPolicy)m.get(AuthorizationPolicy.class); OperationResourceInfo ori = m.getExchange().get(OperationResourceInfo.class); @@ -137,20 +138,24 @@ public Response handleRequest(Message m, ClassResourceInfo resourceClass) { } // // @Override -// public Response handleResponse(Message m, OperationResourceInfo ori, Response response) { +// public Response handleResponse(Message m, Response response) { // securityEnforcer.setupPreAuthenticatedSecurityContext((PrismObject) null); // return null; // } @Override public void filter(ContainerRequestContext arg0, ContainerResponseContext arg1) throws IOException { - // TODO Auto-generated method stub + Message m = JAXRSUtils.getCurrentMessage(); + handleRequest(m); + +// handleResponse(m, ori, response) } @Override public void filter(ContainerRequestContext arg0) throws IOException { - // TODO Auto-generated method stub + Message m = JAXRSUtils.getCurrentMessage(); + handleRequest(m); }