Skip to content

fix(kms): normalize alias targetKeyId to plain key ID on createAlias #1648

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
hectorvent merged 1 commit into from
Jul 3, 2026
Merged

fix(kms): normalize alias targetKeyId to plain key ID on createAlias #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,12 +576,12 @@ public void createAlias(String aliasName, String targetKeyId, String region) {
if (!aliasName.startsWith("alias/")) {
throw new AwsException("InvalidAliasNameException", "Alias name must begin with 'alias/'", 400);
}
resolveKey(targetKeyId, region); // Validate key exists
KmsKey key = resolveKey(targetKeyId, region); // Validate key exists and normalize to plain key ID

String aliasArn = regionResolver.buildArn("kms", region, aliasName);
KmsAlias alias = new KmsAlias(aliasName, aliasArn, targetKeyId);
KmsAlias alias = new KmsAlias(aliasName, aliasArn, key.getKeyId());
aliasStore.put(region + "::" + aliasName, alias);
LOG.infov("Created KMS alias: {0} -> {1}", aliasName, targetKeyId);
LOG.infov("Created KMS alias: {0} -> {1}", aliasName, key.getKeyId());
}

public void deleteAlias(String aliasName, String region) {
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,15 @@ void resolveKeyByAlias() {
assertEquals(key.getKeyId(), resolved.getKeyId());
}

@Test
void resolveKeyByAliasCreatedWithArn() {
KmsKey key = kmsService.createKey(null, REGION);
kmsService.createAlias("alias/by-arn", key.getArn(), REGION);

KmsKey resolved = kmsService.describeKey("alias/by-arn", REGION);
assertEquals(key.getKeyId(), resolved.getKeyId());
}

@Test
void encryptAndDecryptWithId() {
KmsKey key = kmsService.createKey(null, REGION);
Expand Down