cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow UDF PKCE challenge code generators to error

Browse source
This commit is contained in:
thomas-welch 2021-09-14 16:02:55 +01:00
parent 50d331577c
commit 1a95652830
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/client/rp/relaying_party.go
View file

@ -64,14 +64,14 @@ type RelyingParty interface {
} }
type ErrorHandler func(w http.ResponseWriter, r *http.Request, errorType string, errorDesc string, state string) type ErrorHandler func(w http.ResponseWriter, r *http.Request, errorType string, errorDesc string, state string)
type PKCECodeGenerator func() string type PKCECodeGenerator func() (string, error)
var ( var (
DefaultErrorHandler ErrorHandler = func(w http.ResponseWriter, r *http.Request, errorType string, errorDesc string, state string) { DefaultErrorHandler ErrorHandler = func(w http.ResponseWriter, r *http.Request, errorType string, errorDesc string, state string) {
http.Error(w, errorType+": "+errorDesc, http.StatusInternalServerError) http.Error(w, errorType+": "+errorDesc, http.StatusInternalServerError)
} }
DefaultPKCECodeGenerator PKCECodeGenerator = func() string { DefaultPKCECodeGenerator PKCECodeGenerator = func() (string, error) {
return base64.RawURLEncoding.EncodeToString([]byte(uuid.New().String())) return base64.RawURLEncoding.EncodeToString([]byte(uuid.New().String())), nil
} }
) )
@ -311,7 +311,10 @@ func AuthURLHandler(stateFn func() string, rp RelyingParty) http.HandlerFunc {
//GenerateAndStoreCodeChallenge generates a PKCE code challenge and stores its verifier into a secure cookie //GenerateAndStoreCodeChallenge generates a PKCE code challenge and stores its verifier into a secure cookie
func GenerateAndStoreCodeChallenge(w http.ResponseWriter, rp RelyingParty) (string, error) { func GenerateAndStoreCodeChallenge(w http.ResponseWriter, rp RelyingParty) (string, error) {
codeVerifier := rp.PKCECodeGenerator()() codeVerifier, err := rp.PKCECodeGenerator()()
if err != nil {
return "", err
}
if err := rp.CookieHandler().SetCookie(w, pkceCode, codeVerifier); err != nil { if err := rp.CookieHandler().SetCookie(w, pkceCode, codeVerifier); err != nil {
return "", err return "", err
} }