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

[aws][storage] more robust object url generation, also fixes non-standard regions and defaults to https

Browse source
This commit is contained in:
geemus 2010-09-24 11:32:48 -07:00
parent a986736523
commit 99d2920372
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/fog/aws/requests/storage/get_object_url.rb
View file

@ -23,9 +23,9 @@ module Fog
end end
url({ url({
:headers => {}, :headers => {},
:host => "#{bucket_name}.#{@host}", :host => @host,
:method => 'GET', :method => 'GET',
:path => CGI.escape(object_name) :path => [bucket_name, CGI.escape(object_name)].join('/')
}, expires) }, expires)
end end
@ -42,9 +42,9 @@ module Fog
end end
url({ url({
:headers => {}, :headers => {},
:host => "#{bucket_name}.#{@host}", :host => @host,
:method => 'GET', :method => 'GET',
:path => CGI.escape(object_name) :path => [bucket_name, CGI.escape(object_name)].join('/')
}, expires) }, expires)
end end

8
lib/fog/aws/requests/storage/put_object_url.rb
View file

@ -23,9 +23,9 @@ module Fog
end end
url({ url({
:headers => {}, :headers => {},
:host => "#{bucket_name}.#{@host}", :host => @host,
:method => 'PUT', :method => 'PUT',
:path => CGI.escape(object_name) :path => [bucket_name, CGI.escape(object_name)].join('/')
}, expires) }, expires)
end end
@ -42,9 +42,9 @@ module Fog
end end
url({ url({
:headers => {}, :headers => {},
:host => "#{bucket_name}.#{@host}", :host => @host,
:method => 'PUT', :method => 'PUT',
:path => CGI.escape(object_name) :path => [bucket_name, CGI.escape(object_name)].join('/')
}, expires) }, expires)
end end

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

@ -64,7 +64,8 @@ module Fog
query << "AWSAccessKeyId=#{@aws_access_key_id}" query << "AWSAccessKeyId=#{@aws_access_key_id}"
query << "Signature=#{CGI.escape(signature(params))}" query << "Signature=#{CGI.escape(signature(params))}"
query << "Expires=#{params[:headers]['Date']}" query << "Expires=#{params[:headers]['Date']}"
"http://#{params[:host]}/#{params[:path]}?#{query.join('&')}" bucket = params[:host].split('.').first
"https://#{@host}/#{params[:path]}?#{query.join('&')}"
end end
end end