mirror of
https://github.com/zitadel/zitadel.git
synced 2026-10-25 15:40:09 -05:00
# Which Problems Are Solved
Zitadel exposes the secrets generator configuration through its admin
api. This allows instance admins to manage them on their own and they
can create overwrite the system / runtime defaults (incl. expiration).
This very much needed in multi-instance scenarios such as zitadel.cloud.
Currently the invite code configuration was not manageable through the
API, but only runtime config.
# How the Problems Are Solved
- added the `invite_code` type to the API allowing it to be set and
retrieved.
- added the type to console's management list
- added the type to be stored on instance setup
- change the `GetSecretGenerator` endpoint to fall back to the runtime
config if no config is stored on the instance itself
- ensure the `length` and at least one charset is enabled, return an
error otherwise
- expiry is not enforced, so 0 allows codes with no expiry (current
state)
# Additional Changes
None
# Additional Context
- closes https://github.com/zitadel/zitadel/issues/10474
(cherry picked from commit 1e0b810dca)
186 lines
4.1 KiB
Go
186 lines
4.1 KiB
Go
package crypto
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var (
|
|
lowerLetters = []rune("abcdefghijklmnopqrstuvwxyz")
|
|
upperLetters = []rune("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
|
|
digits = []rune("0123456789")
|
|
symbols = []rune("~!@#$^&*()_+`-={}|[]:<>?,./")
|
|
)
|
|
|
|
type GeneratorConfig struct {
|
|
Length uint
|
|
Expiry time.Duration
|
|
IncludeLowerLetters bool
|
|
IncludeUpperLetters bool
|
|
IncludeDigits bool
|
|
IncludeSymbols bool
|
|
}
|
|
|
|
func (c *GeneratorConfig) Valid() error {
|
|
if c.Length < 1 {
|
|
return zerrors.ThrowInvalidArgument(nil, "CRYPTO-FVJ2x", "Errors.InvalidArgument")
|
|
}
|
|
if !c.IncludeLowerLetters && !c.IncludeUpperLetters && !c.IncludeDigits && !c.IncludeSymbols {
|
|
return zerrors.ThrowInvalidArgument(nil, "CRYPTO-Ckl2s", "Errors.InvalidArgument")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
//go:generate mockgen -source code.go -destination ./code_mock.go -package crypto
|
|
|
|
type Generator interface {
|
|
Length() uint
|
|
Expiry() time.Duration
|
|
Alg() EncryptionAlgorithm
|
|
Runes() []rune
|
|
}
|
|
|
|
type generator struct {
|
|
length uint
|
|
expiry time.Duration
|
|
runes []rune
|
|
}
|
|
|
|
func (g *generator) Length() uint {
|
|
return g.length
|
|
}
|
|
|
|
func (g *generator) Expiry() time.Duration {
|
|
return g.expiry
|
|
}
|
|
|
|
func (g *generator) Runes() []rune {
|
|
return g.runes
|
|
}
|
|
|
|
type encryptionGenerator struct {
|
|
generator
|
|
alg EncryptionAlgorithm
|
|
}
|
|
|
|
func (g *encryptionGenerator) Alg() EncryptionAlgorithm {
|
|
return g.alg
|
|
}
|
|
|
|
func NewEncryptionGenerator(config GeneratorConfig, algorithm EncryptionAlgorithm) Generator {
|
|
return &encryptionGenerator{
|
|
newGenerator(config),
|
|
algorithm,
|
|
}
|
|
}
|
|
|
|
type HashGenerator struct {
|
|
generator
|
|
hasher *Hasher
|
|
}
|
|
|
|
func NewHashGenerator(config GeneratorConfig, hasher *Hasher) *HashGenerator {
|
|
return &HashGenerator{
|
|
newGenerator(config),
|
|
hasher,
|
|
}
|
|
}
|
|
|
|
func (g *HashGenerator) NewCode() (encoded, plain string, err error) {
|
|
plain, err = GenerateRandomString(g.Length(), g.Runes())
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
encoded, err = g.hasher.Hash(plain)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
return encoded, plain, nil
|
|
}
|
|
|
|
func newGenerator(config GeneratorConfig) generator {
|
|
var runes []rune
|
|
if config.IncludeLowerLetters {
|
|
runes = append(runes, lowerLetters...)
|
|
}
|
|
if config.IncludeUpperLetters {
|
|
runes = append(runes, upperLetters...)
|
|
}
|
|
if config.IncludeDigits {
|
|
runes = append(runes, digits...)
|
|
}
|
|
if config.IncludeSymbols {
|
|
runes = append(runes, symbols...)
|
|
}
|
|
return generator{
|
|
length: config.Length,
|
|
expiry: config.Expiry,
|
|
runes: runes,
|
|
}
|
|
}
|
|
|
|
func NewCode(g Generator) (*CryptoValue, string, error) {
|
|
code, err := GenerateRandomString(g.Length(), g.Runes())
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
crypto, err := Crypt([]byte(code), g.Alg())
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
return crypto, code, nil
|
|
}
|
|
|
|
func IsCodeExpired(creationDate time.Time, expiry time.Duration) bool {
|
|
if expiry == 0 {
|
|
return false
|
|
}
|
|
return creationDate.Add(expiry).Before(time.Now().UTC())
|
|
}
|
|
|
|
func VerifyCode(creationDate time.Time, expiry time.Duration, cryptoCode *CryptoValue, verificationCode string, algorithm EncryptionAlgorithm) error {
|
|
if IsCodeExpired(creationDate, expiry) {
|
|
return zerrors.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired")
|
|
}
|
|
return verifyEncryptedCode(cryptoCode, verificationCode, algorithm)
|
|
}
|
|
|
|
func GenerateRandomString(length uint, chars []rune) (string, error) {
|
|
if length == 0 {
|
|
return "", nil
|
|
}
|
|
|
|
max := len(chars) - 1
|
|
maxStr := int(length - 1)
|
|
|
|
str := make([]rune, length)
|
|
randBytes := make([]byte, length)
|
|
if _, err := rand.Read(randBytes); err != nil {
|
|
return "", err
|
|
}
|
|
for i, rb := range randBytes {
|
|
str[i] = chars[int(rb)%max]
|
|
if i == maxStr {
|
|
return string(str), nil
|
|
}
|
|
}
|
|
return "", nil
|
|
}
|
|
|
|
func verifyEncryptedCode(cryptoCode *CryptoValue, verificationCode string, alg EncryptionAlgorithm) error {
|
|
if cryptoCode == nil {
|
|
return zerrors.ThrowInvalidArgument(nil, "CRYPT-aqrFV", "Errors.User.Code.CryptoCodeNil")
|
|
}
|
|
code, err := DecryptString(cryptoCode, alg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if code != verificationCode {
|
|
return zerrors.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid")
|
|
}
|
|
return nil
|
|
}
|