Reusing common logic (#6491)

Author: zoewangg

core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/SigningUtils.java

@@ -15,6 +15,16 @@
 
 package software.amazon.awssdk.authcrt.signer.internal;
 
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.AUTHORIZATION;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.HOST;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_ALGORITHM;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_CONTENT_SHA256;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_CREDENTIAL;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_DATE;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_EXPIRES;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_SIGNATURE;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_SIGNED_HEADERS;
+
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.Duration;
@@ -42,22 +52,11 @@ public class SigningUtils {
      */
     public static final ExecutionAttribute<Clock> SIGNING_CLOCK = new ExecutionAttribute<>("SigningClock");
 
-    private static final String BODY_HASH_NAME = "x-amz-content-sha256";
-    private static final String DATE_NAME = "X-Amz-Date";
-    private static final String AUTHORIZATION_NAME = "Authorization";
     private static final String REGION_SET_NAME = "X-amz-region-set";
 
-    private static final String SIGNATURE_NAME = "X-Amz-Signature";
-    private static final String CREDENTIAL_NAME = "X-Amz-Credential";
-    private static final String ALGORITHM_NAME = "X-Amz-Algorithm";
-    private static final String SIGNED_HEADERS_NAME = "X-Amz-SignedHeaders";
-    private static final String EXPIRES_NAME = "X-Amz-Expires";
-
     private static final Set<String> FORBIDDEN_HEADERS = buildForbiddenHeaderSet();
     private static final Set<String> FORBIDDEN_PARAMS = buildForbiddenQueryParamSet();
 
-    private static final String HOST_HEADER = "Host";
-
     private SigningUtils() {
     }
 
@@ -125,7 +124,7 @@ public static SdkHttpFullRequest sanitizeSdkRequestForCrtSigning(SdkHttpFullRequ
         String hostHeader = SdkHttpUtils.isUsingStandardPort(request.protocol(), request.port())
                             ? request.host()
                             : request.host() + ":" + request.port();
-        builder.putHeader(HOST_HEADER, hostHeader);
+        builder.putHeader(HOST, hostHeader);
 
         builder.clearQueryParameters();
 
@@ -142,9 +141,9 @@ public static SdkHttpFullRequest sanitizeSdkRequestForCrtSigning(SdkHttpFullRequ
     private static Set<String> buildForbiddenHeaderSet() {
         Set<String> forbiddenHeaders = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
 
-        forbiddenHeaders.add(BODY_HASH_NAME);
-        forbiddenHeaders.add(DATE_NAME);
-        forbiddenHeaders.add(AUTHORIZATION_NAME);
+        forbiddenHeaders.add(X_AMZ_CONTENT_SHA256);
+        forbiddenHeaders.add(X_AMZ_DATE);
+        forbiddenHeaders.add(AUTHORIZATION);
         forbiddenHeaders.add(REGION_SET_NAME);
 
         return forbiddenHeaders;
@@ -153,13 +152,13 @@ private static Set<String> buildForbiddenHeaderSet() {
     private static Set<String> buildForbiddenQueryParamSet() {
         Set<String> forbiddenParams = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
 
-        forbiddenParams.add(SIGNATURE_NAME);
-        forbiddenParams.add(DATE_NAME);
-        forbiddenParams.add(CREDENTIAL_NAME);
-        forbiddenParams.add(ALGORITHM_NAME);
-        forbiddenParams.add(SIGNED_HEADERS_NAME);
+        forbiddenParams.add(X_AMZ_SIGNATURE);
+        forbiddenParams.add(X_AMZ_DATE);
+        forbiddenParams.add(X_AMZ_CREDENTIAL);
+        forbiddenParams.add(X_AMZ_ALGORITHM);
+        forbiddenParams.add(X_AMZ_SIGNED_HEADERS);
         forbiddenParams.add(REGION_SET_NAME);
-        forbiddenParams.add(EXPIRES_NAME);
+        forbiddenParams.add(X_AMZ_EXPIRES);
 
         return forbiddenParams;
     }

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtUtils.java

@@ -18,6 +18,7 @@
 import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.AUTHORIZATION;
 import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.HOST;
 import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_ALGORITHM;
+import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_CONTENT_SHA256;
 import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_CREDENTIAL;
 import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_DATE;
 import static software.amazon.awssdk.http.auth.aws.signer.SignerConstant.X_AMZ_EXPIRES;
@@ -39,11 +40,10 @@
 
 @SdkInternalApi
 public final class CrtUtils {
-    private static final String BODY_HASH_NAME = "x-amz-content-sha256";
     private static final String REGION_SET_NAME = "X-amz-region-set";
 
     private static final Set<String> FORBIDDEN_HEADERS =
-        Stream.of(BODY_HASH_NAME, X_AMZ_DATE, AUTHORIZATION, REGION_SET_NAME)
+        Stream.of(X_AMZ_CONTENT_SHA256, X_AMZ_DATE, AUTHORIZATION, REGION_SET_NAME)
               .collect(Collectors.toCollection(() -> new TreeSet<>(String.CASE_INSENSITIVE_ORDER)));
     private static final Set<String> FORBIDDEN_PARAMS =
         Stream.of(X_AMZ_SIGNATURE, X_AMZ_DATE, X_AMZ_CREDENTIAL, X_AMZ_ALGORITHM, X_AMZ_SIGNED_HEADERS, REGION_SET_NAME,

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChunkInputStream.java

@@ -18,7 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.http.auth.aws.internal.signer.io.SdkLengthAwareInputStream;
+import software.amazon.awssdk.utils.io.SdkLengthAwareInputStream;
 
 /**
  * A wrapped stream to represent a "chunk" of data

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/io/Releasable.java

@@ -25,11 +25,11 @@
 import org.reactivestreams.Subscriber;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.exception.NonRetryableException;
-import software.amazon.awssdk.core.internal.io.SdkLengthAwareInputStream;
 import software.amazon.awssdk.core.internal.util.Mimetype;
 import software.amazon.awssdk.core.internal.util.NoopSubscription;
 import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.async.InputStreamConsumingPublisher;
+import software.amazon.awssdk.utils.io.SdkLengthAwareInputStream;
 
 /**
  * An implementation of {@link AsyncRequestBody} that allows performing a blocking write of an input stream to a downstream

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/io/SdkLengthAwareInputStream.java

@@ -37,7 +37,6 @@
 import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
 import software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute;
-import software.amazon.awssdk.core.internal.io.SdkLengthAwareInputStream;
 import software.amazon.awssdk.core.internal.util.MetricUtils;
 import software.amazon.awssdk.core.metrics.CoreMetric;
 import software.amazon.awssdk.core.signer.Signer;
@@ -49,6 +48,7 @@
 import software.amazon.awssdk.metrics.MetricCollector;
 import software.amazon.awssdk.utils.Pair;
 import software.amazon.awssdk.utils.StringUtils;
+import software.amazon.awssdk.utils.io.SdkLengthAwareInputStream;
 
 @SdkInternalApi
 public abstract class BaseClientHandler {

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBody.java

@@ -26,7 +26,6 @@
 import software.amazon.awssdk.core.internal.http.InterruptMonitor;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
-import software.amazon.awssdk.core.internal.io.SdkLengthAwareInputStream;
 import software.amazon.awssdk.core.internal.util.MetricUtils;
 import software.amazon.awssdk.core.metrics.CoreMetric;
 import software.amazon.awssdk.http.ContentStreamProvider;
@@ -39,6 +38,7 @@
 import software.amazon.awssdk.metrics.MetricCollector;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Pair;
+import software.amazon.awssdk.utils.io.SdkLengthAwareInputStream;
 
 /**
  * Delegate to the HTTP implementation to make an HTTP request and receive the response.

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseClientHandler.java

@@ -40,7 +40,7 @@
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.timers.TimeoutTracker;
-import software.amazon.awssdk.core.internal.io.SdkLengthAwareInputStream;
+import software.amazon.awssdk.utils.io.SdkLengthAwareInputStream;
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.HttpExecuteRequest;
 import software.amazon.awssdk.http.SdkHttpClient;

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeHttpRequestStage.java

@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.internal.io;
+package software.amazon.awssdk.utils.io;
 
 import static software.amazon.awssdk.utils.NumericUtils.saturatedCast;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Validate;
 
@@ -29,7 +29,7 @@
  * the input length. If the wrapped stream has more bytes than the expected length, it will be truncated to length. If the stream
  * has less bytes (i.e. reaches EOF) before the expected length is reached, it will throw {@code IOException}.
  */
-@SdkInternalApi
+@SdkProtectedApi
 public class SdkLengthAwareInputStream extends FilterInputStream {
     private static final Logger LOG = Logger.loggerFor(SdkLengthAwareInputStream.class);
     private final long length;