Made request with query parameters to be correctly signed.

goura · Oct 23, 2011 · 4de934c · 4de934c
1 parent f8ed576
commit 4de934c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/erlaws_s3.erl b/src/erlaws_s3.erl
@@ -411,7 +411,9 @@ genericRequest( Method, Bucket, Path, QueryParams, Metadata,
 
     Signature = sign(SecretAccessKey,
 		     stringToSign(MethodString, ContentMD5, ContentType, Date,
-				   Bucket, Path, Headers )),
+				  Bucket,
+				  Path ++ erlaws_util:queryParams(QueryParams),
+				  Headers )),
 
     FinalHeaders = [ {"Authorization","AWS " ++ AccessKey ++ ":" ++ Signature },
 		     {"Host", buildHost(Bucket) },

diff --git a/src/erlaws_util.erl b/src/erlaws_util.erl
@@ -15,8 +15,17 @@ mkEnumeration(Values, Separator) ->
 
 queryParams( [] ) -> "";
 queryParams( ParamList ) -> 
-    "?" ++ mkEnumeration([[url_encode(Param), "=", url_encode(Value)]
-			  || {Param, Value} <- ParamList], "&" ).
+    L0 = lists:foldl(fun({P, V}, Acc) ->
+			     case V of
+				 "" ->
+				     [url_encode(P)|Acc];
+				 _ ->
+				     [url_encode(P) ++ "=" ++ url_encode(V)|Acc]
+			     end
+		     end,
+		     [],
+		     lists:keysort(1, ParamList)),
+    "?" ++ mkEnumeration(lists:reverse(L0), "&"). 
 
 %% The following code is taken from the ibrowse Http client
 %% library.