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

Use old style date header for signature v2

Browse source
This commit is contained in:
Jon K Hellan 2014-12-01 09:39:54 +01:00 committed by Frederick Cheung
parent dd00c3bc81
commit fc29620996
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -488,10 +488,11 @@ module Fog
params[:headers] = (params[:headers] || {}).dup
params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
params[:headers]['x-amz-date'] = date.to_iso8601_basic
if @signature_version == 2
params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature_v2(params)}"
expires = date.to_date_header
params[:headers]['Date'] = expires
params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature_v2(params, expires)}"
end
params = request_params(params)
@ -502,6 +503,7 @@ module Fog
if @signature_version == 4
params[:headers]['x-amz-date'] = date.to_iso8601_basic
if params[:body].respond_to?(:read)
# See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html
params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
@ -623,7 +625,7 @@ DATA
end
end
def signature_v2(params)
def signature_v2(params, expires)
headers = params[:headers] || {}
string_to_sign =
@ -631,7 +633,7 @@ DATA
#{params[:method].to_s.upcase}
#{headers['Content-MD5']}
#{headers['Content-Type']}
#{expires}
DATA
amz_headers, canonical_amz_headers = {}, ''