Skip to content

fix(SearchableEncryption): respect CMC contract #1434

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
merged 1 commit into from
Oct 12, 2024
Merged

fix(SearchableEncryption): respect CMC contract #1434

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
11 changes: 10 additions & 1 deletion DynamoDbEncryption/dafny/DynamoDbEncryption/src/SearchInfo.dfy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@ module SearchableEncryptionInfo {
assume {:axiom} cache.Modifies == {};
var getCacheOutput := cache.GetCacheEntry(getCacheInput);

// If error is not EntryDoesNotExist, return failure
if (getCacheOutput.Failure? && !getCacheOutput.error.EntryDoesNotExist?) {
return Failure(AwsCryptographyMaterialProviders(AwsCryptographyMaterialProviders:=getCacheOutput.error));
}

if getCacheOutput.Failure? {
//= specification/searchable-encryption/search-config.md#beacon-keys
//# Beacon keys MUST be obtained from the configured [Beacon Key Source](#beacon-key-source).
Expand Down Expand Up @@ -280,7 +285,11 @@ module SearchableEncryptionInfo {

verifyValidStateCache(cache);
assume {:axiom} cache.Modifies == {};
var _ := cache.PutCacheEntry(putCacheEntryInput);

var putResult := cache.PutCacheEntry(putCacheEntryInput);
if (putResult.Failure? && !putResult.error.EntryAlreadyExists?) {
return Failure(AwsCryptographyMaterialProviders(AwsCryptographyMaterialProviders:=putResult.error));
}
return Success(keyMap);
} else {
:- Need(
Expand Down
Loading