outpost/proxy: fix double slash when trailing slash in authentik_host
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
parent
2983adc719
commit
b9c605bf1a
|
@ -48,18 +48,30 @@ func akProviderToEndpoint(p api.ProxyOutpostConfig, authentikHost string) oauth2
|
||||||
host := os.Getenv("AUTHENTIK_HOST")
|
host := os.Getenv("AUTHENTIK_HOST")
|
||||||
authUrl = strings.ReplaceAll(authUrl, host, browserHost)
|
authUrl = strings.ReplaceAll(authUrl, host, browserHost)
|
||||||
}
|
}
|
||||||
if strings.HasPrefix(authUrl, "http://localhost:8000") {
|
ep := oauth2.Endpoint{
|
||||||
if authentikHost == "" {
|
|
||||||
log.Warning("Outpost has localhost/blank API Connection but no authentik_host is configured.")
|
|
||||||
} else {
|
|
||||||
authUrl = strings.ReplaceAll(authUrl, "http://localhost:8000", authentikHost)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return oauth2.Endpoint{
|
|
||||||
AuthURL: authUrl,
|
AuthURL: authUrl,
|
||||||
TokenURL: p.OidcConfiguration.TokenEndpoint,
|
TokenURL: p.OidcConfiguration.TokenEndpoint,
|
||||||
AuthStyle: oauth2.AuthStyleInParams,
|
AuthStyle: oauth2.AuthStyleInParams,
|
||||||
}
|
}
|
||||||
|
u, err := url.Parse(authUrl)
|
||||||
|
if err != nil {
|
||||||
|
return ep
|
||||||
|
}
|
||||||
|
if u.Host != "localhost:8000" {
|
||||||
|
return ep
|
||||||
|
}
|
||||||
|
if authentikHost == "" {
|
||||||
|
log.Warning("Outpost has localhost/blank API Connection but no authentik_host is configured.")
|
||||||
|
return ep
|
||||||
|
}
|
||||||
|
aku, err := url.Parse(authentikHost)
|
||||||
|
if err != nil {
|
||||||
|
return ep
|
||||||
|
}
|
||||||
|
u.Host = aku.Host
|
||||||
|
u.Scheme = aku.Scheme
|
||||||
|
ep.AuthURL = u.String()
|
||||||
|
return ep
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, akHost string) *Application {
|
func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, akHost string) *Application {
|
||||||
|
|
Reference in New Issue