mirror of
https://github.com/oauth2-proxy/oauth2-proxy.git
synced 2024-11-30 09:16:52 +02:00
ce750e9b30
* Add the allowed_email_domains and the allowed_groups on the auth_request endpoint + support standard wildcard char for validation with sub-domain and email-domain. Signed-off-by: Valentin Pichard <github@w3st.fr> * Fix provider data initialisation * PKCE Support Adds Code Challenge PKCE support (RFC-7636) and partial Authorization Server Metadata (RFC-8414) for detecting PKCE support. - Introduces new option `--force-code-challenge-method` to force a specific code challenge method (either `S256` or `plain`) for instances when the server has not implemented RFC-8414 in order to detect PKCE support on the discovery document. - In all other cases, if the PKCE support can be determined during discovery then the `code_challenge_methods_supported` is used and S256 is always preferred. - The force command line argument is helpful with some providers like Azure who supports PKCE but does not list it in their discovery document yet. - Initial thought was given to just always attempt PKCE since according to spec additional URL parameters should be dropped by servers which implemented OAuth 2, however other projects found cases in the wild where this causes 500 errors by buggy implementations. See: https://github.com/spring-projects/spring-security/pull/7804#issuecomment-578323810 - Due to the fact that the `code_verifier` must be saved between the redirect and callback, sessions are now created when the redirect takes place with `Authenticated: false`. The session will be recreated and marked as `Authenticated` on callback. - Individual provider implementations can choose to include or ignore code_challenge and code_verifier function parameters passed to them Note: Technically speaking `plain` is not required to be implemented since oauth2-proxy will always be able to handle S256 and servers MUST implement S256 support. > If the client is capable of using "S256", it MUST use "S256", as "S256" > is Mandatory To Implement (MTI) on the server. Clients are permitted > to use "plain" only if they cannot support "S256" for some technical > reason and know via out-of-band configuration that the server supports > "plain". Ref: RFC-7636 Sec 4.2 oauth2-proxy will always use S256 unless the user explicitly forces `plain`. Fixes #1361 * Address PR comments by moving pkce generation * Make PKCE opt-in, move to using the Nonce generater for code verifier * Make PKCE opt-in, move to using the Nonce generater for code verifier * Encrypt CodeVerifier in CSRF Token instead of Session - Update Dex for PKCE support - Expose HTTPBin for further use cases * Correct the tests * Move code challenges into extra params * Correct typo in code challenge method Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk> * Correct the extra space in docs Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk> * Address changelog and new line nits * Add generated docs Co-authored-by: Valentin Pichard <github@w3st.fr> Co-authored-by: Joel Speed <joel.speed@hotmail.co.uk>
126 lines
3.6 KiB
Go
126 lines
3.6 KiB
Go
package encryption
|
|
|
|
import (
|
|
"crypto/hmac"
|
|
"crypto/sha256"
|
|
"encoding/base64"
|
|
"fmt"
|
|
"hash"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
CodeChallengeMethodPlain = "plain"
|
|
CodeChallengeMethodS256 = "S256"
|
|
)
|
|
|
|
// SecretBytes attempts to base64 decode the secret, if that fails it treats the secret as binary
|
|
func SecretBytes(secret string) []byte {
|
|
b, err := base64.RawURLEncoding.DecodeString(strings.TrimRight(secret, "="))
|
|
if err == nil {
|
|
// Only return decoded form if a valid AES length
|
|
// Don't want unintentional decoding resulting in invalid lengths confusing a user
|
|
// that thought they used a 16, 24, 32 length string
|
|
for _, i := range []int{16, 24, 32} {
|
|
if len(b) == i {
|
|
return b
|
|
}
|
|
}
|
|
}
|
|
// If decoding didn't work or resulted in non-AES compliant length,
|
|
// assume the raw string was the intended secret
|
|
return []byte(secret)
|
|
}
|
|
|
|
// cookies are stored in a 3 part (value + timestamp + signature) to enforce that the values are as originally set.
|
|
// additionally, the 'value' is encrypted so it's opaque to the browser
|
|
|
|
// Validate ensures a cookie is properly signed
|
|
func Validate(cookie *http.Cookie, seed string, expiration time.Duration) (value []byte, t time.Time, ok bool) {
|
|
// value, timestamp, sig
|
|
parts := strings.Split(cookie.Value, "|")
|
|
if len(parts) != 3 {
|
|
return
|
|
}
|
|
if checkSignature(parts[2], seed, cookie.Name, parts[0], parts[1]) {
|
|
ts, err := strconv.Atoi(parts[1])
|
|
if err != nil {
|
|
return
|
|
}
|
|
// The expiration timestamp set when the cookie was created
|
|
// isn't sent back by the browser. Hence, we check whether the
|
|
// creation timestamp stored in the cookie falls within the
|
|
// window defined by (Now()-expiration, Now()].
|
|
t = time.Unix(int64(ts), 0)
|
|
if t.After(time.Now().Add(expiration*-1)) && t.Before(time.Now().Add(time.Minute*5)) {
|
|
// it's a valid cookie. now get the contents
|
|
rawValue, err := base64.URLEncoding.DecodeString(parts[0])
|
|
if err == nil {
|
|
value = rawValue
|
|
ok = true
|
|
return
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
// SignedValue returns a cookie that is signed and can later be checked with Validate
|
|
func SignedValue(seed string, key string, value []byte, now time.Time) (string, error) {
|
|
encodedValue := base64.URLEncoding.EncodeToString(value)
|
|
timeStr := fmt.Sprintf("%d", now.Unix())
|
|
sig, err := cookieSignature(sha256.New, seed, key, encodedValue, timeStr)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
cookieVal := fmt.Sprintf("%s|%s|%s", encodedValue, timeStr, sig)
|
|
return cookieVal, nil
|
|
}
|
|
|
|
func GenerateCodeChallenge(method, codeVerifier string) (string, error) {
|
|
switch method {
|
|
case CodeChallengeMethodPlain:
|
|
return codeVerifier, nil
|
|
case CodeChallengeMethodS256:
|
|
shaSum := sha256.Sum256([]byte(codeVerifier))
|
|
return base64.RawURLEncoding.EncodeToString(shaSum[:]), nil
|
|
default:
|
|
return "", fmt.Errorf("unknown challenge method: %v", method)
|
|
}
|
|
}
|
|
|
|
func cookieSignature(signer func() hash.Hash, args ...string) (string, error) {
|
|
h := hmac.New(signer, []byte(args[0]))
|
|
for _, arg := range args[1:] {
|
|
_, err := h.Write([]byte(arg))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
}
|
|
var b []byte
|
|
b = h.Sum(b)
|
|
return base64.URLEncoding.EncodeToString(b), nil
|
|
}
|
|
|
|
func checkSignature(signature string, args ...string) bool {
|
|
checkSig, err := cookieSignature(sha256.New, args...)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return checkHmac(signature, checkSig)
|
|
}
|
|
|
|
func checkHmac(input, expected string) bool {
|
|
inputMAC, err1 := base64.URLEncoding.DecodeString(input)
|
|
if err1 == nil {
|
|
expectedMAC, err2 := base64.URLEncoding.DecodeString(expected)
|
|
if err2 == nil {
|
|
return hmac.Equal(inputMAC, expectedMAC)
|
|
}
|
|
}
|
|
return false
|
|
}
|