Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import static com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.materials.WrappedRawMaterials.CONTENT_KEY_ALGORITHM;
import static com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.materials.WrappedRawMaterials.ENVELOPE_KEY;
import static com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.materials.WrappedRawMaterials.KEY_WRAPPING_ALGORITHM;
import static com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.internal.Utils.loadVersion;

import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionContext;
import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.exceptions.DynamoDbEncryptionException;
Expand All @@ -33,6 +34,8 @@
import java.util.Map;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
import software.amazon.awssdk.core.ApiName;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.services.kms.KmsClient;
Expand All @@ -51,6 +54,8 @@
*/
public class DirectKmsMaterialProvider implements EncryptionMaterialsProvider {

private static final String USER_AGENT = "DynamodbEncryptionSdkJava/";
Comment thread
rishav-karanjit marked this conversation as resolved.

private static final String COVERED_ATTR_CTX_KEY = "aws-kms-ec-attr";
private static final String SIGNING_KEY_ALGORITHM = "amzn-ddb-sig-alg";
private static final String TABLE_NAME_EC_KEY = "*aws-kms-table*";
Expand Down Expand Up @@ -288,7 +293,7 @@ protected DecryptResponse decrypt(
final DecryptRequest request,
final EncryptionContext context
) {
return kms.decrypt(request);
return kms.decrypt(appendUserAgent(request));
}

/**
Expand All @@ -305,7 +310,7 @@ protected GenerateDataKeyResponse generateDataKey(
final GenerateDataKeyRequest request,
final EncryptionContext context
) {
return kms.generateDataKey(request);
return kms.generateDataKey(appendUserAgent(request));
}

/**
Expand Down Expand Up @@ -384,4 +389,29 @@ private static void populateKmsEcFromEc(
public void refresh() {
// No action needed
}

private static AwsRequestOverrideConfiguration userAgentOverrideConfig() {
return AwsRequestOverrideConfiguration
.builder()
.addApiName(
ApiName.builder().name(USER_AGENT).version(loadVersion()).build()
)
.build();
}

private static DecryptRequest appendUserAgent(final DecryptRequest request) {
return request
.toBuilder()
.overrideConfiguration(userAgentOverrideConfig())
.build();
}

private static GenerateDataKeyRequest appendUserAgent(
final GenerateDataKeyRequest request
) {
return request
.toBuilder()
.overrideConfiguration(userAgentOverrideConfig())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,8 @@ public static byte[] getRandom(int len) {
getRng().nextBytes(result);
return result;
}

public static String loadVersion() {
return "4.x-legacy";
}
}
Loading