rack-authenticate 0.4.0 → 0.5.0

data/lib/rack/authenticate/cors_middleware.rb

@@ -14,7 +14,10 @@ module Rack
           @app.call(env)
         end
 
-        headers['Access-Control-Allow-Origin'] = env['HTTP_ORIGIN'] if env.has_key?('HTTP_ORIGIN')
+        if env.has_key?('HTTP_ORIGIN')
+          headers['Access-Control-Allow-Origin'] = env['HTTP_ORIGIN']
+          headers['Access-Control-Allow-Credentials'] = 'true'
+        end
 
         [status, headers, body]
       end

data/lib/rack/authenticate/middleware.rb

@@ -10,11 +10,9 @@ module Rack
           self.timestamp_minute_tolerance ||= 30
           self.hmac_secret_key { |access_id| }
           self.basic_auth_validation { |u, p| false }
-          self.support_cross_origin_resource_sharing = false
         end
 
         attr_accessor :timestamp_minute_tolerance
-        attr_writer   :support_cross_origin_resource_sharing
         attr_reader   :basic_auth_validation_block
 
         def hmac_secret_key(&block)
@@ -28,10 +26,6 @@ module Rack
         def basic_auth_validation(&block)
           @basic_auth_validation_block = block
         end
-
-        def support_cross_origin_resource_sharing?
-          @support_cross_origin_resource_sharing
-        end
       end
 
       class Auth < ::Rack::Auth::AbstractRequest
@@ -127,30 +121,13 @@ module Rack
       def initialize(app)
         @configuration = Configuration.new
         yield @configuration
-
-        @middleware_stack = lambda do |env|
-          auth = Auth.new(env, @configuration)
-          _call(env, auth)
-        end
-
-        if @configuration.support_cross_origin_resource_sharing?
-          require 'rack/authenticate/cors_middleware'
-          @middleware_stack = ::Rack::Authenticate::CORSMiddleware.new(@middleware_stack)
-        end
-
         super(app, &@configuration.basic_auth_validation_block)
       end
 
-      alias basic_auth_call call
       def call(env)
-        @middleware_stack.call(env)
-      end
-
-    private
-
-      def _call(env, auth)
+        auth = Auth.new(env, @configuration)
         return unauthorized unless auth.provided?
-        return basic_auth_call(env) if auth.basic?
+        return super(env) if auth.basic?
         return bad_request  unless auth.hmac?
         return bad_request  unless auth.has_all_required_parts?
         return unauthorized unless auth.valid?

data/lib/rack/authenticate/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Authenticate
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/spec/rack/authenticate/cors_middleware_spec.rb

@@ -59,10 +59,21 @@ module Rack
         last_response.headers.should include('Access-Control-Allow-Origin' => origin)
       end
 
+      it 'appends the Access-Control-Allow-Credentials header to every response to a request with an Origin header' do
+        header 'Origin', origin
+        get '/'
+        last_response.headers.should include('Access-Control-Allow-Credentials' => 'true')
+      end
+
       it 'does not append a Access-Control-Allow-Origin header to a request without an Origin header' do
         get '/'
         last_response.headers.keys.should_not include('Access-Control-Allow-Origin')
       end
+
+      it 'does not append a Access-Control-Allow-Credentials header to a request without an Origin header' do
+        get '/'
+        last_response.headers.keys.should_not include('Access-Control-Allow-Credentials')
+      end
     end
   end
 end

data/spec/rack/authenticate/middleware_spec.rb

@@ -359,43 +359,6 @@ module Rack
           post '/foo', "some content"
           last_response.status.should eq(200)
         end
-
-        context 'when cross origin resource sharing is supported' do
-          before { configure { |c| c.support_cross_origin_resource_sharing = true } }
-          let(:headers) { 'X-Authorization-Date, Content-MD5, Authorization, Content-Type' }
-          let(:origin)  { 'http://foo.example.com' }
-
-          let(:expected_response_headers) do {
-            'Content-Type'                     => 'text/plain',
-            'Access-Control-Allow-Origin'      => origin,
-            'Access-Control-Allow-Methods'     => 'PUT',
-            'Access-Control-Allow-Credentials' => 'true',
-            'Access-Control-Max-Age'           => CORSMiddleware::ACCESS_CONTROL_MAX_AGE.to_s
-          } end
-
-          it 'responds to a CORS OPTIONS request with all of the correct headers' do
-            header 'Origin', origin
-            header 'Access-Control-Request-Method', 'PUT'
-            options '/'
-
-            last_response.status.should eq(200)
-            last_response.headers.should include(expected_response_headers)
-            last_response.headers.should_not have_key('Access-Control-Allow-Headers')
-          end
-        end
-
-        context 'when cross origin resource sharing is not supported' do
-          before { configure { |c| c.support_cross_origin_resource_sharing = false } }
-
-          it 'does not respond to a CORS OPTIONS request' do
-            header 'Origin', 'http://foo.example.com'
-            header 'Access-Control-Request-Method', 'PUT'
-            options '/'
-
-            last_response.status.should eq(401)
-            last_response.headers.keys.select { |k| k.include?('Access-Control') }.should eq([])
-          end
-        end
       end
     end
   end

metadata

@@ -1,79 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-authenticate
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - Myron Marston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  requirement: &2152601180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2152601180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2152600560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15424215
+        segments: 
+        - 2
+        - 8
+        - 0
+        - rc
+        - 1
         version: 2.8.0.rc1
   type: :development
-  prerelease: false
-  version_requirements: *2152600560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &2152599640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :development
-  prerelease: false
-  version_requirements: *2152599640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &2152588140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
   type: :development
-  prerelease: false
-  version_requirements: *2152588140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2152586640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
         version: 0.9.2.2
   type: :development
-  prerelease: false
-  version_requirements: *2152586640
-description: A rack middleware that authenticates requests either using basic auth
-  or via signed HMAC.
-email:
+  version_requirements: *id005
+description: A rack middleware that authenticates requests either using basic auth or via signed HMAC.
+email: 
 - myron.marston@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc
@@ -99,38 +135,40 @@ files:
 - spec/rack/authenticate/cors_middleware_spec.rb
 - spec/rack/authenticate/middleware_spec.rb
 - spec/rack/authenticate_spec.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -359603919774236080
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -359603919774236080
+      version: "0"
 requirements: []
+
 rubyforge_project: rack-authenticate
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: A rack middleware that authenticates requests either using basic auth or
-  via signed HMAC.
-test_files:
+summary: A rack middleware that authenticates requests either using basic auth or via signed HMAC.
+test_files: 
 - spec/rack/authenticate/client_spec.rb
 - spec/rack/authenticate/cors_middleware_spec.rb
 - spec/rack/authenticate/middleware_spec.rb