Skip to content

fix: use getPublicKey to retrieve key algorithms #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simpsonw merged 3 commits into from
Mar 25, 2026
Merged

fix: use getPublicKey to retrieve key algorithms #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e537387
fix: use getPublicKey to retrieve key algorithms
simpsonw Mar 25, 2026
c36df0b
chore: remove comment
simpsonw Mar 25, 2026
50e2d18
refactor: rename field to be more explicit
simpsonw Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions internal/server/github/appkey/google_kms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@ import (
var _ AppKey = (*GoogleKMS)(nil)

type GoogleKMS struct {
clientID string
clientID string
kmsResourceID string

client *cloudkms.KeyManagementClient
keyVersion *kmspb.CryptoKeyVersion
client *cloudkms.KeyManagementClient
}

func NewGoogleKMS(ctx context.Context, clientID string, resourceID string) (*GoogleKMS, error) {
func NewGoogleKMS(ctx context.Context, clientID string, kmsResourceID string) (*GoogleKMS, error) {
client, err := cloudkms.NewKeyManagementClient(ctx)

if err != nil {
return nil, fmt.Errorf("could not construct KMS client: %w", err)
}

keyVersion, err := client.GetCryptoKeyVersion(ctx, &kmspb.GetCryptoKeyVersionRequest{
Name: resourceID,
publicKey, err := client.GetPublicKey(ctx, &kmspb.GetPublicKeyRequest{
Name: kmsResourceID,
})

if err != nil {
return nil, fmt.Errorf("could not fetch KMS key metadata: %w", err)
return nil, fmt.Errorf("could not fetch KMS public key: %w", err)
}

if keyVersion.Algorithm != kmspb.CryptoKeyVersion_RSA_SIGN_PKCS1_2048_SHA256 &&
keyVersion.Algorithm != kmspb.CryptoKeyVersion_RSA_SIGN_PKCS1_3072_SHA256 &&
keyVersion.Algorithm != kmspb.CryptoKeyVersion_RSA_SIGN_PKCS1_4096_SHA256 {
if publicKey.Algorithm != kmspb.CryptoKeyVersion_RSA_SIGN_PKCS1_2048_SHA256 &&
publicKey.Algorithm != kmspb.CryptoKeyVersion_RSA_SIGN_PKCS1_3072_SHA256 &&
publicKey.Algorithm != kmspb.CryptoKeyVersion_RSA_SIGN_PKCS1_4096_SHA256 {

return nil, fmt.Errorf("KMS key must be of type RSA_SIGN_PKCS1_*_SHA256")
}

return &GoogleKMS{clientID, client, keyVersion}, nil
return &GoogleKMS{clientID, kmsResourceID, client}, nil
}

func (s *GoogleKMS) ClientID() string {
Expand All @@ -51,7 +51,7 @@ func (s *GoogleKMS) SignRS256(
digest [32]byte,
) ([]byte, error) {
signRequest := &kmspb.AsymmetricSignRequest{
Name: s.keyVersion.Name,
Name: s.kmsResourceID,
Digest: &kmspb.Digest{Digest: &kmspb.Digest_Sha256{Sha256: digest[:]}},
}

Expand Down