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

internal/proxyv2: improve error handling when configuring app 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-10-13 21:48:11 +02:00
parent cd42281383
commit 4d51ec906d
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/outpost/proxyv2/application/application.go
View File

@ -3,6 +3,7 @@ package application
import ( import (
"crypto/tls" "crypto/tls"
"encoding/gob" "encoding/gob"
"fmt"
"net/http" "net/http"
"net/url" "net/url"
"regexp" "regexp"
@ -12,6 +13,7 @@ import (
"github.com/coreos/go-oidc" "github.com/coreos/go-oidc"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"goauthentik.io/api" "goauthentik.io/api"
@ -41,12 +43,13 @@ type Application struct {
mux *mux.Router mux *mux.Router
} }
func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, ak *ak.APIController) *Application { func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, ak *ak.APIController) (*Application, error) {
gob.Register(Claims{}) gob.Register(Claims{})
muxLogger := log.WithField("logger", "authentik.outpost.proxyv2.application").WithField("name", p.Name)
externalHost, err := url.Parse(p.ExternalHost) externalHost, err := url.Parse(p.ExternalHost)
if err != nil { if err != nil {
log.WithError(err).Warning("Failed to parse URL, skipping provider") return nil, fmt.Errorf("failed to parse URL, skipping provider")
} }
ks := hs256.NewKeySet(*p.ClientSecret) ks := hs256.NewKeySet(*p.ClientSecret)
@ -78,7 +81,6 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore
mux: mux, mux: mux,
} }
a.sessions = a.getStore(p) a.sessions = a.getStore(p)
muxLogger := log.WithField("logger", "authentik.outpost.proxyv2.application").WithField("name", p.Name)
mux.Use(web.NewLoggingHandler(muxLogger, func(l *log.Entry, r *http.Request) *log.Entry { mux.Use(web.NewLoggingHandler(muxLogger, func(l *log.Entry, r *http.Request) *log.Entry {
s, err := a.sessions.Get(r, constants.SeesionName) s, err := a.sessions.Get(r, constants.SeesionName)
if err != nil { if err != nil {
@ -130,13 +132,13 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore
err = a.configureForward() err = a.configureForward()
} }
if err != nil { if err != nil {
a.log.WithError(err).Warning("failed to configure mode") return nil, errors.Wrap(err, "failed to configure application mode")
} }
if kp := p.Certificate.Get(); kp != nil { if kp := p.Certificate.Get(); kp != nil {
err := cs.AddKeypair(*kp) err := cs.AddKeypair(*kp)
if err != nil { if err != nil {
a.log.WithError(err).Warning("Failed to initially fetch certificate") return nil, errors.Wrap(err, "failed to initially fetch certificate")
} }
a.Cert = cs.Get(*kp) a.Cert = cs.Get(*kp)
} }
@ -147,13 +149,13 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore
re, err := regexp.Compile(regex) re, err := regexp.Compile(regex)
if err != nil { if err != nil {
// TODO: maybe create event for this? // TODO: maybe create event for this?
a.log.WithError(err).Warning("failed to compile regex") return nil, errors.Wrap(err, "failed to compile SkipPathRegex")
} else { } else {
a.UnauthenticatedRegex = append(a.UnauthenticatedRegex, re) a.UnauthenticatedRegex = append(a.UnauthenticatedRegex, re)
} }
} }
} }
return a return a, nil
} }
func (a *Application) IsAllowlisted(r *http.Request) bool { func (a *Application) IsAllowlisted(r *http.Request) bool {

8
internal/outpost/proxyv2/refresh.go
View File

@ -24,8 +24,12 @@ func (ps *ProxyServer) Refresh() error {
hc := &http.Client{ hc := &http.Client{
Transport: ak.NewUserAgentTransport(constants.OutpostUserAgent()+ua, ak.NewTracingTransport(context.TODO(), ak.GetTLSTransport())), Transport: ak.NewUserAgentTransport(constants.OutpostUserAgent()+ua, ak.NewTracingTransport(context.TODO(), ak.GetTLSTransport())),
} }
a := application.NewApplication(provider, hc, ps.cryptoStore, ps.akAPI) a, err := application.NewApplication(provider, hc, ps.cryptoStore, ps.akAPI)
apps[a.Host] = a if err != nil {
ps.log.WithError(err).Warning("failed to setup application")
} else {
apps[a.Host] = a
}
} }
ps.apps = apps ps.apps = apps
ps.log.Debug("Swapped maps") ps.log.Debug("Swapped maps")