Files
zitadel/internal/domain/human_recovery_codes.go
T
5beeb5738a feat: Add recovery code MFA support (#9954)
<!--
Please inform yourself about the contribution guidelines on submitting a
PR here:
https://github.com/zitadel/zitadel/blob/main/CONTRIBUTING.md#submit-a-pull-request-pr.
Take note of how PR/commit titles should be written and replace the
template texts in the sections below. Don't remove any of the sections.
It is important that the commit history clearly shows what is changed
and why.
Important: By submitting a contribution you agree to the terms from our
Licensing Policy as described here:
https://github.com/zitadel/zitadel/blob/main/LICENSING.md#community-contributions.
-->

One-time recovery codes are a common multi-factor authentication (MFA)
backup method, letting users access their account if they lose other MFA
devices. Support for recovery codes can also reduce support burden for
users locked out of their accounts and provide a more secure and
reliable form of verification than security questions.

# Which Problems Are Solved

Zitadel currently lacks support for recovery codes.

# How the Problems Are Solved

This PR partially addresses recovery code support in Zitadel.
Importantly, it adds recovery codes as a new 2FA `Factor` and an
additional `Check` type for the Session API.

```
Example recovery code flow:

1. User generates N new recovery codes using `POST /v2/users/{user_id}/recovery_codes`
2. Zitadel hashes and stores these codes and returns the un-hashed codes in the response
3. User creates new session with an additional check: `recoveryCode`
4. Code is checked against hash and, if valid, cannot be used again
5. User attempts to adds N more codes using the same endpoint 
6. If `remaining_codes + N <= RecoveryCodes->MaxCount` config value, then recovery codes are added in addition to original codes
7. User can remove all recovery codes using `DEL /v2/users/:userId/recovery_codes` 
```
This PR adds: 
- [x] Session recovery_code check support on `POST+PATCH /v2/sessions`
endpoints
- [x] Adds `mfa_recovery_code_checked_at` column (default null) to
`projections.sessions8` table
- [x] Support for `SECOND_FACTOR_TYPE_RECOVERY_CODES` as available 2FA
method on login policy
- [x] Support for importing recovery codes in /import code

Missing, will _not_ implement in this PR:
- [ ] Admin console support for displaying Recovery Code settings for
user(s)
- [ ] Zitadel Typescript login support for recovery codes 

TODO: 
- [x] Additional unit and integration tests
- [x] Error translations

# Additional Changes

None

# Additional Context

- Closes #6898

---------

Co-authored-by: Livio Spring <[email protected]>
2025-11-24 06:44:48 +00:00

137 lines
3.8 KiB
Go

package domain
import (
"context"
"strings"
"github.com/google/uuid"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/telemetry/tracing"
"github.com/zitadel/zitadel/internal/zerrors"
)
type HumanRecoveryCodes struct {
*ObjectDetails
Codes []string
}
type ImportHumanRecoveryCode struct {
RawCode string
HashedCode string
}
func HashRecoveryCodesIfNeeded(ctx context.Context, codes []ImportHumanRecoveryCode, hasher *crypto.Hasher) (_ []string, err error) {
_, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
hashedCodes := make([]string, len(codes))
for i, code := range codes {
hashed, err := HashRecoveryCodeIfNeeded(ctx, code, hasher)
if err != nil {
return nil, err
}
hashedCodes[i] = hashed
}
return hashedCodes, nil
}
func HashRecoveryCodeIfNeeded(ctx context.Context, code ImportHumanRecoveryCode, hasher *crypto.Hasher) (_ string, err error) {
_, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
if code.RawCode != "" {
return hasher.Hash(code.RawCode)
}
if !hasher.EncodingSupported(code.HashedCode) {
return "", zerrors.ThrowInvalidArgument(nil, "DOMAIN-JDk4t", "Errors.Hash.NotSupported")
}
return code.HashedCode, nil
}
func GenerateRecoveryCodes(ctx context.Context, count int, config RecoveryCodesConfig, hasher *crypto.Hasher) (hashedCodes []string, rawCodes []string, err error) {
hashedCodes, rawCodes = make([]string, count), make([]string, count)
for i := range count {
hashedCodes[i], rawCodes[i], err = generateRecoveryCode(ctx, config, hasher)
if err != nil {
return nil, nil, err
}
}
return hashedCodes, rawCodes, nil
}
func generateRecoveryCode(ctx context.Context, config RecoveryCodesConfig, hasher *crypto.Hasher) (hashedCode string, rawCode string, err error) {
_, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
rawCode, err = makeRawCode(config)
if err != nil {
return "", "", err
}
hashedCode, err = hasher.Hash(rawCode)
if err != nil {
return "", "", err
}
return hashedCode, rawCode, nil
}
func makeRawCode(config RecoveryCodesConfig) (string, error) {
switch config.Format {
case RecoveryCodeFormatAlphanumeric:
return generateAlphanumericCode(config.Length, config.WithHyphen)
case RecoveryCodeFormatUUID:
code := uuid.New().String()
if !config.WithHyphen {
code = strings.ReplaceAll(code, "-", "")
}
return code, nil
default:
return "", zerrors.ThrowError(nil, "DOMAIN-g52kn", "Errors.User.MFA.RecoveryCodes.ConfigInvalid")
}
}
func generateAlphanumericCode(length int, withHyphen bool) (string, error) {
if length <= 0 {
return "", zerrors.ThrowError(nil, "DOMAIN-68mvq", "Errors.User.MFA.RecoveryCodes.ConfigInvalid")
}
// lower-cased base32 character set https://www.crockford.com/base32.html
chars := []rune("0123456789abcdefghjkmnpqrstvwxyz")
code, err := crypto.GenerateRandomString(uint(length), chars)
if err != nil {
return "", err
}
if withHyphen && length > 2 {
mid := length / 2
return code[:mid] + "-" + code[mid:], nil
}
return code, nil
}
func ValidateRecoveryCode(ctx context.Context, code string, recoveryCodes *HumanRecoveryCodes, hasher *crypto.Hasher) (_ string, err error) {
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
if code == "" {
return "", zerrors.ThrowInvalidArgument(nil, "DOMAIN-9xrr0", "Errors.User.MFA.RecoveryCodes.InvalidCode")
}
for _, recoveryCode := range recoveryCodes.Codes {
_, spanCodeComparison := tracing.NewNamedSpan(ctx, "passwap.Verify")
_, verifyErr := hasher.Verify(recoveryCode, code)
spanCodeComparison.EndWithError(verifyErr)
if verifyErr != nil {
continue
}
return recoveryCode, nil
}
return "", zerrors.ThrowInvalidArgument(nil, "DOMAIN-6uvh0", "Errors.User.MFA.RecoveryCodes.InvalidCode")
}