3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-10 15:47:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

authenticate: fixes incorrect error check

Browse source
This commit is contained in:
Bobby DeSimone 2019-01-22 21:10:20 -08:00
parent 356aa33970
commit f9c0961c77
No known key found for this signature in database
GPG key ID: AEE4CF12FE86D07E
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
authenticate/authenticate.go
View file

@ -20,6 +20,7 @@ import (
var defaultOptions = &Options{ var defaultOptions = &Options{
CookieName: "_pomerium_authenticate", CookieName: "_pomerium_authenticate",
CookieHTTPOnly: true, CookieHTTPOnly: true,
SkipProviderButton: true,
CookieExpire: time.Duration(168) * time.Hour, CookieExpire: time.Duration(168) * time.Hour,
CookieRefresh: time.Duration(1) * time.Hour, CookieRefresh: time.Duration(1) * time.Hour,
SessionLifetimeTTL: time.Duration(720) * time.Hour, SessionLifetimeTTL: time.Duration(720) * time.Hour,
@ -52,7 +53,7 @@ type Options struct {
ClientSecret string `envconfig:"IDP_CLIENT_SECRET"` // IdP Secret ClientSecret string `envconfig:"IDP_CLIENT_SECRET"` // IdP Secret
Provider string `envconfig:"IDP_PROVIDER"` //Provider name e.g. "oidc","okta","google",etc Provider string `envconfig:"IDP_PROVIDER"` //Provider name e.g. "oidc","okta","google",etc
ProviderURL string `envconfig:"IDP_PROVIDER_URL"` ProviderURL string `envconfig:"IDP_PROVIDER_URL"`
Scopes []string `envconfig:"IDP_SCOPE" default:"openid,email,profile"` Scopes []string `envconfig:"IDP_SCOPE"`
SkipProviderButton bool `envconfig:"SKIP_PROVIDER_BUTTON"` SkipProviderButton bool `envconfig:"SKIP_PROVIDER_BUTTON"`
} }

2
authenticate/handlers.go
View file

@ -347,7 +347,7 @@ func (p *Authenticate) SignOutPage(rw http.ResponseWriter, req *http.Request, me
// `redirectURI`, allowing the provider to redirect back to the sso proxy after authentication. // `redirectURI`, allowing the provider to redirect back to the sso proxy after authentication.
func (p *Authenticate) OAuthStart(rw http.ResponseWriter, req *http.Request) { func (p *Authenticate) OAuthStart(rw http.ResponseWriter, req *http.Request) {
authRedirectURL, err := url.Parse(req.URL.Query().Get("redirect_uri")) authRedirectURL, err := url.Parse(req.URL.Query().Get("redirect_uri"))
if err == nil { if err != nil {
httputil.ErrorResponse(rw, req, "Invalid redirect parameter", http.StatusBadRequest) httputil.ErrorResponse(rw, req, "Invalid redirect parameter", http.StatusBadRequest)
return return
} }