3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-13 00:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

auth: do not strip query parameters in forward auth (#2216)

Browse source
This commit is contained in:
wasaga 2021-05-28 17:19:18 -04:00 • committed by GitHub
parent d538f1d104
commit db00821001
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/urlutil/url.go
View file

@ -110,18 +110,3 @@ func GetDomainsForURL(u url.URL) []string {
func IsTCP(u *url.URL) bool {
return u.Scheme == "tcp+http" || u.Scheme == "tcp+https"
}
// ParseEnvoyQueryParams returns a new URL with queryparams parsed from envoy format.
func ParseEnvoyQueryParams(u *url.URL) *url.URL {
nu := &url.URL{
Scheme: u.Scheme,
Host: u.Host,
Path: u.Path,
}
path := u.Path
if idx := strings.Index(path, "?"); idx != -1 {
nu.Path, nu.RawQuery = path[:idx], path[idx+1:]
}
return nu
}

19
internal/urlutil/url_test.go
View file

@ -157,22 +157,3 @@ func TestGetDomainsForURL(t *testing.T) {
})
}
}
func TestParseEnvoyQueryParams(t *testing.T) {
tests := []struct {
name string
u *url.URL
want *url.URL
}{
{"empty", &url.URL{}, &url.URL{}},
{"basic example", &url.URL{Host: "pomerium.io", Path: "/?uri=https://pomerium.com/"}, &url.URL{Host: "pomerium.io", Path: "/", RawQuery: "uri=https://pomerium.com/"}},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := ParseEnvoyQueryParams(tt.u)
if diff := cmp.Diff(got, tt.want); diff != "" {
t.Errorf("ParseEnvoyQueryParams() = %v", diff)
}
})
}
}

4
proxy/forward_auth.go
View file

@ -58,10 +58,6 @@ func (p *Proxy) nginxPostCallbackRedirect(w http.ResponseWriter, r *http.Request
if err != nil {
return httputil.NewError(http.StatusBadRequest, err)
}
u = urlutil.ParseEnvoyQueryParams(u)
q := u.Query()
q.Del(urlutil.QueryForwardAuthURI)
u.RawQuery = q.Encode()
httputil.Redirect(w, r, u.String(), http.StatusFound)
return nil
}