kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[storage|aws] more robust query handling for signed url.

Browse source 
closes #345
This commit is contained in:
geemus 2011-06-07 15:25:12 -07:00
parent a417a9e08c
commit 8fb8642d83
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/fog/storage/aws.rb
View file

@ -63,8 +63,11 @@ module Fog
def url(params, expires)
params[:headers]['Date'] = expires.to_i
params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
query = [params[:query]].compact
params[:path] = Fog::AWS.escape(params[:path]).gsub('%2F', '/')
query = []
for key, value in params[:query]
query << "#{key}=#{Fog::AWS.escape(value)}"
end
query << "AWSAccessKeyId=#{@aws_access_key_id}"
query << "Signature=#{CGI.escape(signature(params))}"
query << "Expires=#{params[:headers]['Date']}"
@ -303,12 +306,33 @@ DATA
canonical_resource = @path.dup
unless subdomain.nil? || subdomain == @host
canonical_resource << "#{CGI.escape(subdomain).downcase}/"
canonical_resource << "#{Fog::AWS.escape(subdomain).downcase}/"
end
canonical_resource << params[:path].to_s
canonical_resource << '?'
for key in (params[:query] || {}).keys.sort
if %w{acl location logging notification partNumber policy requestPayment torrent uploadId uploads versionId versioning versions website}.include?(key)
if %w{
acl
location
logging
notification
partNumber
policy
requestPayment
reponse-cache-control
response-content-disposition
response-content-encoding
response-content-language
response-content-type
response-expires
torrent
uploadId
uploads
versionId
versioning
versions
website
}.include?(key)
canonical_resource << "#{key}#{"=#{params[:query][key]}" unless params[:query][key].nil?}&"
end
end