escher 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c7d0c11568986e6d42c2d60a853da006ce45484
-  data.tar.gz: 867865591e198f3466bfe1872ab87e17cdb47429
+  metadata.gz: ba40c7a7b12bb5aec126c7151b4a8cf81eaa3f51
+  data.tar.gz: 3fa09ffdec0d12b2bb7deaaf9aa30cecc23dfe63
 SHA512:
-  metadata.gz: 674aadece40c90e9affccc8a23a1ed12ee2c86512bd627134cb266ce8cbf4ace7693201114e5ff451b49fc6ca80eca074b4ca4969481d210284ed3b9eba04cf7
-  data.tar.gz: 92c61fbad4a295131b23fae67e1429e10e53b807c4e474fcd1357d72fe896782650bcea4865c0f1d690c83d724a175779c836955e1412c44f0e60d1e9e36096c
+  metadata.gz: b5060b34740b6300e7f9abef1ee5ef32c4470336dbf956d74047a9e9048e5990b9755738f650221db734493d3a0ad27101905c669111edbda9e9b52f9dbce555
+  data.tar.gz: 4fdcfda5426410a5ba9b465099630d626a72ce105bffdd968765ac284bdbfe79057a594f942822cbb2b9c351a72c94a702f86ad4134de81a965cf56f839ec07d

data/lib/escher/base.rb

@@ -21,13 +21,26 @@ class Escher
     @clock_skew       = options[:clock_skew]       || 900
   end
 
-  def sign!(req, client)
-    request = EscherRequest.new(req)
-    auth_header = generate_auth_header(client, request.method, uri_parsed.host, uri_parsed.path, request.body || '', request.to_enum.to_a, [])
+  def sign!(request, client, headers_to_sign = [])
+    uri = Addressable::URI.parse(request[:uri])
+    body = request[:body] || ''
+    headers = request[:headers].map {|k, v| {k.downcase => v} }.reduce({}, &:merge)
+
+    host = headers['host'] || uri.host || request[:host]
+
+    unless headers.has_key? 'host'
+      headers['host'] = host
+    end
+    unless headers.has_key? @date_header_name
+      headers[@date_header_name] = format_date_for_header
+    end
+
+    headers_to_sign |= [@date_header_name.downcase, 'host']
+
 
-    request.set_header('Host', request.host) # TODO: we shouldn't remove port from Host here
-    request.set_header(@date_header_name, format_date_for_header)
-    request.set_header(@auth_header_name, auth_header)
+    auth_header = generate_auth_header(client, request[:method], uri.path + (uri.query ? '?' + uri.query : ''), body, headers.map { |k, v| [k, v] }, headers_to_sign)
+
+    request[:headers] = headers.merge(@auth_header_name => auth_header)
     request
   end
 
@@ -101,10 +114,8 @@ class Escher
     )
   end
 
-  def generate_auth_header(client, method, host, request_uri, body, headers, headers_to_sign)
+  def generate_auth_header(client, method, request_uri, body, headers, headers_to_sign)
     path, query_parts = parse_uri(request_uri)
-    headers = add_defaults_to(headers, host)
-    headers_to_sign |= [@date_header_name.downcase, 'host']
     signature = generate_signature(client[:api_secret], body, headers, method, headers_to_sign, path, query_parts)
     "#{get_algorithm_id} Credential=#{client[:api_key_id]}/#{short_date(@current_time)}/#{@credential_scope}, SignedHeaders=#{prepare_headers_to_sign headers_to_sign}, Signature=#{signature}"
   end
@@ -182,21 +193,10 @@ class Escher
     Digest::HMAC.hexdigest(string_to_sign, signing_key, create_algo)
   end
 
-  def add_defaults_to(headers, host)
-    [['host', host], [@date_header_name, format_date_for_header]]
-      .each { |k, v| headers = add_if_missing headers, k, v }
-    headers
-  end
-
   def format_date_for_header
     @date_header_name.downcase == 'date' ? @current_time.utc.rfc2822.sub('-0000', 'GMT') : long_date(@current_time)
   end
 
-  def add_if_missing(headers, header_to_find, value)
-    headers += [header_to_find, value] unless headers.find { |header| header[0].downcase == header_to_find.downcase }
-    headers
-  end
-
   def canonicalize(method, path, query_parts, body, headers, headers_to_sign)    [
       method,
       canonicalize_path(path),

data/lib/escher/request.rb

@@ -3,7 +3,9 @@ class EscherRequest
 
   def initialize(request)
     @request = request
-    @request_uri = Addressable::URI.parse(uri)
+    request_uri = Addressable::URI.parse(uri)
+    raise "Invalid request URI: #{request_uri}" unless request_uri
+    @request_uri = request_uri
     prepare_request_headers
   end
 
@@ -66,6 +68,10 @@ class EscherRequest
     end
   end
 
+  def host
+    @request_uri.host
+  end
+
   def path
     @request_uri.path
   end

data/lib/escher/version.rb

@@ -1,3 +1,3 @@
 class Escher
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/escher_spec.rb

@@ -45,10 +45,12 @@ ESCHER_AWS4_OPTIONS = {
   algo_prefix: 'AWS4', vendor_key: 'AWS4', hash_algo: 'SHA256', auth_header_name: 'Authorization', date_header_name: 'Date'
 }
 
-ESCHER_EMARSYS_OPTIONS = {
+ESCHER_MIXED_OPTIONS = {
   algo_prefix: 'EMS', vendor_key: 'EMS', hash_algo: 'SHA256', auth_header_name: 'Authorization', date_header_name: 'Date', clock_skew: 10
 }
 
+ESCHER_EMARSYS_OPTIONS = ESCHER_MIXED_OPTIONS.merge(auth_header_name: 'X-Ems-Auth', date_header_name: 'X-Ems-Date')
+
 GOOD_AUTH_HEADER = 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470'
 
 # noinspection RubyStringKeysInHashInspection
@@ -98,17 +100,44 @@ describe 'Escher' do
   test_suites.each do |suite, tests|
     tests.each do |test|
       it "should calculate auth header for #{test} in #{suite}" do
-        method, request_uri, body, headers, date, host = read_request(suite, test)
+        method, request_uri, body, headers, date = read_request(suite, test)
         escher = Escher.new('us-east-1/host/aws4_request', ESCHER_AWS4_OPTIONS.merge(current_time: Time.parse(date)))
         headers_to_sign = headers.map {|k| k[0].downcase }
-        auth_header = escher.generate_auth_header(client, method, host, request_uri, body, headers, headers_to_sign)
+        auth_header = escher.generate_auth_header(client, method, request_uri, body, headers, headers_to_sign)
         expect(auth_header).to eq(fixture(suite, test, 'authz'))
       end
     end
   end
 
+  it 'should sign request' do
+    escher = Escher.new('us-east-1/iam/aws4_request', ESCHER_EMARSYS_OPTIONS.merge(current_time: Time.parse('20110909T233600Z')))
+    client = { :api_key_id => 'AKIDEXAMPLE', :api_secret => 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY' }
+
+    input_headers = {
+      'content-type' => 'application/x-www-form-urlencoded; charset=utf-8'
+    }
+
+    expected_headers = {
+      'content-type' => 'application/x-www-form-urlencoded; charset=utf-8',
+      'host'         => 'iam.amazonaws.com',
+      'x-ems-date'   => '20110909T233600Z',
+      'x-ems-auth'   => 'EMS-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/iam/aws4_request, SignedHeaders=content-type;host;x-ems-date, Signature=f36c21c6e16a71a6e8dc56673ad6354aeef49c577a22fd58a190b5fcf8891dbd',
+    }
+    headers_to_sign = %w(content-type)
+
+    request = {
+      method: 'POST',
+      uri: 'http://iam.amazonaws.com/',
+      body: 'Action=ListUsers&Version=2010-05-08',
+      headers: input_headers,
+    }
+
+    downcase = escher.sign!(request, client, headers_to_sign)[:headers].map { |k, v| { k.downcase => v } }.reduce({}, &:merge)
+    expect(downcase).to eq expected_headers
+  end
+
   it 'should generate presigned url' do
-    escher = Escher.new('us-east-1/host/aws4_request', ESCHER_EMARSYS_OPTIONS.merge(current_time: Time.parse('2011/05/11 12:00:00 UTC')))
+    escher = Escher.new('us-east-1/host/aws4_request', ESCHER_MIXED_OPTIONS.merge(current_time: Time.parse('2011/05/11 12:00:00 UTC')))
     expected_url =
         'http://example.com/something?foo=bar&' + 'baz=barbaz&' +
             'X-EMS-Algorithm=EMS-HMAC-SHA256&' +
@@ -123,7 +152,7 @@ describe 'Escher' do
   end
 
   it 'should validate presigned url' do
-    escher = Escher.new('us-east-1/host/aws4_request', ESCHER_EMARSYS_OPTIONS.merge(current_time: Time.parse('2011/05/12 21:59:00 UTC')))
+    escher = Escher.new('us-east-1/host/aws4_request', ESCHER_MIXED_OPTIONS.merge(current_time: Time.parse('2011/05/12 21:59:00 UTC')))
     presigned_uri =
         '/something?foo=bar&' + 'baz=barbaz&' +
           'X-EMS-Algorithm=EMS-HMAC-SHA256&' +
@@ -143,7 +172,7 @@ describe 'Escher' do
   end
 
   it 'should validate expiration' do
-    escher = Escher.new('us-east-1/host/aws4_request', ESCHER_EMARSYS_OPTIONS.merge(current_time: Time.parse('2011/05/12 22:20:00 UTC')))
+    escher = Escher.new('us-east-1/host/aws4_request', ESCHER_MIXED_OPTIONS.merge(current_time: Time.parse('2011/05/12 22:20:00 UTC')))
     presigned_uri =
         '/something?foo=bar&' + 'baz=barbaz&' +
           'X-EMS-Algorithm=EMS-HMAC-SHA256&' +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andras Barthazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler