Skip to content

Remove Servlet specific auth from JAX-RS #5504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2019
Merged

Remove Servlet specific auth from JAX-RS #5504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 8 additions & 31 deletions ...steasy/runtime/src/main/java/io/quarkus/resteasy/runtime/UnauthorizedExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package io.quarkus.resteasy.runtime;

import java.lang.reflect.Method;
import java.util.concurrent.ExecutionException;

import javax.annotation.Priority;
import javax.enterprise.inject.spi.CDI;
import javax.ws.rs.Priorities;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;

import org.jboss.logging.Logger;
import org.jboss.resteasy.core.ResteasyContext;

import io.quarkus.security.UnauthorizedException;
import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
import io.quarkus.vertx.http.runtime.security.ChallengeData;
import io.quarkus.vertx.http.runtime.security.HttpAuthenticator;
import io.vertx.ext.web.RoutingContext;
Expand All @@ -28,41 +28,18 @@ public class UnauthorizedExceptionMapper implements ExceptionMapper<Unauthorized

private static final Logger log = Logger.getLogger(UnauthorizedExceptionMapper.class.getName());

//Servlet API may not be present
private static final Class<?> HTTP_SERVLET_REQUEST;
private static final Class<?> HTTP_SERVLET_RESPONSE;
private static final Method AUTHENTICATE;

static {
Class<?> httpServletReq = null;
Class<?> httpServletResp = null;
Method auth = null;
try {
httpServletReq = Class.forName("javax.servlet.http.HttpServletRequest");
httpServletResp = Class.forName("javax.servlet.http.HttpServletResponse");
auth = httpServletReq.getMethod("authenticate", httpServletResp);
} catch (Exception ignored) {
private volatile CurrentVertxRequest currentVertxRequest;

CurrentVertxRequest currentVertxRequest() {
if (currentVertxRequest == null) {
currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
}
AUTHENTICATE = auth;
HTTP_SERVLET_REQUEST = httpServletReq;
HTTP_SERVLET_RESPONSE = httpServletResp;
return currentVertxRequest;
}

@Override
public Response toResponse(UnauthorizedException exception) {
if (HTTP_SERVLET_REQUEST != null) {
Object httpServletRequest = ResteasyContext.getContextData(HTTP_SERVLET_REQUEST);
if (httpServletRequest != null) {
Object httpServletResponse = ResteasyContext.getContextData(HTTP_SERVLET_RESPONSE);
try {
AUTHENTICATE.invoke(httpServletRequest, httpServletResponse);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
RoutingContext context = ResteasyContext.getContextData(RoutingContext.class);
RoutingContext context = currentVertxRequest().getCurrent();
if (context != null) {
HttpAuthenticator authenticator = context.get(HttpAuthenticator.class.getName());
if (authenticator != null) {
Expand Down