mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 03:54:21 +00:00
8e0c8393e9
* implement code exchange * port tokenexchange to v2 tokens * implement refresh token * implement client credentials * implement jwt profile * implement device token * cleanup unused code * fix current unit tests * add user agent unit test * unit test domain package * need refresh token as argument * test commands create oidc session * test commands device auth * fix device auth build error * implicit for oidc session API * implement authorize callback handler for legacy implicit mode * upgrade oidc module to working draft * add missing auth methods and time * handle all errors in defer * do not fail auth request on error the oauth2 Go client automagically retries on any error. If we fail the auth request on the first error, the next attempt will always fail with the Errors.AuthRequest.NoCode, because the auth request state is already set to failed. The original error is then already lost and the oauth2 library does not return the original error. Therefore we should not fail the auth request. Might be worth discussing and perhaps send a bug report to Oauth2? * fix code flow tests by explicitly setting code exchanged * fix unit tests in command package * return allowed scope from client credential client * add device auth done reducer * carry nonce thru session into ID token * fix token exchange integration tests * allow project role scope prefix in client credentials client * gci formatting * do not return refresh token in client credentials and jwt profile * check org scope * solve linting issue on authorize callback error * end session based on v2 session ID * use preferred language and user agent ID for v2 access tokens * pin oidc v3.23.2 * add integration test for jwt profile and client credentials with org scopes * refresh token v1 to v2 * add user token v2 audit event * add activity trigger * cleanup and set panics for unused methods * use the encrypted code for v1 auth request get by code * add missing event translation * fix pipeline errors (hopefully) * fix another test * revert pointer usage of preferred language * solve browser info panic in device auth * remove duplicate entries in AMRToAuthMethodTypes to prevent future `mfa` claim * revoke v1 refresh token to prevent reuse * fix terminate oidc session * always return a new refresh toke in refresh token grant --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
96 lines
2.6 KiB
Go
96 lines
2.6 KiB
Go
package oidc
|
|
|
|
import (
|
|
"slices"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
)
|
|
|
|
const (
|
|
// Password states that the users password has been verified
|
|
// Deprecated: use `PWD` instead
|
|
Password = "password"
|
|
// PWD states that the users password has been verified
|
|
PWD = "pwd"
|
|
// MFA states that multiple factors have been verified (e.g. pwd and otp or passkey)
|
|
MFA = "mfa"
|
|
// OTP states that a one time password has been verified (e.g. TOTP)
|
|
OTP = "otp"
|
|
// UserPresence states that the end users presence has been verified (e.g. passkey and u2f)
|
|
UserPresence = "user"
|
|
)
|
|
|
|
// AuthMethodTypesToAMR maps zitadel auth method types to Authentication Method Reference Values
|
|
// as defined in [RFC 8176, section 2].
|
|
//
|
|
// [RFC 8176, section 2]: https://datatracker.ietf.org/doc/html/rfc8176#section-2
|
|
func AuthMethodTypesToAMR(methodTypes []domain.UserAuthMethodType) []string {
|
|
if methodTypes == nil {
|
|
return nil // make sure amr is omitted when not provided / supported
|
|
}
|
|
amr := make([]string, 0, 4)
|
|
var factors, otp int
|
|
for _, methodType := range methodTypes {
|
|
switch methodType {
|
|
case domain.UserAuthMethodTypePassword:
|
|
amr = append(amr, PWD)
|
|
factors++
|
|
case domain.UserAuthMethodTypePasswordless:
|
|
amr = append(amr, UserPresence)
|
|
factors += 2
|
|
case domain.UserAuthMethodTypeU2F:
|
|
amr = append(amr, UserPresence)
|
|
factors++
|
|
case domain.UserAuthMethodTypeOTP,
|
|
domain.UserAuthMethodTypeTOTP,
|
|
domain.UserAuthMethodTypeOTPSMS,
|
|
domain.UserAuthMethodTypeOTPEmail:
|
|
// a user could use multiple (t)otp, which is a factor, but still will be returned as a single `otp` entry
|
|
otp++
|
|
factors++
|
|
case domain.UserAuthMethodTypeIDP:
|
|
// no AMR value according to specification
|
|
factors++
|
|
case domain.UserAuthMethodTypeUnspecified:
|
|
// ignore
|
|
}
|
|
}
|
|
if otp > 0 {
|
|
amr = append(amr, OTP)
|
|
}
|
|
if factors >= 2 {
|
|
amr = append(amr, MFA)
|
|
}
|
|
return amr
|
|
}
|
|
|
|
func AMRToAuthMethodTypes(amr []string) []domain.UserAuthMethodType {
|
|
authMethods := make([]domain.UserAuthMethodType, 0, len(amr))
|
|
var (
|
|
userPresence bool
|
|
mfa bool
|
|
)
|
|
|
|
for _, entry := range amr {
|
|
switch entry {
|
|
case Password, PWD:
|
|
authMethods = append(authMethods, domain.UserAuthMethodTypePassword)
|
|
case OTP:
|
|
authMethods = append(authMethods, domain.UserAuthMethodTypeOTP)
|
|
case UserPresence:
|
|
userPresence = true
|
|
case MFA:
|
|
mfa = true
|
|
}
|
|
}
|
|
|
|
if userPresence {
|
|
if mfa {
|
|
authMethods = append(authMethods, domain.UserAuthMethodTypePasswordless)
|
|
} else {
|
|
authMethods = append(authMethods, domain.UserAuthMethodTypeU2F)
|
|
}
|
|
}
|
|
return slices.Compact(authMethods) // remove duplicate entries
|
|
}
|