pac4j: don't wrap exception as runtime exception fix #3623

jooby-project · Feb 18, 2025 · 269de30 · 269de30
1 parent 4cd96a9
commit 269de30
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 33 deletions.
diff --git a/modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/CallbackFilterImpl.java b/modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/CallbackFilterImpl.java
@@ -10,6 +10,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
+import io.jooby.SneakyThrows;
 import io.jooby.pac4j.Pac4jFrameworkParameters;
 import io.jooby.pac4j.Pac4jOptions;
 
@@ -26,16 +27,23 @@ public CallbackFilterImpl(Config config, Pac4jOptions options) {
 
   @NonNull @Override
   public Object apply(@NonNull Context ctx) throws Exception {
-    var result =
-        config
-            .getCallbackLogic()
-            .perform(
-                config,
-                options.getDefaultUrl(),
-                options.getRenewSession(),
-                options.getDefaultClient(),
-                Pac4jFrameworkParameters.create(ctx));
-
-    return result == null ? ctx : result;
+    try {
+      var result =
+          config
+              .getCallbackLogic()
+              .perform(
+                  config,
+                  options.getDefaultUrl(),
+                  options.getRenewSession(),
+                  options.getDefaultClient(),
+                  Pac4jFrameworkParameters.create(ctx));
+
+      return result == null ? ctx : result;
+    } catch (RuntimeException re) {
+      if (re.getCause() != null) {
+        throw SneakyThrows.propagate(re.getCause());
+      }
+      throw re;
+    }
   }
 }
diff --git a/modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/LogoutImpl.java b/modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/LogoutImpl.java
@@ -10,6 +10,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
+import io.jooby.SneakyThrows;
 import io.jooby.pac4j.Pac4jFrameworkParameters;
 import io.jooby.pac4j.Pac4jOptions;
 
@@ -26,20 +27,27 @@ public LogoutImpl(Config config, Pac4jOptions options) {
 
   @NonNull @Override
   public Object apply(@NonNull Context ctx) throws Exception {
-    var redirectTo = (String) ctx.getAttributes().get("pac4j.logout.redirectTo");
-    if (redirectTo == null || redirectTo.isEmpty()) {
-      redirectTo = options.getDefaultUrl();
+    try {
+      var redirectTo = (String) ctx.getAttributes().get("pac4j.logout.redirectTo");
+      if (redirectTo == null || redirectTo.isEmpty()) {
+        redirectTo = options.getDefaultUrl();
+      }
+      redirectTo = ctx.getRequestURL(redirectTo);
+      return config
+          .getLogoutLogic()
+          .perform(
+              config,
+              redirectTo,
+              options.getLogoutUrlPattern(),
+              options.isLocalLogout(),
+              options.isDestroySession(),
+              options.isCentralLogout(),
+              Pac4jFrameworkParameters.create(ctx));
+    } catch (RuntimeException re) {
+      if (re.getCause() != null) {
+        throw SneakyThrows.propagate(re.getCause());
+      }
+      throw re;
     }
-    redirectTo = ctx.getRequestURL(redirectTo);
-    return config
-        .getLogoutLogic()
-        .perform(
-            config,
-            redirectTo,
-            options.getLogoutUrlPattern(),
-            options.isLocalLogout(),
-            options.isDestroySession(),
-            options.isCentralLogout(),
-            Pac4jFrameworkParameters.create(ctx));
   }
 }
diff --git a/modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/SecurityFilterImpl.java b/modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/SecurityFilterImpl.java
@@ -20,6 +20,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
+import io.jooby.SneakyThrows;
 import io.jooby.pac4j.Pac4jFrameworkParameters;
 import io.jooby.pac4j.Pac4jOptions;
 
@@ -76,12 +77,19 @@ public Object apply(@NonNull Context ctx) throws Exception {
     return perform(ctx, new GrantAccessAdapterImpl(ctx, options));
   }
 
-  private Object perform(Context ctx, GrantAccessAdapterImpl accessAdapter) throws Exception {
-    var securityLogic = config.getSecurityLogic();
-    var clients = ctx.lookup(clientName(securityLogic)).value(this.clients.get());
-    var authorizers = ofNullable(this.authorizers).orElse(NoopAuthorizer.NAME);
-    return securityLogic.perform(
-        config, accessAdapter, clients, authorizers, null, Pac4jFrameworkParameters.create(ctx));
+  private Object perform(Context ctx, GrantAccessAdapterImpl accessAdapter) {
+    try {
+      var securityLogic = config.getSecurityLogic();
+      var clients = ctx.lookup(clientName(securityLogic)).value(this.clients.get());
+      var authorizers = ofNullable(this.authorizers).orElse(NoopAuthorizer.NAME);
+      return securityLogic.perform(
+          config, accessAdapter, clients, authorizers, null, Pac4jFrameworkParameters.create(ctx));
+    } catch (RuntimeException re) {
+      if (re.getCause() != null) {
+        throw SneakyThrows.propagate(re.getCause());
+      }
+      throw re;
+    }
   }
 
   private String clientName(SecurityLogic securityLogic) {

diff --git a/modules/jooby-pac4j/src/main/java/io/jooby/pac4j/Pac4jModule.java b/modules/jooby-pac4j/src/main/java/io/jooby/pac4j/Pac4jModule.java
@@ -86,10 +86,9 @@ private static class ProtectedPath {
 
     private final List<Object> clients = new ArrayList<>();
 
-    public ProtectedPath add(String authorizer, Object client) {
+    public void add(String authorizer, Object client) {
       this.authorizers.add(authorizer);
       this.clients.add(client);
-      return this;
     }
   }