rack-contrib-sign 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f04f49f937e4e268755732df3b62e1fa36a0646
-  data.tar.gz: f93c5ed88d1dd26885d43014f1b25818a77e0617
+  metadata.gz: 261e57c9a4606ca41067fcbcfb63f7ef13a9dfe4
+  data.tar.gz: a663c537dea95021bbd72372c0c83632cad18f7f
 SHA512:
-  metadata.gz: 5152592a6cbcae4aa188c8fdd81cbe647a74dcd0bdc84898a8693e1624579edbb8fe2d7003d93c9c3442eccafd2f23f25a0fe7d64f25676e6a895a7625464cec
-  data.tar.gz: b6b67f84cadd35298807bb9136ef20c43cdb802b8061e72eb05102dfc39d93674e25fb34c405ab4ecf738d309d0fc8c6fc126fe014ab8d9a42fde35f39f7bc91
+  metadata.gz: 4eef00cbcb5a82e8934b19a85e8e1b26ed26bffb2adcc31ef6c619a493eb914f54f6052c0fad26928fcc4b46227a1da46af8570ffc521f1e12e5d377268a4ed9
+  data.tar.gz: 89e60881055a32c1679274c7533c0f23d1a43c71d30d3c30a8798e090195821bd33db8894f496b8d3983cb1c31e400769190fe226dad8d3b1e4371699636d8b5

data/lib/rack/contrib/sign.rb

@@ -1,4 +1,5 @@
 
+require 'rack'
 require 'digest/md5'
 require 'logger'
 

data/lib/rack/contrib/sign/middleware.rb

@@ -8,7 +8,7 @@ module Rack
           @app = app
           @logger = opts[:logger]
           @realm = opts[:realm]
-          @credentials = opts[:credentials]
+          @credentials = opts[:credentials] || {}
           @header_prefix = (opts[:prefix] || "").gsub(/-/, '_').downcase
         end
 
@@ -46,8 +46,18 @@ module Rack
 
         # Extract environmental data into a Receipt
         def build_receipt env, credentials
+          req = Rack::Request.new(env)
+          pp req
           receipt = Rack::Contrib::Sign::Receipt.new
-          receipt.host = env['rack.url_scheme'] + '://' + env['HTTP_HOST']
+
+          port = ''
+          unless (
+            (req.scheme == 'http' && req.port.to_s == '80') ||
+            (req.scheme == 'https' && req.port.to_s == '443'))
+            port = ':' + req.port.to_s
+          end
+
+          receipt.host = req.scheme + '://' + req.host + port
           receipt.uri = env['REQUEST_URI']
           receipt.request_method = env['REQUEST_METHOD']
           receipt.body = extract_body env

data/lib/rack/contrib/sign/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Contrib
     module Sign
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/rack-contrib-sign.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rack"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/rack/contrib/sign/middleware_spec.rb

@@ -53,6 +53,26 @@ describe Rack::Contrib::Sign::Middleware do
       })
 
     end
+
+    it "Uses rack:request to handle x-forwarded* headers" do
+      env = {
+        'REQUEST_METHOD' => 'POST',
+        'HTTP_HOST' => '127.0.0.1',
+        'SERVER_PORT' => '9292',
+        'rack.url_scheme' => 'http',
+        'REQUEST_URI' => '/foo/bar',
+        'HTTP_HI_FOOO' => 'YIPEE',
+        'rack.input' => StringIO.new('foo=bar'),
+        'HTTP_X_FORWARDED_PROTO' => 'https',
+        'HTTP_X_FORWARDED_PORT' => '443'
+      }
+      cred_provider['123'] = 'abc'
+      creds = { key: '123', signature: 'foo' }
+
+      receipt = ware.build_receipt(env, creds)
+
+      receipt.host.should eq('https://127.0.0.1')
+    end
   end
 
   describe "#extract_body" do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-contrib-sign
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Graham Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement