Merge branch 'su_aws/replace_httpc_with_gun_fmt' of github.com:rabbitmq/rabbitmq-server into su_aws/replace_httpc_with_gun_fmt

Author: SimonUnge

deps/rabbitmq_aws/include/rabbitmq_aws.hrl

@@ -113,7 +113,7 @@
 -type value() :: string().
 -type header() :: {Field :: field(), Value :: value()}.
 -type headers() :: [header()].
--type body() :: string() | binary().
+-type body() :: iodata().
 
 -type ssl_options() :: [ssl:tls_client_option()].
 

deps/rabbitmq_aws/src/rabbitmq_aws.erl

@@ -37,9 +37,7 @@
 -include("rabbitmq_aws.hrl").
 -include_lib("kernel/include/logger.hrl").
 
-%% Types for new concurrent API
 -type connection_handle() :: {gun:conn_ref(), string()}.
-
 %%====================================================================
 %% ETS-based state management
 %%====================================================================
@@ -258,8 +256,9 @@ direct_request({GunPid, Service}, Method, Path, Body, Headers, Options) ->
         {ok, AccessKey, SecretKey, SecurityToken, Region} ->
             Host = endpoint_host(Region, Service),
             URI = create_uri(Host, Path),
+            BodyHash = proplists:get_value(payload_hash, Options),
             SignedHeaders = sign_headers(
-                AccessKey, SecretKey, SecurityToken, Region, Service, Method, URI, Headers, Body
+                AccessKey, SecretKey, SecurityToken, Region, Service, Method, URI, Headers, Body, BodyHash
             ),
             direct_gun_request(GunPid, Method, Path, SignedHeaders, Body, Options);
         {error, Reason} ->
@@ -275,20 +274,24 @@ direct_request({GunPid, Service}, Method, Path, Body, Headers, Options) ->
     Method :: method(),
     URI :: string(),
     Headers :: headers(),
-    Body :: body()
+    Body :: body(),
+    BodyHash :: iodata()
 ) -> headers().
-sign_headers(AccessKey, SecretKey, SecurityToken, Region, Service, Method, URI, Headers, Body) ->
-    rabbitmq_aws_sign:headers(#request{
-        access_key = AccessKey,
-        secret_access_key = SecretKey,
-        security_token = SecurityToken,
-        region = Region,
-        service = Service,
-        method = Method,
-        uri = URI,
-        headers = Headers,
-        body = Body
-    }).
+sign_headers(AccessKey, SecretKey, SecurityToken, Region, Service, Method, URI, Headers, Body, BodyHash) ->
+    rabbitmq_aws_sign:headers(
+        #request{
+            access_key = AccessKey,
+            secret_access_key = SecretKey,
+            security_token = SecurityToken,
+            region = Region,
+            service = Service,
+            method = Method,
+            uri = URI,
+            headers = Headers,
+            body = Body
+        },
+        BodyHash
+    ).
 
 -spec request(
     Service :: string(),
@@ -673,8 +676,9 @@ status_text(416) -> "Range Not Satisfiable";
 status_text(500) -> "Internal Server Error";
 status_text(Code) -> integer_to_list(Code).
 
+
 -spec direct_gun_request(
-    GunPid :: gun:conn_ref(),
+    GunPid :: pid(),
     Method :: method(),
     Path :: path(),
     Headers :: headers(),

deps/rabbitmq_aws/src/rabbitmq_aws_sign.erl

@@ -8,7 +8,7 @@
 -module(rabbitmq_aws_sign).
 
 %% API
--export([headers/1, request_hash/5]).
+-export([headers/1, headers/2, request_hash/5]).
 
 %% Export all for unit tests
 -ifdef(TEST).
@@ -24,18 +24,15 @@
 %% @doc Create the signed request headers
 %% end
 headers(Request) ->
+    headers(Request, undefined).
+
+headers(Request, undefined) ->
+    headers(Request, sha256(Request#request.body));
+headers(Request, PayloadHash) ->
     RequestTimestamp = local_time(),
-    PayloadHash = sha256(Request#request.body),
     URI = rabbitmq_aws_urilib:parse(Request#request.uri),
     {_, Host, _} = URI#uri.authority,
-
-    BodyLength =
-        case Request#request.body of
-            Body when is_binary(Body) ->
-                size(Body);
-            Body when is_list(Body) ->
-                length(Body)
-        end,
+    BodyLength = iolist_size(Request#request.body),
 
     Headers = append_headers(
         RequestTimestamp,
@@ -50,7 +47,7 @@ headers(Request) ->
         URI#uri.path,
         URI#uri.query,
         Headers,
-        Request#request.body
+        PayloadHash
     ),
     AuthValue = authorization(
         Request#request.access_key,
@@ -211,11 +208,11 @@ query_string(QueryArgs) -> rabbitmq_aws_urilib:build_query_string(lists:keysort(
     Path :: path(),
     QArgs :: query_args(),
     Headers :: headers(),
-    Payload :: string()
+    PayloadHash :: string()
 ) -> string().
 %% @doc Create the request hash value
 %% @end
-request_hash(Method, Path, QArgs, Headers, Payload) ->
+request_hash(Method, Path, QArgs, Headers, PayloadHash) ->
     RawPath =
         case string:slice(Path, 0, 1) of
             "/" -> Path;
@@ -229,7 +226,7 @@ request_hash(Method, Path, QArgs, Headers, Payload) ->
             query_string(QArgs),
             canonical_headers(Headers),
             signed_headers(Headers),
-            sha256(Payload)
+            PayloadHash
         ],
         "\n"
     ),
@@ -245,7 +242,7 @@ request_hash(Method, Path, QArgs, Headers, Payload) ->
 scope(AMZDate, Region, Service) ->
     string:join([AMZDate, Region, Service, "aws4_request"], "/").
 
--spec sha256(Value :: string()) -> string().
+-spec sha256(Value :: iodata()) -> string().
 %% @doc Return the SHA-256 hash for the specified value.
 %% @end
 sha256(Value) ->