Merge pull request #19 from bhouse99/brianh-aws-sdk-2-mk1

Updated AWS SDK dependency from 1.x to SDK 2.15

Author: bhouse99

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## [4.0.4] - 2021-01-20
+
+Updated to AWS 2 SDK.
+ 
+
 ## [4.0.3] - 2020-05-15
 
 Updated the plugin to fix newlines used in the SigV4 signature on Windows. This resolves [Issue

README.md

@@ -1,6 +1,6 @@
 # IMPORTANT: Latest Version
 
-The current version is 4.0.3. Please see the [changelog](./CHANGELOG.md) for details on version history.
+The current version is 4.0.4. Please see the [changelog](./CHANGELOG.md) for details on version history.
 
 # What
 
@@ -66,7 +66,7 @@ The authentication plugin supports version 4.x of the DataStax Java Driver for C
 <dependency>
  <groupId>software.aws.mcs</groupId>
  <artifactId>aws-sigv4-auth-cassandra-java-driver-plugin</artifactId>
- <version>4.0.2</version>
+ <version>4.0.4</version>
 </dependency>
 ```
 

pom.xml

@@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>software.aws.mcs</groupId>
  <artifactId>aws-sigv4-auth-cassandra-java-driver-plugin</artifactId>
- <version>4.0.3</version>
+ <version>4.0.4</version>
  <name>AWS SigV4 Auth Java Driver 4.x Plugin</name>
  <description>A Plugin to allow SigV4 authentication for Java Cassandra drivers with Amazon MCS</description>
  <url>https://github.com/aws/aws-sigv4-auth-cassandra-java-driver-plugin</url>
@@ -46,9 +46,9 @@
 
  <dependencies>
  <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-core</artifactId>
- <version>1.11.717</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.15</version>
  </dependency>
  <dependency>
  <groupId>com.datastax.oss</groupId>
@@ -67,6 +67,11 @@
  <version>5.6.0</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <version>2.15.66</version>
+ </dependency>
  </dependencies>
 
  <build>

src/main/java/software/aws/mcs/auth/SigV4AuthProvider.java

@@ -4,7 +4,7 @@
  * #%L
  * AWS SigV4 Auth Java Driver 4.x Plugin
  * %%
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright (C) 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,44 +20,42 @@
  * #L%
  */
 
-import com.amazonaws.SDKGlobalConfiguration;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSSessionCredentials;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import com.amazonaws.auth.internal.AWS4SignerUtils;
-import com.amazonaws.auth.internal.SignerConstants;
-
-import com.datastax.oss.driver.api.core.auth.AuthenticationException;
-import com.datastax.oss.driver.api.core.auth.Authenticator;
-import com.datastax.oss.driver.api.core.auth.AuthProvider;
-import com.datastax.oss.driver.api.core.config.DriverOption;
-import com.datastax.oss.driver.api.core.context.DriverContext;
-import com.datastax.oss.driver.api.core.metadata.EndPoint;
-
-import org.apache.commons.codec.binary.Hex;
-
 import java.io.UnsupportedEncodingException;
-import java.net.InetSocketAddress;
 import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import javax.validation.constraints.NotNull;
 
+import org.apache.commons.codec.binary.Hex;
+
+import com.datastax.oss.driver.api.core.auth.AuthProvider;
+import com.datastax.oss.driver.api.core.auth.AuthenticationException;
+import com.datastax.oss.driver.api.core.auth.Authenticator;
+import com.datastax.oss.driver.api.core.config.DriverOption;
+import com.datastax.oss.driver.api.core.context.DriverContext;
+import com.datastax.oss.driver.api.core.metadata.EndPoint;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
+import software.amazon.awssdk.auth.signer.internal.Aws4SignerUtils;
+import software.amazon.awssdk.auth.signer.internal.SignerConstant;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+
+import static software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider.create;
+
 /**
  * This auth provider can be used with the Amazon MCS service to
  * authenticate with SigV4. It uses the AWSCredentialsProvider
@@ -89,7 +87,7 @@ public class SigV4AuthProvider implements AuthProvider {
  // These are static values because we don't need HTTP, but SigV4 assumes some amount of HTTP metadata
  private static final String CANONICAL_SERVICE = "cassandra";
 
- private final AWSCredentialsProvider credentialsProvider;
+ private final AwsCredentialsProvider credentialsProvider;
  private final String signingRegion;
 
  /**
@@ -99,7 +97,7 @@ public class SigV4AuthProvider implements AuthProvider {
  * environment variable or the "aws.region" system property.
  */
  public SigV4AuthProvider() {
- this(DefaultAWSCredentialsProviderChain.getInstance(), null);
+ this(create(), null);
  }
 
  private final static DriverOption REGION_OPTION = new DriverOption() {
@@ -126,7 +124,7 @@ public String getPath() {
  * preference.
  *
  * For programmatic construction, use {@link #SigV4AuthProvider()}
- * or {@link #SigV4AuthProvider(AWSCredentialsProvider, String)}.
+ * or {@link #SigV4AuthProvider(AwsCredentialsProvider, String)}.
  *
  * @param driverContext the driver context for instance creation.
  * Unused for this plugin.
@@ -142,7 +140,7 @@ public SigV4AuthProvider(DriverContext driverContext) {
  * variable, or the "aws.region" system property to configure it.
  */
  public SigV4AuthProvider(final String region) {
- this(DefaultAWSCredentialsProviderChain.getInstance(), region);
+ this(create(), region);
  }
 
  /**
@@ -152,15 +150,14 @@ public SigV4AuthProvider(final String region) {
  * null value indicates to use the AWS_REGION environment
  * variable, or the "aws.region" system property to configure it.
  */
- public SigV4AuthProvider(@NotNull AWSCredentialsProvider credentialsProvider, final String region) {
+ public SigV4AuthProvider(@NotNull AwsCredentialsProvider credentialsProvider, final String region) {
  this.credentialsProvider = credentialsProvider;
 
  if (region == null) {
- if (System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY) != null) {
- this.signingRegion = System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY);
- } else {
- this.signingRegion = System.getenv(SDKGlobalConfiguration.AWS_REGION_ENV_VAR);
- }
+ DefaultAwsRegionProviderChain chain = new DefaultAwsRegionProviderChain();
+ Region defaultRegion = chain.getRegion();
+ this.signingRegion = defaultRegion.toString();
+
  } else {
  this.signingRegion = region;
  }
@@ -170,7 +167,6 @@ public SigV4AuthProvider(@NotNull AWSCredentialsProvider credentialsProvider, fi
  "A region must be specified by constructor, AWS_REGION env variable, or aws.region system property"
  );
  }
-
  }
 
  @Override
@@ -204,19 +200,18 @@ public CompletionStage<ByteBuffer> evaluateChallenge(ByteBuffer challenge) {
  byte[] nonce = extractNonce(challenge);
 
  Instant requestTimestamp = Instant.now();
-
- AWSCredentials credentials = credentialsProvider.getCredentials();
+ AwsCredentials credentials = credentialsProvider.resolveCredentials();
 
  String signature = generateSignature(nonce, requestTimestamp, credentials);
 
  String response =
  String.format("signature=%s,access_key=%s,amzdate=%s",
  signature,
- credentials.getAWSAccessKeyId(),
+ credentials.accessKeyId(),
  timestampFormatter.format(requestTimestamp));
 
- if (credentials instanceof AWSSessionCredentials) {
- response = response + ",session_token=" + ((AWSSessionCredentials)credentials).getSessionToken();
+ if (credentials instanceof AwsSessionCredentials) {
+ response = response + ",session_token=" + ((AwsSessionCredentials)credentials).sessionToken();
  }
 
  return CompletableFuture.completedFuture(ByteBuffer.wrap(response.getBytes(StandardCharsets.UTF_8)));
@@ -266,22 +261,22 @@ static byte[] extractNonce(ByteBuffer challengeBuffer) {
  return Arrays.copyOfRange(challenge, nonceStart, nonceEnd);
  }
 
- private String generateSignature(byte[] nonce, Instant requestTimestamp, AWSCredentials credentials) throws UnsupportedEncodingException {
- String credentialScopeDate = AWS4SignerUtils.formatDateStamp(requestTimestamp.toEpochMilli());
+ private String generateSignature(byte[] nonce, Instant requestTimestamp, AwsCredentials credentials) throws UnsupportedEncodingException {
+ String credentialScopeDate = Aws4SignerUtils.formatDateStamp(requestTimestamp.toEpochMilli());
 
  String signingScope = String.format("%s/%s/%s/aws4_request", credentialScopeDate, signingRegion, CANONICAL_SERVICE);
 
  String nonceHash = sha256Digest(nonce);
 
- String canonicalRequest = canonicalizeRequest(credentials.getAWSAccessKeyId(), signingScope, requestTimestamp, nonceHash);
+ String canonicalRequest = canonicalizeRequest(credentials.accessKeyId(), signingScope, requestTimestamp, nonceHash);
 
  String stringToSign = String.format("%s\n%s\n%s\n%s",
- SignerConstants.AWS4_SIGNING_ALGORITHM,
+ SignerConstant.AWS4_SIGNING_ALGORITHM,
  timestampFormatter.format(requestTimestamp),
  signingScope,
  sha256Digest(canonicalRequest));
 
- byte[] signingKey = getSignatureKey(credentials.getAWSSecretKey(),
+ byte[] signingKey = getSignatureKey(credentials.secretAccessKey(),
  credentialScopeDate,
  signingRegion,
  CANONICAL_SERVICE);
@@ -291,7 +286,7 @@ private String generateSignature(byte[] nonce, Instant requestTimestamp, AWSCred
  return Hex.encodeHexString(signature, true);
  }
 
- private static final String AMZ_ALGO_HEADER = "X-Amz-Algorithm=" + SignerConstants.AWS4_SIGNING_ALGORITHM;
+ private static final String AMZ_ALGO_HEADER = "X-Amz-Algorithm=" + SignerConstant.AWS4_SIGNING_ALGORITHM;
  private static final String AMZ_EXPIRES_HEADER = "X-Amz-Expires=900";
 
  private static String canonicalizeRequest(String accessKey,

src/test/java/software/aws/mcs/auth/SigV4AuthProviderTest.java

@@ -4,7 +4,7 @@
  * #%L
  * AWS SigV4 Auth Java Driver 4.x Plugin
  * %%
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright (C) 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,13 @@
  * #L%
  */
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.Test;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SigV4AuthProviderTest {
  @Test

src/test/java/software/aws/mcs/auth/TestSigV4.java

@@ -4,7 +4,7 @@
  * #%L
  * AWS SigV4 Auth Java Driver 4.x Plugin
  * %%
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright (C) 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,15 +20,14 @@
  * #L%
  */
 
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.cql.*;
-
-import software.aws.mcs.auth.SigV4AuthProvider;
-
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import javax.net.ssl.SSLContext;
 
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+
 public class TestSigV4 {
  static String[] DEFAULT_CONTACT_POINTS = {"127.0.0.1:9042"};
 
@@ -59,7 +58,7 @@ public static void main(String[] args) throws Exception {
  .addContactPoints(contactPoints)
  .withAuthProvider(new SigV4AuthProvider())
  .withSslContext(SSLContext.getDefault())
- .withLocalDatacenter("dc1")
+ .withLocalDatacenter("us-west-2")
  .build()) {
 
  // We use execute to send a query to Cassandra. This returns a ResultSet, which is essentially a collection