From 3d042e708a832ba252ff5b259752ccbf0082a925 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Fri, 10 Sep 2021 12:43:57 +0200
Subject: [PATCH] outposts/proxy: always redirect on forward_auth for traefik

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .../proxyv2/application/mode_forward.go       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/internal/outpost/proxyv2/application/mode_forward.go b/internal/outpost/proxyv2/application/mode_forward.go
index 644ab98ee..58757bfaa 100644
--- a/internal/outpost/proxyv2/application/mode_forward.go
+++ b/internal/outpost/proxyv2/application/mode_forward.go
@@ -33,27 +33,27 @@ func (a *Application) forwardHandleTraefik(rw http.ResponseWriter, r *http.Reque
 		return
 	}
 	host := ""
+	s, _ := a.sessions.Get(r, constants.SeesionName)
 	// Optional suffix, which is appended to the URL
 	if *a.proxyConfig.Mode == api.PROXYMODE_FORWARD_SINGLE {
 		host = web.GetHost(r)
 	} else if *a.proxyConfig.Mode == api.PROXYMODE_FORWARD_DOMAIN {
 		host = a.proxyConfig.ExternalHost
-		// set the redirect flag to the current URL we have, since we redirect
-		// to a (possibly) different domain, but we want to be redirected back
-		// to the application
-		s, _ := a.sessions.Get(r, constants.SeesionName)
-		// see https://doc.traefik.io/traefik/middlewares/forwardauth/
-		// X-Forwarded-Uri is only the path, so we need to build the entire URL
-		s.Values[constants.SessionRedirect] = fmt.Sprintf(
-			"%s://%s%s",
-			r.Header.Get("X-Forwarded-Proto"),
-			r.Header.Get("X-Forwarded-Host"),
-			r.Header.Get("X-Forwarded-Uri"),
-		)
-		err := s.Save(r, rw)
-		if err != nil {
-			a.log.WithError(err).Warning("failed to save session before redirect")
-		}
+	}
+	// set the redirect flag to the current URL we have, since we redirect
+	// to a (possibly) different domain, but we want to be redirected back
+	// to the application
+	// see https://doc.traefik.io/traefik/middlewares/forwardauth/
+	// X-Forwarded-Uri is only the path, so we need to build the entire URL
+	s.Values[constants.SessionRedirect] = fmt.Sprintf(
+		"%s://%s%s",
+		r.Header.Get("X-Forwarded-Proto"),
+		r.Header.Get("X-Forwarded-Host"),
+		r.Header.Get("X-Forwarded-Uri"),
+	)
+	err = s.Save(r, rw)
+	if err != nil {
+		a.log.WithError(err).Warning("failed to save session before redirect")
 	}
 	proto := r.Header.Get("X-Forwarded-Proto")
 	if proto != "" {