Fix Broken Hop Cookies (#1106)

dvaldivia · web-flow · commit 5dfba3f6c826 · 2021-10-12T14:35:12.000-07:00
Signed-off-by: Daniel Valdivia &lt;18384552+dvaldivia@users.noreply.github.com&gt;
diff --git 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))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,8 @@ func GetTokenFromRequest(r *http.Request) (string, error) {`
`299`	`299`
`300`	`300`	`mergeToken := strings.TrimSpace(tokenCookie.Value)`
`301`	`301`	`for _, cookie := range r.Cookies() {`
`302`		`- if cookie.Name != "token" && strings.HasPrefix(cookie.Name, "token") {`
	`302`	`+ // any cookie with token%d structure`
	`303`	`+ if cookie.Name != "token" && !strings.HasPrefix(cookie.Name, "token-") && strings.HasPrefix(cookie.Name, "token") {`
`303`	`304`	`mergeToken = fmt.Sprintf("%s%s", mergeToken, strings.TrimSpace(cookie.Value))`
`304`	`305`	`}`
`305`	`306`	`}`