mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 12:27:59 +00:00
64a3bb3149
# Which Problems Are Solved Implement a new API service that allows management of OIDC signing web keys. This allows users to manage rotation of the instance level keys. which are currently managed based on expiry. The API accepts the generation of the following key types and parameters: - RSA keys with 2048, 3072 or 4096 bit in size and: - Signing with SHA-256 (RS256) - Signing with SHA-384 (RS384) - Signing with SHA-512 (RS512) - ECDSA keys with - P256 curve - P384 curve - P512 curve - ED25519 keys # How the Problems Are Solved Keys are serialized for storage using the JSON web key format from the `jose` library. This is the format that will be used by OIDC for signing, verification and publication. Each instance can have a number of key pairs. All existing public keys are meant to be used for token verification and publication the keys endpoint. Keys can be activated and the active private key is meant to sign new tokens. There is always exactly 1 active signing key: 1. When the first key for an instance is generated, it is automatically activated. 2. Activation of the next key automatically deactivates the previously active key. 3. Keys cannot be manually deactivated from the API 4. Active keys cannot be deleted # Additional Changes - Query methods that later will be used by the OIDC package are already implemented. Preparation for #8031 - Fix indentation in french translation for instance event - Move user_schema translations to consistent positions in all translation files # Additional Context - Closes #8030 - Part of #7809 --------- Co-authored-by: Elio Bischof <elio@zitadel.com>
269 lines
5.8 KiB
Go
269 lines
5.8 KiB
Go
package oidc
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/go-jose/go-jose/v4"
|
|
"github.com/jonboulle/clockwork"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
)
|
|
|
|
type publicKey struct {
|
|
id string
|
|
alg string
|
|
use crypto.KeyUsage
|
|
seq uint64
|
|
expiry time.Time
|
|
key any
|
|
}
|
|
|
|
func (k *publicKey) ID() string {
|
|
return k.id
|
|
}
|
|
|
|
func (k *publicKey) Algorithm() string {
|
|
return k.alg
|
|
}
|
|
|
|
func (k *publicKey) Use() crypto.KeyUsage {
|
|
return k.use
|
|
}
|
|
|
|
func (k *publicKey) Sequence() uint64 {
|
|
return k.seq
|
|
}
|
|
|
|
func (k *publicKey) Expiry() time.Time {
|
|
return k.expiry
|
|
}
|
|
|
|
func (k *publicKey) Key() any {
|
|
return k.key
|
|
}
|
|
|
|
var (
|
|
clock = clockwork.NewFakeClock()
|
|
keyDB = map[string]*publicKey{
|
|
"key1": {
|
|
id: "key1",
|
|
alg: "alg",
|
|
use: crypto.KeyUsageSigning,
|
|
seq: 1,
|
|
expiry: clock.Now().Add(time.Minute),
|
|
},
|
|
"key2": {
|
|
id: "key2",
|
|
alg: "alg",
|
|
use: crypto.KeyUsageSigning,
|
|
seq: 3,
|
|
expiry: clock.Now().Add(10 * time.Hour),
|
|
},
|
|
"exp1": {
|
|
id: "key2",
|
|
alg: "alg",
|
|
use: crypto.KeyUsageSigning,
|
|
seq: 4,
|
|
expiry: clock.Now().Add(-time.Hour),
|
|
},
|
|
}
|
|
)
|
|
|
|
func queryKeyDB(_ context.Context, keyID string) (query.PublicKey, error) {
|
|
if key, ok := keyDB[keyID]; ok {
|
|
return key, nil
|
|
}
|
|
return nil, errors.New("not found")
|
|
}
|
|
|
|
func Test_publicKeyCache(t *testing.T) {
|
|
background, cancel := context.WithCancel(
|
|
clockwork.AddToContext(context.Background(), clock),
|
|
)
|
|
defer cancel()
|
|
|
|
// create an empty cache with a purge go routine, runs every minute.
|
|
// keys are cached for at least 1 Hour after last use.
|
|
cache := newPublicKeyCache(background, time.Hour, queryKeyDB)
|
|
ctx := authz.NewMockContext("instanceID", "orgID", "userID")
|
|
|
|
// query error
|
|
_, err := cache.getKey(ctx, "key9")
|
|
require.Error(t, err)
|
|
|
|
// get key first time, populate the cache
|
|
got, err := cache.getKey(ctx, "key1")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
assert.Equal(t, keyDB["key1"], got.PublicKey)
|
|
|
|
// move time forward
|
|
clock.Advance(15 * time.Minute)
|
|
time.Sleep(time.Millisecond)
|
|
|
|
// key should still be in cache
|
|
cache.mtx.RLock()
|
|
_, ok := cache.instanceKeys["instanceID"]["key1"]
|
|
require.True(t, ok)
|
|
cache.mtx.RUnlock()
|
|
|
|
// move time forward
|
|
clock.Advance(50 * time.Minute)
|
|
time.Sleep(time.Millisecond)
|
|
|
|
// get the second key from DB
|
|
got, err = cache.getKey(ctx, "key2")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
assert.Equal(t, keyDB["key2"], got.PublicKey)
|
|
|
|
// move time forward
|
|
clock.Advance(15 * time.Minute)
|
|
time.Sleep(time.Millisecond)
|
|
|
|
// first key should be purged, second still present
|
|
cache.mtx.RLock()
|
|
_, ok = cache.instanceKeys["instanceID"]["key1"]
|
|
require.False(t, ok)
|
|
_, ok = cache.instanceKeys["instanceID"]["key2"]
|
|
require.True(t, ok)
|
|
cache.mtx.RUnlock()
|
|
|
|
// get the second key from cache
|
|
got, err = cache.getKey(ctx, "key2")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
assert.Equal(t, keyDB["key2"], got.PublicKey)
|
|
|
|
// move time forward
|
|
clock.Advance(2 * time.Hour)
|
|
time.Sleep(time.Millisecond)
|
|
|
|
// now the cache should be empty
|
|
cache.mtx.RLock()
|
|
assert.Empty(t, cache.instanceKeys)
|
|
cache.mtx.RUnlock()
|
|
}
|
|
|
|
func Test_oidcKeySet_VerifySignature(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
cache := newPublicKeyCache(ctx, time.Second, queryKeyDB)
|
|
|
|
tests := []struct {
|
|
name string
|
|
opts []keySetOption
|
|
jws *jose.JSONWebSignature
|
|
}{
|
|
{
|
|
name: "invalid token",
|
|
jws: &jose.JSONWebSignature{},
|
|
},
|
|
{
|
|
name: "key not found",
|
|
jws: &jose.JSONWebSignature{
|
|
Signatures: []jose.Signature{{
|
|
Header: jose.Header{
|
|
KeyID: "xxx",
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
{
|
|
name: "verify error",
|
|
jws: &jose.JSONWebSignature{
|
|
Signatures: []jose.Signature{{
|
|
Header: jose.Header{
|
|
KeyID: "key1",
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
{
|
|
name: "expired, no check",
|
|
jws: &jose.JSONWebSignature{
|
|
Signatures: []jose.Signature{{
|
|
Header: jose.Header{
|
|
KeyID: "exp1",
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
{
|
|
name: "expired, with check",
|
|
jws: &jose.JSONWebSignature{
|
|
Signatures: []jose.Signature{{
|
|
Header: jose.Header{
|
|
KeyID: "exp1",
|
|
},
|
|
}},
|
|
},
|
|
opts: []keySetOption{
|
|
withKeyExpiryCheck(true),
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
k := newOidcKeySet(cache, tt.opts...)
|
|
_, err := k.VerifySignature(ctx, tt.jws)
|
|
require.Error(t, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_keySetMap_VerifySignature(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
k keySetMap
|
|
jws *jose.JSONWebSignature
|
|
}{
|
|
{
|
|
name: "invalid signature",
|
|
k: keySetMap{
|
|
"key1": []byte("foo"),
|
|
},
|
|
jws: &jose.JSONWebSignature{},
|
|
},
|
|
{
|
|
name: "parse error",
|
|
k: keySetMap{
|
|
"key1": []byte("foo"),
|
|
},
|
|
jws: &jose.JSONWebSignature{
|
|
Signatures: []jose.Signature{{
|
|
Header: jose.Header{
|
|
KeyID: "key1",
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
{
|
|
name: "verify error",
|
|
k: keySetMap{
|
|
"key1": []byte("-----BEGIN RSA PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsvX9P58JFxEs5C+L+H7W\nduFSWL5EPzber7C2m94klrSV6q0bAcrYQnGwFOlveThsY200hRbadKaKjHD7qIKH\nDEe0IY2PSRht33Jye52AwhkRw+M3xuQH/7R8LydnsNFk2KHpr5X2SBv42e37LjkE\nslKSaMRgJW+v0KZ30piY8QsdFRKKaVg5/Ajt1YToM1YVsdHXJ3vmXFMtypLdxwUD\ndIaLEX6pFUkU75KSuEQ/E2luT61Q3ta9kOWm9+0zvi7OMcbdekJT7mzcVnh93R1c\n13ZhQCLbh9A7si8jKFtaMWevjayrvqQABEcTN9N4Hoxcyg6l4neZtRDk75OMYcqm\nDQIDAQAB\n-----END RSA PUBLIC KEY-----\n"),
|
|
},
|
|
jws: &jose.JSONWebSignature{
|
|
Signatures: []jose.Signature{{
|
|
Header: jose.Header{
|
|
KeyID: "key1",
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
_, err := tt.k.VerifySignature(context.Background(), tt.jws)
|
|
require.Error(t, err)
|
|
})
|
|
}
|
|
}
|