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

providers/proxy: revert Host header behaviour

Browse Source 
closes #2284

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2022-02-14 12:39:16 +01:00
parent df362dd9ea
commit 4915e980c5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,6 @@ func (a *Application) proxyModifyRequest(ou *url.URL) func(req *http.Request) {
claims, _ := a.getClaims(r) claims, _ := a.getClaims(r)
r.URL.Scheme = ou.Scheme r.URL.Scheme = ou.Scheme
r.URL.Host = ou.Host r.URL.Host = ou.Host
r.Host = ou.Host
if claims != nil && claims.Proxy != nil && claims.Proxy.BackendOverride != "" { if claims != nil && claims.Proxy != nil && claims.Proxy.BackendOverride != "" {
u, err := url.Parse(claims.Proxy.BackendOverride) u, err := url.Parse(claims.Proxy.BackendOverride)
if err != nil { if err != nil {
@ -85,7 +84,6 @@ func (a *Application) proxyModifyRequest(ou *url.URL) func(req *http.Request) {
} else { } else {
r.URL.Scheme = u.Scheme r.URL.Scheme = u.Scheme
r.URL.Host = u.Host r.URL.Host = u.Host
r.Host = u.Host
} }
} }
a.log.WithField("upstream_url", r.URL.String()).Trace("final upstream url") a.log.WithField("upstream_url", r.URL.String()).Trace("final upstream url")

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

@ -22,7 +22,7 @@ func TestProxy_ModifyRequest(t *testing.T) {
assert.Equal(t, "frontend", req.Header.Get("X-Forwarded-Host")) assert.Equal(t, "frontend", req.Header.Get("X-Forwarded-Host"))
assert.Equal(t, "/foo", req.URL.Path) assert.Equal(t, "/foo", req.URL.Path)
assert.Equal(t, "backend:8012", req.URL.Host) assert.Equal(t, "backend:8012", req.URL.Host)
assert.Equal(t, "backend:8012", req.Host) assert.Equal(t, "frontend", req.Host)
} }
func TestProxy_ModifyRequest_Claims(t *testing.T) { func TestProxy_ModifyRequest_Claims(t *testing.T) {
@ -50,7 +50,7 @@ func TestProxy_ModifyRequest_Claims(t *testing.T) {
assert.Equal(t, "/foo", req.URL.Path) assert.Equal(t, "/foo", req.URL.Path)
assert.Equal(t, "other-backend:8123", req.URL.Host) assert.Equal(t, "other-backend:8123", req.URL.Host)
assert.Equal(t, "other-backend:8123", req.Host) assert.Equal(t, "frontend", req.Host)
} }
func TestProxy_ModifyRequest_Claims_Invalid(t *testing.T) { func TestProxy_ModifyRequest_Claims_Invalid(t *testing.T) {
@ -78,5 +78,5 @@ func TestProxy_ModifyRequest_Claims_Invalid(t *testing.T) {
assert.Equal(t, "/foo", req.URL.Path) assert.Equal(t, "/foo", req.URL.Path)
assert.Equal(t, "backend:8012", req.URL.Host) assert.Equal(t, "backend:8012", req.URL.Host)
assert.Equal(t, "backend:8012", req.Host) assert.Equal(t, "frontend", req.Host)
} }