From 5dfba3f6c826e3d5836e1eb2caf4fd8731df0eb4 Mon Sep 17 00:00:00 2001
From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
Date: Tue, 12 Oct 2021 14:35:12 -0700
Subject: [PATCH] Fix Broken Hop Cookies (#1106)

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
---
 pkg/auth/token.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/auth/token.go b/pkg/auth/token.go
index 69d2e4fbb..46b5fcc9c 100644
--- a/pkg/auth/token.go
+++ b/pkg/auth/token.go
@@ -299,7 +299,8 @@ func GetTokenFromRequest(r *http.Request) (string, error) {
 
 	mergeToken := strings.TrimSpace(tokenCookie.Value)
 	for _, cookie := range r.Cookies() {
-		if cookie.Name != "token" && strings.HasPrefix(cookie.Name, "token") {
+		// any cookie with token%d structure
+		if cookie.Name != "token" && !strings.HasPrefix(cookie.Name, "token-") && strings.HasPrefix(cookie.Name, "token") {
 			mergeToken = fmt.Sprintf("%s%s", mergeToken, strings.TrimSpace(cookie.Value))
 		}
 	}