Skip to content
Closed
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
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.31.14</version>
<version>2.43.0</version>
<optional>true</optional>
<type>pom</type>
<scope>import</scope>
Expand All @@ -68,13 +68,13 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.31.14</version>
<version>2.43.0</version>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>kms</artifactId>
<version>2.31.14</version>
<version>2.43.0</version>
</dependency>

<!-- Used when enableMultipartPutObject is configured -->
Expand Down Expand Up @@ -169,7 +169,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
<version>2.31.14</version>
<version>2.43.0</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import software.amazon.encryption.s3.algorithms.AlgorithmSuite;
import software.amazon.encryption.s3.internal.InstructionFileConfig;
import software.amazon.encryption.s3.internal.MetadataKeyConstants;
import software.amazon.encryption.s3.materials.AesKeyring;
import software.amazon.encryption.s3.materials.CryptographicMaterialsManager;
import software.amazon.encryption.s3.materials.DefaultCryptoMaterialsManager;
import software.amazon.encryption.s3.materials.KmsKeyring;
Expand All @@ -52,6 +53,7 @@

import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
Expand Down Expand Up @@ -964,6 +966,32 @@ public void s3EncryptionClientTopLevelCredentialsWrongRegion() {
}
}

@RetryingTest(3)
public void crossRegionRoundTrip() {
final String objectKey = appendTestSuffix("cross-region-test");
SecretKeySpec aesKey = new SecretKeySpec(new byte[32], "AES");
AesKeyring keyRing = AesKeyring.builder().wrappingKey(aesKey).build();

S3Client s3 = S3EncryptionClient.builderV4()
.region(Region.EU_CENTRAL_1)
.crossRegionAccessEnabled(true)
.keyring(keyRing)
.build();

try {
PutObjectRequest request = PutObjectRequest.builder().bucket(BUCKET).key(objectKey).build();
s3.putObject(request, RequestBody.fromBytes("test".getBytes()));
ResponseBytes<GetObjectResponse> response = s3.getObjectAsBytes(builder -> builder
.bucket(BUCKET)
.key(objectKey)
.build());
assertEquals("test", response.asUtf8String());
} finally {
deleteObject(BUCKET, objectKey, s3);
s3.close();
}
}

@RetryingTest(3)
public void s3EncryptionClientTopLevelCredentialsNullCreds() {
final String objectKey = appendTestSuffix("wrapped-s3-client-with-null-credentials");
Expand Down
Loading