Merge pull request #167 from quarkiverse/fix/exception-failures

Replace calls to abortWith to thrown exceptions to allow exception mapping to occur for authentication failures
quarkiverse · Sep 28, 2024 · a378b56 · a378b56
2 parents 16e4ba2 + 13f8cd3
commit a378b56
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/runtime/src/main/java/io/quarkiverse/zanzibar/jaxrs/ZanzibarReactiveAuthorizationFilter.java b/runtime/src/main/java/io/quarkiverse/zanzibar/jaxrs/ZanzibarReactiveAuthorizationFilter.java
@@ -1,12 +1,10 @@
 package io.quarkiverse.zanzibar.jaxrs;
 
-import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
-import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-
 import java.time.Duration;
 import java.util.Optional;
 
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.InternalServerErrorException;
 
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
@@ -33,7 +31,7 @@ public void filter(ResteasyReactiveContainerRequestContext context) {
         var checkOpt = prepare(context);
 
         if (checkOpt.isEmpty()) {
-            context.abortWith(Response.status(FORBIDDEN).build());
+            context.resume(new ForbiddenException());
             return;
         }
 
@@ -54,17 +52,16 @@ public void filter(ResteasyReactiveContainerRequestContext context) {
 
                     if (!allowed) {
 
-                        context.abortWith(Response.status(FORBIDDEN).build());
-                    }
+                        context.resume(new ForbiddenException());
+                    } else {
 
-                    context.resume();
+                        context.resume();
+                    }
 
                 }, (x) -> {
                     log.error("Authorization check failed", x);
 
-                    context.abortWith(Response.status(INTERNAL_SERVER_ERROR).build());
-
-                    context.resume();
+                    context.resume(new InternalServerErrorException(x));
                 });
     }
 }
diff --git a/...e/src/main/java/io/quarkiverse/zanzibar/jaxrs/ZanzibarSynchronousAuthorizationFilter.java b/...e/src/main/java/io/quarkiverse/zanzibar/jaxrs/ZanzibarSynchronousAuthorizationFilter.java
@@ -1,14 +1,12 @@
 package io.quarkiverse.zanzibar.jaxrs;
 
-import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
-import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-
 import java.time.Duration;
 import java.util.Optional;
 
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.InternalServerErrorException;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;
-import jakarta.ws.rs.core.Response;
 
 import org.jboss.logging.Logger;
 
@@ -32,8 +30,7 @@ public void filter(ContainerRequestContext context) {
         var checkOpt = prepare(context);
 
         if (checkOpt.isEmpty()) {
-            context.abortWith(Response.status(FORBIDDEN).build());
-            return;
+            throw new ForbiddenException();
         }
         var check = checkOpt.get();
 
@@ -47,15 +44,14 @@ public void filter(ContainerRequestContext context) {
             log.debugf("Authorization %s", allowed ? "allowed" : "disallowed");
 
             if (!allowed) {
-                context.abortWith(Response.status(FORBIDDEN).build());
+                throw new ForbiddenException();
             }
 
         } catch (Throwable x) {
 
             log.error("Authorization check failed", x);
 
-            context.abortWith(Response.status(INTERNAL_SERVER_ERROR).build());
-
+            throw new InternalServerErrorException(x);
         }
     }
 }