escher 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5ca3954d669d4c1305dd98027a8b5d4fe37c49
-  data.tar.gz: 4a16a2338e1a81efade3a7bd9e01ac5bc888c453
+  metadata.gz: 4b2aaa51a97cbcacb8f91e5ee93053a4bbe4e5a1
+  data.tar.gz: d7b41ccf26d7f5a94562b092f88072bdb5691f75
 SHA512:
-  metadata.gz: 7f121d4fc3afed7141855fc060e8a6f04af57f783d823b15a43f61bbad4dbcefc671514938b103d01e2fbbd605853aeb0cdb47a7d78762c2c86b5edf2820f133
-  data.tar.gz: 102ca5ed92167b8cfa9ddb9fca6d1cd54e5a6d32006a46e2965185cf575e91ff449012fa7e86be7578600687734adcfc9e6bc210d5ce81b25a409133d0b72c07
+  metadata.gz: 2e2d44cc276b8bf74e66148e298f02286241233ed020139c426cb5fc6fd6e0b1b4e3c7f089996903a223df929528c67cba68cb48152a9575ee5eeeca460997e8
+  data.tar.gz: a565aa6cc4ce556d81cf566c0d14fac90087789495e3ffb383582f84a3afacecf8976938ab8c5c5273f27bb4820b605d72a657329453a97daf14300c9e01b6de

data/README.md

@@ -6,3 +6,5 @@ Escher helps you creating secure HTTP requests (for APIs) by signing HTTP(s) req
 The algorithm is based on [Amazon's _AWS Signature Version 4_](http://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html), but we have generalized and extended it.
 
 More details will be available at our [documentation site](http://escherauth.io/).
+
+Check out a [working example] (https://github.com/emartech/escher-ruby-example).

data/lib/escher/auth.rb

@@ -106,7 +106,13 @@ module Escher
 
     def generate_signed_url(url_to_sign, client, expires = 86400)
       uri = Addressable::URI.parse(url_to_sign)
-      host = uri.host
+
+      if (uri.port.present?) && (uri.port != uri.default_port)
+        host = "#{uri.host}:#{uri.port}"
+      else
+        host = uri.host
+      end
+
       path = uri.path
       query_parts = (uri.query || '')
       .split('&', -1)
@@ -128,7 +134,7 @@ module Escher
       signature = generate_signature(client[:api_secret], body, headers, 'GET', headers_to_sign, path, query_parts)
       query_parts_with_signature = (query_parts.map { |k, v| [uri_encode(k), uri_encode(v)] } << query_pair('Signature', signature))
 
-      uri.scheme + '://' + host + path + '?' + query_parts_with_signature.map { |k, v| k + '=' + v }.join('&') + (fragment === nil ? '' : '#' + fragment)
+      "#{uri.scheme}://#{host}#{path}?#{query_parts_with_signature.map { |k, v| k + '=' + v }.join('&')}#{(fragment === nil ? '' : '#' + fragment)}"
     end
 
 

data/lib/escher/request/action_dispatch_request.rb

@@ -17,13 +17,18 @@ module Escher
 
 
       def body
-        request.body or ''
+        case request.body
+        when StringIO
+          request.body.string
+        else
+          request.body.to_s
+        end
       end
 
 
 
       def path
-        request.env['REQUEST_PATH']
+        request.env['REQUEST_PATH'] || request.path
       end
 
 

data/lib/escher/version.rb

@@ -1,3 +1,3 @@
 module Escher
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/escher/auth_spec.rb

@@ -189,6 +189,22 @@ module Escher
     end
 
 
+    [
+        ['http://iam.amazonaws.com:5000/', 'iam.amazonaws.com:5000'],
+        ['https://iam.amazonaws.com:5000/', 'iam.amazonaws.com:5000'],
+        ['http://iam.amazonaws.com:80/', 'iam.amazonaws.com'],
+        ['https://iam.amazonaws.com:443/', 'iam.amazonaws.com'],
+        ['http://iam.amazonaws.com:443/', 'iam.amazonaws.com:443'],
+        ['https://iam.amazonaws.com:80/', 'iam.amazonaws.com:80']
+    ].each do |input, expected_output|
+      it 'should automagically handle ports' do
+        escher = described_class.new('us-east-1/host/aws4_request', ESCHER_MIXED_OPTIONS.merge(current_time: Time.parse('2011/05/11 12:00:00 UTC')))
+        client = {:api_key_id => 'th3K3y', :api_secret => 'very_secure'}
+        expect(escher.generate_signed_url("#{input}something?foo=bar&baz=barbaz#hash", client, 123456)).to include expected_output
+      end
+    end
+
+
     it 'should validate presigned url' do
       escher = described_class.new('us-east-1/host/aws4_request', ESCHER_MIXED_OPTIONS.merge(current_time: Time.parse('2011/05/12 21:59:00 UTC')))
       presigned_uri =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escher
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Andras Barthazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler