CLOUDSTACK-1125: [EC2 Query API] Permission denied exception when a parameter value contains space

Likitha Shetty · Prachi Damle · commit b0b2fd48336d · 2013-02-12T13:56:36.000-08:00
Convert space characters in the parameters to %20 while forming a query string after url-encode because java.net.URLEncoder performs application/x-www-form-urlencoded-type encoding and not percent-encoding. According to RFC 3986 as required by Amazon, we need to percent-encode.
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -1899,10 +1899,14 @@ private boolean authenticateRequest( HttpServletRequest request, HttpServletResp
                     String paramName = (String) params.nextElement();
                     // exclude the signature string obviously. ;)
                     if (paramName.equalsIgnoreCase("Signature")) continue;
+                    // URLEncoder performs application/x-www-form-urlencoded-type encoding and not Percent encoding
+                    // according to RFC 3986 as required by Amazon, we need to Percent-encode (URL Encode)
+                    String encodedValue = URLEncoder.encode(request.getParameter(paramName), "UTF-8")
+                            .replace("+", "%20").replace("*", "%2A");
                     if (queryString == null) 
-                        queryString = paramName + "=" + URLEncoder.encode(request.getParameter(paramName), "UTF-8"); 
+                        queryString = paramName + "=" + encodedValue;
                     else 
-                        queryString = queryString + "&" + paramName + "=" + URLEncoder.encode(request.getParameter(paramName), "UTF-8"); 
+                        queryString = queryString + "&" + paramName + "=" + encodedValue;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1899,10 +1899,14 @@ private boolean authenticateRequest( HttpServletRequest request, HttpServletResp`
`1899`	`1899`	`String paramName = (String) params.nextElement();`
`1900`	`1900`	`// exclude the signature string obviously. ;)`
`1901`	`1901`	`if (paramName.equalsIgnoreCase("Signature")) continue;`
	`1902`	`+ // URLEncoder performs application/x-www-form-urlencoded-type encoding and not Percent encoding`
	`1903`	`+ // according to RFC 3986 as required by Amazon, we need to Percent-encode (URL Encode)`
	`1904`	`+ String encodedValue = URLEncoder.encode(request.getParameter(paramName), "UTF-8")`
	`1905`	`+ .replace("+", "%20").replace("*", "%2A");`
`1902`	`1906`	`if (queryString == null)`
`1903`		`- queryString = paramName + "=" + URLEncoder.encode(request.getParameter(paramName), "UTF-8");`
	`1907`	`+ queryString = paramName + "=" + encodedValue;`
`1904`	`1908`	`else`
`1905`		`- queryString = queryString + "&" + paramName + "=" + URLEncoder.encode(request.getParameter(paramName), "UTF-8");`
	`1909`	`+ queryString = queryString + "&" + paramName + "=" + encodedValue;`
`1906`	`1910`	`}`
`1907`	`1911`	`}`
`1908`	`1912`	`}`