Merge pull request openshift#211 from arjunrn/urivalidate-empty-path

Do not set path when resolving URL path
cuigrey · Mar 17, 2022 · 0f4d38c · 0f4d38c
2 parents f2818dd + f29ed67
commit 0f4d38c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/urivalidate.go b/urivalidate.go
@@ -65,8 +65,8 @@ func ParseUrls(baseUrl, redirectUrl string) (retBaseUrl, retRedirectUrl *url.URL
 	}
 
 	// resolve references to base url
-	retBaseUrl = (&url.URL{Scheme: base.Scheme, Host: host, Path: "/"}).ResolveReference(&url.URL{Path: base.Path})
-	retRedirectUrl = (&url.URL{Scheme: base.Scheme, Host: host, Path: "/"}).ResolveReference(&url.URL{Path: redirect.Path, RawQuery: redirect.RawQuery})
+	retBaseUrl = (&url.URL{Scheme: base.Scheme, Host: host}).ResolveReference(&url.URL{Path: base.Path})
+	retRedirectUrl = (&url.URL{Scheme: base.Scheme, Host: host}).ResolveReference(&url.URL{Path: redirect.Path, RawQuery: redirect.RawQuery})
 	return
 }
 

diff --git a/urivalidate_test.go b/urivalidate_test.go
@@ -18,6 +18,18 @@ func TestURIValidate(t *testing.T) {
 			"http://localhost:14000/appauth",
 			"http://localhost:14000/appauth",
 		},
+		{
+			"Only domain, exact match",
+			"http://google.com",
+			"http://google.com",
+			"http://google.com",
+		},
+		{
+			"Only domain, with subpath",
+			"http://google.com",
+			"http://google.com/redirect",
+			"http://google.com/redirect",
+		},
 		{
 			"Trailing slash",
 			"http://www.google.com/myapp",