Merge branch 'pr/flexponsive/481'

vouch · Aug 12, 2022 · 6f0c8d8 · 6f0c8d8
2 parents 8eae4e5 + 0ea205b
commit 6f0c8d8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/handlers/login.go b/handlers/login.go
@@ -154,12 +154,17 @@ func normalizeLoginURLParam(loginURL *url.URL) (*url.URL, []string, error) {
 			// Still looking for url param
 			if paramKey == "url" {
 				// Found it
-				parsed, e := url.Parse(loginURL.Query().Get("url"))
+				parsed, e := url.ParseQuery(param)
+
 				if e != nil {
 					return nil, []string{}, e // failure to parse url param
 				}
 
-				urlParam = parsed
+				urlParam, e = url.Parse(parsed.Get("url"))
+
+				if e != nil {
+					return nil, []string{}, e // failure to parse url param
+				}
 			} else if !isVouchParam {
 				// Non-vouch param before url param is a stray param
 				log.Infof("Stray param in login request (%s)", paramKey)