Skip to content

Commit 8d108f3

Browse files
imabhichowimabhichow
committed
chore: update test-servers
1 parent 8b5b0ab commit 8d108f3

4 files changed

Lines changed: 21 additions & 28 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
[submodule "test-server/java-v4-server/s3ec-staging"]
2323
path = test-server/java-v4-server/s3ec-staging
2424
url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git
25-
branch = add-kc
25+
branch = imabhichow/add-kc
2626
; branch = s3ec/improved
2727
[submodule "test-server/specification"]
2828
path = test-server/specification

‎test-server/java-v3-transition-server/src/main/java/software/amazon/encryption/s3/CreateClientOperationImpl.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,30 +126,26 @@ public CreateClientOutput createClient(CreateClientInput input, RequestContext c
126126
}
127127

128128
private static AlgorithmSuite getAlgorithmSuite(CreateClientInput input) {
129-
AlgorithmSuite algorithm;
130129
if (input.getConfig().getEncryptionAlgorithm().equals(EncryptionAlgorithm.ALG_AES_256_CBC_IV16_NO_KDF)) {
131-
algorithm = AlgorithmSuite.ALG_AES_256_CBC_IV16_NO_KDF;
130+
return AlgorithmSuite.ALG_AES_256_CBC_IV16_NO_KDF;
132131
} else if (input.getConfig().getEncryptionAlgorithm().equals(EncryptionAlgorithm.ALG_AES_256_GCM_IV12_TAG16_NO_KDF)) {
133-
algorithm = AlgorithmSuite.ALG_AES_256_GCM_IV12_TAG16_NO_KDF;
132+
return AlgorithmSuite.ALG_AES_256_GCM_IV12_TAG16_NO_KDF;
134133
} else if (input.getConfig().getEncryptionAlgorithm().equals(ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY)) {
135-
algorithm = AlgorithmSuite.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY;
134+
return AlgorithmSuite.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY;
136135
} else {
137-
throw new RuntimeException("Unknown encryption algorithm: " + input.getConfig().getEncryptionAlgorithm());
136+
throw new RuntimeException("Unknown encryption algorithm: " + input.getConfig().getEncryptionAlgorithm());
138137
}
139-
return algorithm;
140138
}
141139

142-
private static CommitmentPolicy getCommitmentPolicy(CreateClientInput input) {
143-
CommitmentPolicy policy;
140+
private static software.amazon.encryption.s3.CommitmentPolicy getCommitmentPolicy(CreateClientInput input) {
144141
if (input.getConfig().getCommitmentPolicy().equals(software.amazon.encryption.s3.model.CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT)) {
145-
policy = FORBID_ENCRYPT_ALLOW_DECRYPT;
142+
return FORBID_ENCRYPT_ALLOW_DECRYPT;
146143
} else if (input.getConfig().getCommitmentPolicy().equals(software.amazon.encryption.s3.model.CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)) {
147-
policy = null;
144+
return null;
148145
} else if (input.getConfig().getCommitmentPolicy().equals(software.amazon.encryption.s3.model.CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT)) {
149-
policy = null;
146+
return null;
150147
} else {
151-
throw new RuntimeException("Unknown commitment policy: " + input.getConfig().getCommitmentPolicy());
148+
throw new RuntimeException("Unknown commitment policy: " + input.getConfig().getCommitmentPolicy());
152149
}
153-
return policy;
154150
}
155151
}

‎test-server/java-v4-server/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion")
1515

1616
// S3EC from local Maven repository (installed by mvn install)
17-
implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0")
17+
implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-add-kc")
1818
}
1919

2020
// Use that application plugin to start the service via the `run` task.

‎test-server/java-v4-server/src/main/java/software/amazon/encryption/s3/CreateClientOperationImpl.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import software.amazon.encryption.s3.materials.KmsKeyring;
88
import software.amazon.encryption.s3.materials.PartialRsaKeyPair;
99
import software.amazon.encryption.s3.materials.RsaKeyring;
10-
import software.amazon.encryption.s3.model.CommitmentPolicy;
1110
import software.amazon.encryption.s3.model.CreateClientInput;
1211
import software.amazon.encryption.s3.model.CreateClientOutput;
1312
import software.amazon.encryption.s3.model.EncryptionAlgorithm;
@@ -26,6 +25,8 @@
2625
import java.util.Map;
2726
import java.util.UUID;
2827

28+
import static software.amazon.encryption.s3.CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT;
29+
import static software.amazon.encryption.s3.CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT;
2930
import static software.amazon.encryption.s3.CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT;
3031
import static software.amazon.encryption.s3.model.EncryptionAlgorithm.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY;
3132

@@ -95,7 +96,7 @@ public CreateClientOutput createClient(CreateClientInput input, RequestContext c
9596

9697
// Configure commitment policy if provided (FireEgg feature)
9798
if (input.getConfig().getCommitmentPolicy() != null) {
98-
CommitmentPolicy policy = getCommitmentPolicy(input);
99+
software.amazon.encryption.s3.CommitmentPolicy policy = getCommitmentPolicy(input);
99100
clientBuilder.commitmentPolicy(policy);
100101
}
101102

@@ -123,30 +124,26 @@ public CreateClientOutput createClient(CreateClientInput input, RequestContext c
123124
}
124125

125126
private static AlgorithmSuite getAlgorithmSuite(CreateClientInput input) {
126-
AlgorithmSuite algorithm;
127127
if (input.getConfig().getEncryptionAlgorithm().equals(EncryptionAlgorithm.ALG_AES_256_CBC_IV16_NO_KDF)) {
128-
algorithm = AlgorithmSuite.ALG_AES_256_CBC_IV16_NO_KDF;
128+
return AlgorithmSuite.ALG_AES_256_CBC_IV16_NO_KDF;
129129
} else if (input.getConfig().getEncryptionAlgorithm().equals(EncryptionAlgorithm.ALG_AES_256_GCM_IV12_TAG16_NO_KDF)) {
130-
algorithm = AlgorithmSuite.ALG_AES_256_GCM_IV12_TAG16_NO_KDF;
130+
return AlgorithmSuite.ALG_AES_256_GCM_IV12_TAG16_NO_KDF;
131131
} else if (input.getConfig().getEncryptionAlgorithm().equals(ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY)) {
132-
algorithm = AlgorithmSuite.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY;
132+
return AlgorithmSuite.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY;
133133
} else {
134134
throw new RuntimeException("Unknown encryption algorithm: " + input.getConfig().getEncryptionAlgorithm());
135135
}
136-
return algorithm;
137136
}
138137

139-
private static CommitmentPolicy getCommitmentPolicy(CreateClientInput input) {
140-
CommitmentPolicy policy;
138+
private static software.amazon.encryption.s3.CommitmentPolicy getCommitmentPolicy(CreateClientInput input) {
141139
if (input.getConfig().getCommitmentPolicy().equals(software.amazon.encryption.s3.model.CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT)) {
142-
policy = CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT;
140+
return FORBID_ENCRYPT_ALLOW_DECRYPT;
143141
} else if (input.getConfig().getCommitmentPolicy().equals(software.amazon.encryption.s3.model.CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)) {
144-
policy = CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT;
142+
return REQUIRE_ENCRYPT_ALLOW_DECRYPT;
145143
} else if (input.getConfig().getCommitmentPolicy().equals(software.amazon.encryption.s3.model.CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT)) {
146-
policy = REQUIRE_ENCRYPT_REQUIRE_DECRYPT;
144+
return REQUIRE_ENCRYPT_REQUIRE_DECRYPT;
147145
} else {
148146
throw new RuntimeException("Unknown commitment policy: " + input.getConfig().getCommitmentPolicy());
149147
}
150-
return policy;
151148
}
152149
}

0 commit comments

Comments
 (0)