trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

outpost/embedded: only send requests for non-akprox paths when we're doing proxy mode 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-08-29 21:13:28 +02:00
parent 0c6e781e5b
commit cc2cd6919f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/outpost/proxy/api_bundle.go
View File

@ -25,6 +25,7 @@ type providerBundle struct {
Host string Host string
endSessionUrl string endSessionUrl string
Mode *api.ProxyMode
cert *tls.Certificate cert *tls.Certificate
@ -49,6 +50,10 @@ func (pb *providerBundle) replaceLocal(url string) string {
} }
func (pb *providerBundle) prepareOpts(provider api.ProxyOutpostConfig) *options.Options { func (pb *providerBundle) prepareOpts(provider api.ProxyOutpostConfig) *options.Options {
// We need to save the mode in the bundle
// Since for the embedded outpost we only switch for fully proxy providers
pb.Mode = provider.Mode
externalHost, err := url.Parse(provider.ExternalHost) externalHost, err := url.Parse(provider.ExternalHost)
if err != nil { if err != nil {
log.WithError(err).Warning("Failed to parse URL, skipping provider") log.WithError(err).Warning("Failed to parse URL, skipping provider")

5
internal/web/web_proxy.go
View File

@ -6,6 +6,7 @@ import (
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
"goauthentik.io/api"
"goauthentik.io/internal/utils/web" "goauthentik.io/internal/utils/web"
) )
@ -36,12 +37,14 @@ func (ws *WebServer) configureProxy() {
ws.m.PathPrefix("/").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { ws.m.PathPrefix("/").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
host := web.GetHost(r) host := web.GetHost(r)
if ws.ProxyServer != nil { if ws.ProxyServer != nil {
if _, ok := ws.ProxyServer.Handlers[host]; ok { if p, ok := ws.ProxyServer.Handlers[host]; ok {
if *p.Mode == api.PROXYMODE_PROXY {
ws.log.WithField("host", host).Trace("routing to proxy outpost") ws.log.WithField("host", host).Trace("routing to proxy outpost")
ws.ProxyServer.Handler(rw, r) ws.ProxyServer.Handler(rw, r)
return return
} }
} }
}
ws.log.WithField("host", host).Trace("routing to application server") ws.log.WithField("host", host).Trace("routing to application server")
rp.ServeHTTP(rw, r) rp.ServeHTTP(rw, r)
}) })