diff --git a/Gopkg.lock b/Gopkg.lock index 310d29551f8..bdf4870be14 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -392,7 +392,7 @@ version = "v3.3.0" [[projects]] - digest = "1:7dbb1878852749a7734bb4cb75d3e3f7e60801465d4c4f958533dd1f6d982a4e" + digest = "1:15b7b58347fd46d17c1f12a80c0f58003974f1aa36619a9045929d94d5d4a217" name = "github.com/ory/fosite" packages = [ ".", @@ -405,8 +405,8 @@ "token/jwt", ] pruneopts = "" - revision = "805e0e9a36aa254b18e853b8a9c7881738deb010" - version = "v0.23.0" + revision = "e1e18d6b22697abeceff6e22d4741c3bf04174f8" + version = "v0.24.0" [[projects]] digest = "1:88233ef02f3da33b9d4cf4f6c514c206ce4efec67f455c5be6dd3aa0fdf3bd32" @@ -909,6 +909,7 @@ "github.com/toqueteos/webbrowser", "github.com/uber/jaeger-client-go/config", "github.com/urfave/negroni", + "golang.org/x/crypto/bcrypt", "golang.org/x/oauth2", "golang.org/x/oauth2/clientcredentials", "gopkg.in/square/go-jose.v2", diff --git a/Gopkg.toml b/Gopkg.toml index da44cb524fd..94b51e95b15 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -75,7 +75,7 @@ [[constraint]] name = "github.com/ory/fosite" - version = "0.23.0" + version = "0.24.0" [[constraint]] name = "github.com/ory/graceful" diff --git a/consent/strategy_default.go b/consent/strategy_default.go index 8f630ac1bd0..6d133486104 100644 --- a/consent/strategy_default.go +++ b/consent/strategy_default.go @@ -311,7 +311,8 @@ func (s *DefaultStrategy) obfuscateSubjectIdentifier(subject string, req fosite. } func (s *DefaultStrategy) verifyAuthentication(w http.ResponseWriter, r *http.Request, req fosite.AuthorizeRequester, verifier string) (*HandledAuthenticationRequest, error) { - session, err := s.M.VerifyAndInvalidateAuthenticationRequest(r.Context(), verifier) + ctx := r.Context() + session, err := s.M.VerifyAndInvalidateAuthenticationRequest(ctx, verifier) if errors.Cause(err) == pkg.ErrNotFound { return nil, errors.WithStack(fosite.ErrAccessDenied.WithDebug("The login verifier has already been used, has not been granted, or is invalid.")) } else if err != nil { @@ -348,7 +349,7 @@ func (s *DefaultStrategy) verifyAuthentication(w http.ResponseWriter, r *http.Re return nil, err } - if err := s.OpenIDConnectRequestValidator.ValidatePrompt(&fosite.AuthorizeRequest{ + if err := s.OpenIDConnectRequestValidator.ValidatePrompt(ctx, &fosite.AuthorizeRequest{ ResponseTypes: req.GetResponseTypes(), RedirectURI: req.GetRedirectURI(), State: req.GetState(),