TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-03-02 18:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore undecryptable keys from view (#1528)

Browse Source
This commit is contained in:
Livio Amstutz 2021-04-06 13:49:16 +02:00 committed by GitHub
parent a393d549fb
commit efc90b382c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/key/model/key_view.go
View File

@ -1,10 +1,12 @@
package model package model
import ( import (
"github.com/caos/zitadel/internal/domain"
"time" "time"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/crypto"
"github.com/caos/zitadel/internal/domain"
"github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/errors"
) )
@ -90,15 +92,16 @@ func SigningKeyFromKeyView(key *KeyView, alg crypto.EncryptionAlgorithm) (*Signi
} }
func PublicKeysFromKeyView(keys []*KeyView, alg crypto.EncryptionAlgorithm) ([]*PublicKey, error) { func PublicKeysFromKeyView(keys []*KeyView, alg crypto.EncryptionAlgorithm) ([]*PublicKey, error) {
converted := make([]*PublicKey, len(keys)) convertedKeys := make([]*PublicKey, 0, len(keys))
var err error for _, key := range keys {
for i, key := range keys { converted, err := PublicKeyFromKeyView(key, alg)
converted[i], err = PublicKeyFromKeyView(key, alg)
if err != nil { if err != nil {
return nil, err logging.Log("MODEL-adB3f").WithError(err).Debug("cannot convert to public key") //TODO: change log level to warning when keys can be revoked
continue
} }
convertedKeys = append(convertedKeys, converted)
} }
return converted, nil return convertedKeys, nil
} }
func PublicKeyFromKeyView(key *KeyView, alg crypto.EncryptionAlgorithm) (*PublicKey, error) { func PublicKeyFromKeyView(key *KeyView, alg crypto.EncryptionAlgorithm) (*PublicKey, error) {