Fix PKCE code verifier generation to never use UTF-8 characters

- This could result in intermittent/random failures of PKCE enabled IdP's
This commit is contained in:
Braunson M
2022-11-18 20:37:14 -05:00
parent fd2807c091
commit f4f5b7756c
4 changed files with 42 additions and 5 deletions
+16
View File
@@ -2,10 +2,12 @@ package encryption
import (
"crypto/hmac"
"crypto/rand"
"crypto/sha256"
"encoding/base64"
"fmt"
"hash"
"math/big"
"net/http"
"strconv"
"strings"
@@ -15,6 +17,7 @@ import (
const (
CodeChallengeMethodPlain = "plain"
CodeChallengeMethodS256 = "S256"
asciiCharset = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
)
// SecretBytes attempts to base64 decode the secret, if that fails it treats the secret as binary
@@ -80,6 +83,19 @@ func SignedValue(seed string, key string, value []byte, now time.Time) (string,
return cookieVal, nil
}
func GenerateRandomASCIIString(length int) (string, error) {
b := make([]byte, length)
charsetLen := new(big.Int).SetInt64(int64(len(asciiCharset)))
for i := range b {
character, err := rand.Int(rand.Reader, charsetLen)
if err != nil {
return "", err
}
b[i] = asciiCharset[character.Int64()]
}
return string(b), nil
}
func GenerateCodeChallenge(method, codeVerifier string) (string, error) {
switch method {
case CodeChallengeMethodPlain: