mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
# Which Problems Are Solved Currently ZITADEL only allows the use of RSA public keys for machine user authentication (jwt-bearer grant), including for system API users. Attempting to use ECDSA (e.g. P-256) or ED25519 keys results in `Errors.Internal` because `BytesToPublicKey` performs an `ifc.(*rsa.PublicKey)` type assertion that returns `(nil, nil)` for non-RSA keys, which then causes a nil key panic in go-jose during JWT verification. This is the same fix as #8433 (by @livio-a), rebased onto current `main`. # How the Problems Are Solved - `BytesToPublicKey` now returns `crypto.PublicKey` (the standard library interface) instead of `*rsa.PublicKey` - A type switch validates the parsed key is one of `*rsa.PublicKey`, `*ecdsa.PublicKey`, or `ed25519.PublicKey` - A new `ErrNoPublicKey` sentinel error is returned for unsupported key types instead of silently returning nil - Callers in `system_token.go` and `query/key.go` are updated to use the generic `crypto.PublicKey` interface # Additional Changes None # Additional Context Duplicate of #8433 which has been open since August 2024. We hit this bug while implementing OIDC bootstrap for an SGX enclave that generates ECDSA P-256 keys at runtime -- the `AddKey` API accepts the ECDSA SPKI PEM fine, but the subsequent `jwt-bearer` token exchange fails with `Errors.Internal` due to the nil key. --------- Co-authored-by: Copilot <[email protected]> Co-authored-by: Wim Van Laer <[email protected]>
280 lines
7.2 KiB
Go
280 lines
7.2 KiB
Go
package crypto
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto"
|
|
"crypto/ecdsa"
|
|
"crypto/ed25519"
|
|
"crypto/rand"
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"crypto/x509/pkix"
|
|
"encoding/pem"
|
|
"errors"
|
|
"fmt"
|
|
"math/big"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func GenerateKeyPair(bits int) (*rsa.PrivateKey, *rsa.PublicKey, error) {
|
|
privkey, err := rsa.GenerateKey(rand.Reader, bits)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return privkey, &privkey.PublicKey, nil
|
|
}
|
|
|
|
type CertificateInformations struct {
|
|
SerialNumber *big.Int
|
|
Organisation []string
|
|
CommonName string
|
|
NotBefore time.Time
|
|
NotAfter time.Time
|
|
KeyUsage x509.KeyUsage
|
|
ExtKeyUsage []x509.ExtKeyUsage
|
|
}
|
|
|
|
func GenerateEncryptedKeyPairWithCACertificate(bits int, keyAlg, certAlg EncryptionAlgorithm, informations *CertificateInformations) (*CryptoValue, *CryptoValue, *CryptoValue, error) {
|
|
privateKey, publicKey, cert, err := GenerateCACertificate(bits, informations)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
encryptPriv, encryptPub, encryptCaCert, err := EncryptKeysAndCert(privateKey, publicKey, cert, keyAlg, certAlg)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
return encryptPriv, encryptPub, encryptCaCert, nil
|
|
}
|
|
|
|
func GenerateEncryptedKeyPairWithCertificate(bits int, keyAlg, certAlg EncryptionAlgorithm, caPrivateKey *rsa.PrivateKey, caCertificate []byte, informations *CertificateInformations) (*CryptoValue, *CryptoValue, *CryptoValue, error) {
|
|
privateKey, publicKey, cert, err := GenerateCertificate(bits, caPrivateKey, caCertificate, informations)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
encryptPriv, encryptPub, encryptCaCert, err := EncryptKeysAndCert(privateKey, publicKey, cert, keyAlg, certAlg)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
return encryptPriv, encryptPub, encryptCaCert, nil
|
|
}
|
|
|
|
func GenerateCACertificate(bits int, informations *CertificateInformations) (*rsa.PrivateKey, *rsa.PublicKey, []byte, error) {
|
|
return generateCertificate(bits, nil, nil, informations)
|
|
}
|
|
|
|
func GenerateCertificate(bits int, caPrivateKey *rsa.PrivateKey, ca []byte, informations *CertificateInformations) (*rsa.PrivateKey, *rsa.PublicKey, []byte, error) {
|
|
return generateCertificate(bits, caPrivateKey, ca, informations)
|
|
}
|
|
|
|
func generateCertificate(bits int, caPrivateKey *rsa.PrivateKey, ca []byte, informations *CertificateInformations) (*rsa.PrivateKey, *rsa.PublicKey, []byte, error) {
|
|
notBefore := time.Now()
|
|
if !informations.NotBefore.IsZero() {
|
|
notBefore = informations.NotBefore
|
|
}
|
|
cert := &x509.Certificate{
|
|
SerialNumber: informations.SerialNumber,
|
|
Subject: pkix.Name{
|
|
CommonName: informations.CommonName,
|
|
Organization: informations.Organisation,
|
|
},
|
|
NotBefore: notBefore,
|
|
NotAfter: informations.NotAfter,
|
|
KeyUsage: informations.KeyUsage,
|
|
ExtKeyUsage: informations.ExtKeyUsage,
|
|
}
|
|
|
|
certPrivKey, err := rsa.GenerateKey(rand.Reader, bits)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
|
|
certBytes := make([]byte, 0)
|
|
if ca == nil {
|
|
cert.IsCA = true
|
|
cert.BasicConstraintsValid = true
|
|
|
|
certBytes, err = x509.CreateCertificate(rand.Reader, cert, cert, &certPrivKey.PublicKey, certPrivKey)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
} else {
|
|
caCert, err := x509.ParseCertificate(ca)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
|
|
certBytes, err = x509.CreateCertificate(rand.Reader, cert, caCert, &certPrivKey.PublicKey, caPrivateKey)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
}
|
|
|
|
x509Cert, err := x509.ParseCertificate(certBytes)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
|
|
certPem, err := CertificateToBytes(x509Cert)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
|
|
return certPrivKey, &certPrivKey.PublicKey, certPem, nil
|
|
}
|
|
|
|
func PrivateKeyToBytes(priv *rsa.PrivateKey) []byte {
|
|
return pem.EncodeToMemory(
|
|
&pem.Block{
|
|
Type: "RSA PRIVATE KEY",
|
|
Bytes: x509.MarshalPKCS1PrivateKey(priv),
|
|
},
|
|
)
|
|
}
|
|
|
|
func PrivateKeyToBytesPKCS8(priv crypto.PrivateKey) ([]byte, error) {
|
|
der, err := x509.MarshalPKCS8PrivateKey(priv)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
buffer := bytes.NewBuffer(nil)
|
|
err = pem.Encode(buffer,
|
|
&pem.Block{
|
|
Type: "PRIVATE KEY",
|
|
Bytes: der,
|
|
},
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return buffer.Bytes(), nil
|
|
}
|
|
|
|
func PublicKeyToBytes(pub *rsa.PublicKey) ([]byte, error) {
|
|
pubASN1, err := x509.MarshalPKIXPublicKey(pub)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
buffer := bytes.NewBuffer(nil)
|
|
err = pem.Encode(buffer, &pem.Block{
|
|
Type: "RSA PUBLIC KEY",
|
|
Bytes: pubASN1,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return buffer.Bytes(), nil
|
|
}
|
|
|
|
func BytesToPrivateKey(priv []byte) (*rsa.PrivateKey, error) {
|
|
block, _ := pem.Decode(priv)
|
|
enc := x509.IsEncryptedPEMBlock(block)
|
|
b := block.Bytes
|
|
var err error
|
|
if enc {
|
|
b, err = x509.DecryptPEMBlock(block, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
key, err := x509.ParsePKCS1PrivateKey(b)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
func BytesToPrivateKeyPKCS8[T crypto.PrivateKey](priv []byte) (T, error) {
|
|
var zero T
|
|
if len(priv) == 0 {
|
|
return zero, ErrEmpty
|
|
}
|
|
block, _ := pem.Decode(priv)
|
|
if block == nil {
|
|
return zero, ErrEmpty
|
|
}
|
|
key, err := x509.ParsePKCS8PrivateKey(block.Bytes)
|
|
if err != nil {
|
|
return zero, err
|
|
}
|
|
if k, ok := key.(T); ok {
|
|
return k, nil
|
|
}
|
|
return zero, zerrors.ThrowInvalidArgumentf(nil, "CRYP-9n2s3", "wrong type: expected %T, got %T", zero, key)
|
|
}
|
|
|
|
var ErrEmpty = errors.New("cannot decode, empty data")
|
|
var ErrNoPublicKey = errors.New("unsupported public key type")
|
|
|
|
func BytesToPublicKey(pub []byte) (crypto.PublicKey, error) {
|
|
if len(pub) == 0 {
|
|
return nil, ErrEmpty
|
|
}
|
|
block, _ := pem.Decode(pub)
|
|
if block == nil {
|
|
return nil, ErrEmpty
|
|
}
|
|
key, err := x509.ParsePKIXPublicKey(block.Bytes)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
switch key.(type) {
|
|
case *rsa.PublicKey,
|
|
*ecdsa.PublicKey,
|
|
ed25519.PublicKey:
|
|
return key, nil
|
|
default:
|
|
return nil, ErrNoPublicKey
|
|
}
|
|
}
|
|
|
|
func EncryptKeys(privateKey *rsa.PrivateKey, publicKey *rsa.PublicKey, alg EncryptionAlgorithm) (*CryptoValue, *CryptoValue, error) {
|
|
encryptedPrivateKey, err := Encrypt(PrivateKeyToBytes(privateKey), alg)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
pubKey, err := PublicKeyToBytes(publicKey)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
encryptedPublicKey, err := Encrypt(pubKey, alg)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return encryptedPrivateKey, encryptedPublicKey, nil
|
|
}
|
|
|
|
func CertificateToBytes(cert *x509.Certificate) ([]byte, error) {
|
|
certPem := new(bytes.Buffer)
|
|
if err := pem.Encode(certPem, &pem.Block{
|
|
Type: "CERTIFICATE",
|
|
Bytes: cert.Raw,
|
|
}); err != nil {
|
|
return nil, err
|
|
}
|
|
return certPem.Bytes(), nil
|
|
}
|
|
|
|
func BytesToCertificate(data []byte) ([]byte, error) {
|
|
block, _ := pem.Decode(data)
|
|
if block == nil || block.Type != "CERTIFICATE" {
|
|
return nil, fmt.Errorf("failed to decode PEM block containing public key")
|
|
}
|
|
return block.Bytes, nil
|
|
}
|
|
|
|
func EncryptKeysAndCert(privateKey *rsa.PrivateKey, publicKey *rsa.PublicKey, cert []byte, keyAlg, certAlg EncryptionAlgorithm) (*CryptoValue, *CryptoValue, *CryptoValue, error) {
|
|
encryptedPrivateKey, encryptedPublicKey, err := EncryptKeys(privateKey, publicKey, keyAlg)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
encryptedCertificate, err := Encrypt(cert, certAlg)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
return encryptedPrivateKey, encryptedPublicKey, encryptedCertificate, nil
|
|
}
|