TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsweb: allow empty redirect URL in CleanRedirectURL (#11295)

Browse Source 
Updates #cleanup

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
Andrew Lytvynov 2024-02-28 15:57:42 -08:00 committed by GitHub
parent b68a09cb34
commit c7474431f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tsweb/tsweb.go
View File

@ -524,6 +524,9 @@ func VarzHandler(w http.ResponseWriter, r *http.Request) {
// current server, or one of allowedHosts. Returns the cleaned URL or // current server, or one of allowedHosts. Returns the cleaned URL or
// a validation error. // a validation error.
func CleanRedirectURL(urlStr string, allowedHosts []string) (*url.URL, error) { func CleanRedirectURL(urlStr string, allowedHosts []string) (*url.URL, error) {
if urlStr == "" {
return &url.URL{}, nil
}
// In some places, we unfortunately query-escape the redirect URL // In some places, we unfortunately query-escape the redirect URL
// too many times, and end up needing to redirect to a URL that's // too many times, and end up needing to redirect to a URL that's
// still escaped by one level. Try to unescape the input. // still escaped by one level. Try to unescape the input.

61
tsweb/tsweb_test.go
View File

@ -626,44 +626,49 @@ func TestCleanRedirectURL(t *testing.T) {
localHost := []string{"127.0.0.1", "localhost"} localHost := []string{"127.0.0.1", "localhost"}
myServer := []string{"myserver"} myServer := []string{"myserver"}
cases := []struct { cases := []struct {
url string url string
hosts []string hosts []string
want string want string
wantErr bool
}{ }{
{"http://tailscale.com/foo", tailscaleHost, "http://tailscale.com/foo"}, {"http://tailscale.com/foo", tailscaleHost, "http://tailscale.com/foo", false},
{"http://tailscale.com/foo", tailscaleAndOtherHost, "http://tailscale.com/foo"}, {"http://tailscale.com/foo", tailscaleAndOtherHost, "http://tailscale.com/foo", false},
{"http://microsoft.com/foo", tailscaleAndOtherHost, "http://microsoft.com/foo"}, {"http://microsoft.com/foo", tailscaleAndOtherHost, "http://microsoft.com/foo", false},
{"https://tailscale.com/foo", tailscaleHost, "https://tailscale.com/foo"}, {"https://tailscale.com/foo", tailscaleHost, "https://tailscale.com/foo", false},
{"/foo", tailscaleHost, "/foo"}, {"/foo", tailscaleHost, "/foo", false},
{"//tailscale.com/foo", tailscaleHost, "//tailscale.com/foo"}, {"//tailscale.com/foo", tailscaleHost, "//tailscale.com/foo", false},
{"/a/foobar", tailscaleHost, "/a/foobar"}, {"/a/foobar", tailscaleHost, "/a/foobar", false},
{"http://127.0.0.1/a/foobar", localHost, "http://127.0.0.1/a/foobar"}, {"http://127.0.0.1/a/foobar", localHost, "http://127.0.0.1/a/foobar", false},
{"http://127.0.0.1:123/a/foobar", localHost, "http://127.0.0.1:123/a/foobar"}, {"http://127.0.0.1:123/a/foobar", localHost, "http://127.0.0.1:123/a/foobar", false},
{"http://127.0.0.1:31544/a/foobar", localHost, "http://127.0.0.1:31544/a/foobar"}, {"http://127.0.0.1:31544/a/foobar", localHost, "http://127.0.0.1:31544/a/foobar", false},
{"http://localhost/a/foobar", localHost, "http://localhost/a/foobar"}, {"http://localhost/a/foobar", localHost, "http://localhost/a/foobar", false},
{"http://localhost:123/a/foobar", localHost, "http://localhost:123/a/foobar"}, {"http://localhost:123/a/foobar", localHost, "http://localhost:123/a/foobar", false},
{"http://localhost:31544/a/foobar", localHost, "http://localhost:31544/a/foobar"}, {"http://localhost:31544/a/foobar", localHost, "http://localhost:31544/a/foobar", false},
{"http://myserver/a/foobar", myServer, "http://myserver/a/foobar"}, {"http://myserver/a/foobar", myServer, "http://myserver/a/foobar", false},
{"http://myserver:123/a/foobar", myServer, "http://myserver:123/a/foobar"}, {"http://myserver:123/a/foobar", myServer, "http://myserver:123/a/foobar", false},
{"http://myserver:31544/a/foobar", myServer, "http://myserver:31544/a/foobar"}, {"http://myserver:31544/a/foobar", myServer, "http://myserver:31544/a/foobar", false},
{"http://evil.com/foo", tailscaleHost, ""}, {"http://evil.com/foo", tailscaleHost, "", true},
{"//evil.com", tailscaleHost, ""}, {"//evil.com", tailscaleHost, "", true},
{"HttP://tailscale.com", tailscaleHost, "http://tailscale.com"}, {"HttP://tailscale.com", tailscaleHost, "http://tailscale.com", false},
{"http://TaIlScAlE.CoM/spongebob", tailscaleHost, "http://TaIlScAlE.CoM/spongebob"}, {"http://TaIlScAlE.CoM/spongebob", tailscaleHost, "http://TaIlScAlE.CoM/spongebob", false},
{"ftp://tailscale.com", tailscaleHost, ""}, {"ftp://tailscale.com", tailscaleHost, "", true},
{"https:/evil.com", tailscaleHost, ""}, // regression test for tailscale/corp#892 {"https:/evil.com", tailscaleHost, "", true}, // regression test for tailscale/corp#892
{"%2Fa%2F44869c061701", tailscaleHost, "/a/44869c061701"}, // regression test for tailscale/corp#13288 {"%2Fa%2F44869c061701", tailscaleHost, "/a/44869c061701", false}, // regression test for tailscale/corp#13288
{"https%3A%2Ftailscale.com", tailscaleHost, ""}, // escaped colon-single-slash malformed URL {"https%3A%2Ftailscale.com", tailscaleHost, "", true}, // escaped colon-single-slash malformed URL
{"", nil, "", false},
} }
for _, tc := range cases { for _, tc := range cases {
gotURL, err := CleanRedirectURL(tc.url, tc.hosts) gotURL, err := CleanRedirectURL(tc.url, tc.hosts)
if err != nil { if err != nil {
if tc.want != "" { if !tc.wantErr {
t.Errorf("CleanRedirectURL(%q, %v) got error: %v", tc.url, tc.hosts, err) t.Errorf("CleanRedirectURL(%q, %v) got error: %v", tc.url, tc.hosts, err)
} }
} else { } else {
if tc.wantErr {
t.Errorf("CleanRedirectURL(%q, %v) got %q, want an error", tc.url, tc.hosts, gotURL)
}
if got := gotURL.String(); got != tc.want { if got := gotURL.String(); got != tc.want {
t.Errorf("CleanRedirectURL(%q, %v) = %q, want %q", tc.url, tc.hosts, got, tc.want) t.Errorf("CleanRedirectURL(%q, %v) = %q, want %q", tc.url, tc.hosts, got, tc.want)
} }