3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-24 05:28:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix merge

Browse source
This commit is contained in:
Caleb Doxsey 2022-09-08 13:35:40 -06:00
parent 8482a422ca
commit 6883e40314
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
authenticate/handlers.go
View file

@ -286,8 +286,12 @@ func (a *Authenticate) signOutRedirect(w http.ResponseWriter, r *http.Request) e
defer span.End() defer span.End()
cfg := a.currentConfig.Load() cfg := a.currentConfig.Load()
idp, err := cfg.Options.GetIdentityProviderForID(r.FormValue(urlutil.QueryIdentityProviderID))
if err != nil {
return err
}
authenticator, err := a.cfg.getIdentityProvider(cfg, r.FormValue(urlutil.QueryIdentityProviderID)) authenticator, err := a.cfg.getIdentityProvider(cfg, idp.GetId())
if err != nil { if err != nil {
return err return err
} }
@ -342,7 +346,6 @@ func (a *Authenticate) reauthenticateOrFail(w http.ResponseWriter, r *http.Reque
state := a.state.Load() state := a.state.Load()
cfg := a.currentConfig.Load() cfg := a.currentConfig.Load()
idp, err := cfg.Options.GetIdentityProviderForID(r.FormValue(urlutil.QueryIdentityProviderID)) idp, err := cfg.Options.GetIdentityProviderForID(r.FormValue(urlutil.QueryIdentityProviderID))
if err != nil { if err != nil {
return err return err
@ -444,7 +447,7 @@ func (a *Authenticate) getOAuthCallback(w http.ResponseWriter, r *http.Request)
return nil, httputil.NewError(http.StatusBadRequest, err) return nil, httputil.NewError(http.StatusBadRequest, err)
} }
idp, err := cfg.Options.GetIdentityProviderForID(r.FormValue(urlutil.QueryIdentityProviderID)) idp, err := cfg.Options.GetIdentityProviderForID(redirectURL.Query().Get(urlutil.QueryIdentityProviderID))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -601,8 +604,12 @@ func (a *Authenticate) saveSessionToDataBroker(
) error { ) error {
state := a.state.Load() state := a.state.Load()
cfg := a.currentConfig.Load() cfg := a.currentConfig.Load()
idp, err := cfg.Options.GetIdentityProviderForID(r.FormValue(urlutil.QueryIdentityProviderID))
if err != nil {
return err
}
authenticator, err := a.cfg.getIdentityProvider(cfg, r.FormValue(urlutil.QueryIdentityProviderID)) authenticator, err := a.cfg.getIdentityProvider(cfg, idp.GetId())
if err != nil { if err != nil {
return err return err
} }