Skip to content

bug: Removes the internal added prefix from custom encryption context #1649

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

Closed
sharmabikram wants to merge 1 commit into from
Closed

bug: Removes the internal added prefix from custom encryption context #1649

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
4 changes: 3 additions & 1 deletion modules/branch-keystore-node/src/branch_keystore_helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ function constructCustomEncryptionContext(
//# for the constructed key.
for (const [key, value] of Object.entries(authenticatedEncryptionContext)) {
if (key.startsWith(CUSTOM_ENCRYPTION_CONTEXT_FIELD_PREFIX)) {
customEncryptionContext[key] = value
customEncryptionContext[
key.slice(CUSTOM_ENCRYPTION_CONTEXT_FIELD_PREFIX.length)
] = value
}
}

Expand Down
15 changes: 13 additions & 2 deletions modules/branch-keystore-node/test/branch_keystore_helpers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
TYPE_FIELD,
PARTITION_KEY,
SORT_KEY,
CUSTOM_ENCRYPTION_CONTEXT_FIELD_PREFIX,
} from '../src/constants'
import { DynamoDBKeyStorage } from '../src/dynamodb_key_storage'
import { EncryptedHierarchicalKey } from '../src/types'
Expand All @@ -53,6 +54,16 @@ const VALID_CUSTOM_ENCRYPTION_CONTEXT = Object.fromEntries(
)
)

// Expected output after stripping the `aws-crypto-ec:` prefix
const EXPECTED_CUSTOM_ENCRYPTION_CONTEXT = Object.fromEntries(
Object.entries({ ...VALID_CUSTOM_ENCRYPTION_CONTEXT_KV_PAIRS }).map(
([key, value]) => [
key.slice(CUSTOM_ENCRYPTION_CONTEXT_FIELD_PREFIX.length),
value.toString(),
]
)
)

const INVALID_CUSTOM_ENCRYPTION_CONTEXT_KV_PAIRS = {
'awz-crypto-ec:key1': 'value 1',
key2: 'value 2',
Expand Down Expand Up @@ -650,7 +661,7 @@ describe('Test keystore helpers', () => {
Buffer.from(ENCRYPTED_ACTIVE_BRANCH_KEY.type.version, 'utf-8')
)
expect(activeBranchKeyMaterials.encryptionContext).deep.equals(
VALID_CUSTOM_ENCRYPTION_CONTEXT
EXPECTED_CUSTOM_ENCRYPTION_CONTEXT
)

const versionedBranchKeyMaterials = constructBranchKeyMaterials(
Expand All @@ -671,7 +682,7 @@ describe('Test keystore helpers', () => {
Buffer.from(ENCRYPTED_VERSION_BRANCH_KEY.type.version, 'utf-8')
)
expect(versionedBranchKeyMaterials.encryptionContext).deep.equals(
VALID_CUSTOM_ENCRYPTION_CONTEXT
EXPECTED_CUSTOM_ENCRYPTION_CONTEXT
)
})
})
Expand Down
Loading