habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

outposts/proxy: Fix invalid redirect on external hosts containing path components (#8915)

Browse Source 
* outposts/proxy: Fix invalid redirect on external hosts containing path components

Signed-off-by: Max <github@germancoding.com>

* outposts/proxy: Fix test for changed redirect logic

Signed-off-by: Max <github@germancoding.com>

---------

Signed-off-by: Max <github@germancoding.com>
This commit is contained in:
Max
2024-03-19 20:31:08 +01:00
committed by GitHub
parent 880ca9a57d
commit 1b81973358
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/outpost/proxyv2/application/mode_proxy_test.go
View File

@ -56,7 +56,7 @@ func TestProxy_Redirect_Subdirectory(t *testing.T) {
loc, _ := rr.Result().Location() loc, _ := rr.Result().Location()
assert.Equal( assert.Equal(
t, t,
"https://ext.t.goauthentik.io/subdir/outpost.goauthentik.io/start?rd=https%3A%2F%2Fext.t.goauthentik.io%2Ffoo", "https://ext.t.goauthentik.io/subdir/outpost.goauthentik.io/start?rd=https%3A%2F%2Fext.t.goauthentik.io%2Fsubdir%2Ffoo",
loc.String(), loc.String(),
) )
} }

17
internal/outpost/proxyv2/application/utils.go
View File

@ -3,7 +3,6 @@ package application
import ( import (
"net/http" "net/http"
"net/url" "net/url"
"path"
"strconv" "strconv"
"strings" "strings"
@ -11,22 +10,12 @@ import (
"goauthentik.io/internal/outpost/proxyv2/constants" "goauthentik.io/internal/outpost/proxyv2/constants"
) )
func urlPathSet(originalUrl string, newPath string) string {
u, err := url.Parse(originalUrl)
if err != nil {
return originalUrl
}
u.Path = newPath
return u.String()
}
func urlJoin(originalUrl string, newPath string) string { func urlJoin(originalUrl string, newPath string) string {
u, err := url.Parse(originalUrl) u, err := url.JoinPath(originalUrl, newPath)
if err != nil { if err != nil {
return originalUrl return originalUrl
} }
u.Path = path.Join(u.Path, newPath) return u
return u.String()
} }
func (a *Application) redirectToStart(rw http.ResponseWriter, r *http.Request) { func (a *Application) redirectToStart(rw http.ResponseWriter, r *http.Request) {
@ -46,7 +35,7 @@ func (a *Application) redirectToStart(rw http.ResponseWriter, r *http.Request) {
} }
} }
redirectUrl := urlPathSet(a.proxyConfig.ExternalHost, r.URL.Path) redirectUrl := urlJoin(a.proxyConfig.ExternalHost, r.URL.Path)
if a.Mode() == api.PROXYMODE_FORWARD_DOMAIN { if a.Mode() == api.PROXYMODE_FORWARD_DOMAIN {
dom := strings.TrimPrefix(*a.proxyConfig.CookieDomain, ".") dom := strings.TrimPrefix(*a.proxyConfig.CookieDomain, ".")