TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 11:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use host with potential port for instance context (#7022)

Browse Source
This commit is contained in:
Livio Spring 2023-12-06 18:53:41 +02:00 committed by GitHub
parent a87f54b328
commit 6f3afb810d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/http/middleware/instance_interceptor.go
View File

@ -111,7 +111,7 @@ func hostFromOrigin(ctx context.Context) (host string, err error) {
if err != nil { if err != nil {
return "", err return "", err
} }
host = u.Hostname() host = u.Host
if host == "" { if host == "" {
err = errors.New("empty host") err = errors.New("empty host")
} }

2
internal/api/http/middleware/instance_interceptor_test.go
View File

@ -221,7 +221,7 @@ func Test_setInstance(t *testing.T) {
r.Header.Set("host", "fromrequest") r.Header.Set("host", "fromrequest")
return r.WithContext(zitadel_http.WithComposedOrigin(r.Context(), "https://fromorigin:9999")) return r.WithContext(zitadel_http.WithComposedOrigin(r.Context(), "https://fromorigin:9999"))
}(), }(),
verifier: &mockInstanceVerifier{"fromorigin"}, verifier: &mockInstanceVerifier{"fromorigin:9999"},
headerName: "host", headerName: "host",
}, },
res{ res{