commit fcaa12e93752917cf1293b6004373b2fdd885a7b
author David Ostrovsky <david@ostrovsky.org> Sat Jan 12 21:00:04 2019 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Mon Feb 11 23:05:59 2019 +0000
tree 5bda31878584eeed3e2238984198cfe7ae81d152
parent 31ce81dbece96d5ddeb5234a298e4b50d4751b5b

Add support for Single Log Out

Change-Id: I3111f251e3eaaff00734a7f22d35424704aee403

src/main/java/com/thesamet/gerrit/plugins/saml/SamlWebFilter.java

diff --git a/src/main/java/com/thesamet/gerrit/plugins/saml/SamlWebFilter.java b/src/main/java/com/thesamet/gerrit/plugins/saml/SamlWebFilter.java
index a96ac75..b3228e6 100644
--- a/src/main/java/com/thesamet/gerrit/plugins/saml/SamlWebFilter.java
+++ b/src/main/java/com/thesamet/gerrit/plugins/saml/SamlWebFilter.java
@@ -169,8 +169,14 @@
       } else {
         chain.doFilter(httpRequest, httpResponse);
       }
-    } catch (final HttpAction requiresHttpAction) {
-      throw new TechnicalException("Unexpected HTTP action", requiresHttpAction);
+    } catch (final HttpAction httpAction) {
+      // In pac4j v3.4.0 SLO (Single Log Out) throws HttpAction with code 200.
+      // Detect that flow and recover by redirecting to the main gerrit page.
+      if (httpAction.getCode() != 200) {
+        throw new TechnicalException("Unexpected HTTP action", httpAction);
+      }
+
+      httpResponse.sendRedirect(httpRequest.getContextPath() + "/");
     }
   }