feat: allow ECDSA and ED25519 public keys (#11819)

# 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]>
This commit is contained in:
Bertrand
2026-04-09 11:30:23 +02:00
committed by GitHub
co-authored by Copilot Wim Van Laer
parent 9135ff4b36
commit b558a1f79f
4 changed files with 132 additions and 14 deletions
+4 -3
View File
@@ -2,6 +2,7 @@ package authz
import (
"context"
"crypto"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
@@ -13,7 +14,7 @@ import (
"github.com/go-jose/go-jose/v4"
"github.com/zitadel/oidc/v3/pkg/op"
"github.com/zitadel/zitadel/internal/crypto"
zcrypto "github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/zerrors"
)
@@ -89,7 +90,7 @@ type SystemAPIUser struct {
}
type SystemAPIPublicKey struct {
Data *rsa.PublicKey
Data crypto.PublicKey
NotBefore *time.Time
NotAfter *time.Time
}
@@ -104,7 +105,7 @@ func (s *SystemAPIUser) readKey() (*SystemAPIPublicKey, error) {
}
// when an RSA key is provided, use the raw data
key, err := crypto.BytesToPublicKey(s.KeyData)
key, err := zcrypto.BytesToPublicKey(s.KeyData)
if err == nil {
return &SystemAPIPublicKey{Data: key}, nil
}