From 0c80d1229bfe453e1800d6a9e89a31bcd66271d0 Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Sun, 21 Jun 2026 21:57:55 +0000
Subject: [PATCH] Fix literal plus preservation in challenge redirects

---
 main.go      |  5 ++++-
 main_test.go | 52 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/main.go b/main.go
index 62129d4..81aa754 100644
--- a/main.go
+++ b/main.go
@@ -705,7 +705,10 @@ func normalizeDestination(destination string) string {
 		return "/"
 	}
 
-	unescaped, err := url.QueryUnescape(destination)
+	// The form parser has already applied application/x-www-form-urlencoded
+	// decoding. Use path semantics for destinations that are still escaped so
+	// literal plus signs are not decoded a second time as spaces.
+	unescaped, err := url.PathUnescape(destination)
 	if err == nil && unescaped != destination {
 		if sanitized := sanitizeDestination(unescaped); sanitized != "/" || unescaped == "/" {
 			return sanitized
diff --git a/main_test.go b/main_test.go
index 3930b71..b63dc8c 100644
--- a/main_test.go
+++ b/main_test.go
@@ -1211,12 +1211,13 @@ func TestStateBookkeepingErrorBranches(t *testing.T) {
 
 func TestVerifyChallengePage(t *testing.T) {
 	tests := []struct {
-		name           string
-		provider       string
-		formValues     map[string]string
-		mockResponse   string
-		expectedStatus int
-		shouldSetCache bool
+		name             string
+		provider         string
+		formValues       map[string]string
+		mockResponse     string
+		expectedStatus   int
+		shouldSetCache   bool
+		expectedLocation string
 	}{
 		{
 			name:           "Missing captcha response",
@@ -1232,9 +1233,22 @@ func TestVerifyChallengePage(t *testing.T) {
 				"cf-turnstile-response": "valid-token",
 				"destination":           "%2Fhome",
 			},
-			mockResponse:   `{"success":true}`,
-			expectedStatus: http.StatusFound,
-			shouldSetCache: true,
+			mockResponse:     `{"success":true}`,
+			expectedStatus:   http.StatusFound,
+			shouldSetCache:   true,
+			expectedLocation: "/home",
+		},
+		{
+			name:     "Successful verification preserves literal plus",
+			provider: "turnstile",
+			formValues: map[string]string{
+				"cf-turnstile-response": "valid-token",
+				"destination":           "/Chrome%20+%20MariaDB%20",
+			},
+			mockResponse:     `{"success":true}`,
+			expectedStatus:   http.StatusFound,
+			shouldSetCache:   true,
+			expectedLocation: "/Chrome%20+%20MariaDB%20",
 		},
 		{
 			name:     "Successful verification without destination",
@@ -1242,9 +1256,10 @@ func TestVerifyChallengePage(t *testing.T) {
 			formValues: map[string]string{
 				"g-recaptcha-response": "valid-token",
 			},
-			mockResponse:   `{"success":true}`,
-			expectedStatus: http.StatusFound,
-			shouldSetCache: true,
+			mockResponse:     `{"success":true}`,
+			expectedStatus:   http.StatusFound,
+			shouldSetCache:   true,
+			expectedLocation: "/",
 		},
 		{
 			name:     "Failed verification",
@@ -1263,9 +1278,10 @@ func TestVerifyChallengePage(t *testing.T) {
 				"cf-turnstile-response": "valid-token",
 				"destination":           "%ZZ",
 			},
-			mockResponse:   `{"success":true}`,
-			expectedStatus: http.StatusFound,
-			shouldSetCache: true,
+			mockResponse:     `{"success":true}`,
+			expectedStatus:   http.StatusFound,
+			shouldSetCache:   true,
+			expectedLocation: "/",
 		},
 	}
 
@@ -1310,6 +1326,10 @@ func TestVerifyChallengePage(t *testing.T) {
 			if found != tt.shouldSetCache {
 				t.Errorf("Expected cache set=%v, got=%v", tt.shouldSetCache, found)
 			}
+
+			if tt.expectedLocation != "" && rr.Header().Get("Location") != tt.expectedLocation {
+				t.Errorf("Expected Location %q, got %q", tt.expectedLocation, rr.Header().Get("Location"))
+			}
 		})
 	}
 }
@@ -2106,6 +2126,8 @@ func TestNormalizeDestination(t *testing.T) {
 		{name: "empty", destination: "", want: "/"},
 		{name: "decoded local path", destination: "/home?foo=bar", want: "/home?foo=bar"},
 		{name: "encoded local path", destination: "%2Fhome%3Ffoo%3Dbar", want: "/home?foo=bar"},
+		{name: "decoded path with literal plus", destination: "/Chrome%20+%20MariaDB%20", want: "/Chrome%20+%20MariaDB%20"},
+		{name: "encoded path with literal plus", destination: "%2FChrome%2520%2B%2520MariaDB%2520", want: "/Chrome%20+%20MariaDB%20"},
 		{name: "absolute url", destination: "https://evil.com/phish", want: "/"},
 		{name: "protocol relative url", destination: "//evil.com/phish", want: "/"},
 		{name: "relative path", destination: "home", want: "/"},