Skip to content

feat(test-server): share a Caching CMM cache across clients by name #2191

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
kessplas merged 1 commit into from
Oct 20, 2026
Merged

feat(test-server): share a Caching CMM cache across clients by name #2191

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
17 changes: 14 additions & 3 deletions ...erver/src/main/java/aws/cryptography/esdk/testserver/server/config/EsdkClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.amazonaws.encryptionsdk.CommitmentPolicy;
import com.amazonaws.encryptionsdk.MasterKeyProvider;
import com.amazonaws.encryptionsdk.caching.CachingCryptoMaterialsManager;
import com.amazonaws.encryptionsdk.caching.CryptoMaterialsCache;
import com.amazonaws.encryptionsdk.caching.LocalCryptoMaterialsCache;
import com.amazonaws.encryptionsdk.jce.JceMasterKey;
import com.amazonaws.encryptionsdk.kmssdkv2.AwsKmsMrkAwareMasterKeyProvider;
Expand All @@ -43,6 +44,8 @@
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import javax.crypto.spec.SecretKeySpec;
import software.amazon.awssdk.regions.Region;
Expand Down Expand Up @@ -125,12 +128,17 @@
* built over master key providers equivalent to its wrapped Default CMM's keyring
* (Raw AES and Raw RSA as {@code JceMasterKey}, the AWS KMS keyrings as the KMS
* master key providers, and Multi as a multi-provider); any other keyring, or a
* Caching CMM nested under another CMM, is a construction failure.
* Caching CMM nested under another CMM, is a construction failure. Clients whose
* Caching configs name the same {@code sharedCacheName} share one cache for the
* life of the server.
*/
public final class EsdkClientFactory {

private final MaterialProviders materialProviders;

/** The named caches shared across this server's clients. */
private final ConcurrentMap<String, CryptoMaterialsCache> sharedCaches = new ConcurrentHashMap<>();

public EsdkClientFactory() {
this.materialProviders = MaterialProviders.builder()
.MaterialProvidersConfig(MaterialProvidersConfig.builder().build())
Expand Down Expand Up @@ -188,15 +196,18 @@ private ICryptographicMaterialsManager buildCmm(CryptographicMaterialsManager cm
/** Entries the Caching CMM's local cache holds. */
private static final int CACHE_CAPACITY = 100;

private static CachingCryptoMaterialsManager buildCachingCmm(CachingCmmConfig config) {
private CachingCryptoMaterialsManager buildCachingCmm(CachingCmmConfig config) {
DefaultCmmConfig underlying = config.getUnderlyingCMM().getDefault();
if (underlying == null) {
throw new UnsupportedOperationException(
"the Caching CMM must wrap a Default CMM: the ESDK's caching CMM wraps master key providers");
}
CachingCryptoMaterialsManager.Builder builder = CachingCryptoMaterialsManager.newBuilder()
.withMasterKeyProvider(toMasterKeyProvider(underlying.getKeyring()))
.withCache(new LocalCryptoMaterialsCache(CACHE_CAPACITY))
.withCache(config.getSharedCacheName() == null
? new LocalCryptoMaterialsCache(CACHE_CAPACITY)
: sharedCaches.computeIfAbsent(config.getSharedCacheName(),
name -> new LocalCryptoMaterialsCache(CACHE_CAPACITY)))
.withMaxAge(config.getCacheLimitTtlSeconds(), TimeUnit.SECONDS);
if (config.getPartitionId() != null) {
builder.withPartitionId(config.getPartitionId());
Expand Down
Loading