oauth2-rack 0.0.5 → 1.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oauth2-rack (0.0.5)
+    oauth2-rack (1.0.0)
       multi_json
       rack
 

data/lib/oauth2/rack/authentication/access_token/bearer_header.rb

@@ -0,0 +1,61 @@
+require 'oauth2/rack'
+
+# 7. Accessing Protected Resources
+class OAuth2::Rack::Authentication::AccessToken::BearerHeader
+  HEADER_KEYS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION']
+
+  def initialize(app, opts = {}, &authenticator)
+    @app = app
+    @realm = opts[:realm]
+    @required = opts.fetch(:required, true)
+    @authenticator = authenticator || opts[:authenticator]
+  end
+
+  def call(env)
+    key = HEADER_KEYS.find { |k| env.has_key?(k) }
+    auth_string = env[key]
+
+    if auth_string.nil?
+      return @required ? error_response(:code => 400, :error => :invalid_request) : @app.call(env)
+    end
+
+    schema, credentials = auth_string.split(' ', 2)
+    if schema.downcase != 'bearer'
+      return error_response(:code => 400,
+                            :error => :invalid_request)
+    end
+
+    access_token = @authenticator.call(:access_token => credentials)
+
+    if access_token.nil? || (access_token.is_a?(Hash) && access_token[:error])
+      error_response(access_token)
+    else
+      env['oauth2.access_token'] = access_token
+      @app.call(env)
+    end
+  end
+
+  private
+  def authenticate(opts)
+    @authenticator && @authenticator.call(opts)
+  end
+
+  def error_response(opts)
+    opts ||= {}
+    code = opts.delete(:code) || 401
+    
+    opts[:realm] = @realm if @realm
+    opts[:error] ||= 'invalid_token'
+
+    [ code,
+      { 'Content-Type' => 'text/plain',
+        'Content-Length' => '0',
+        'WWW-Authenticate' => www_authenticate_header(opts) },
+      []
+    ]
+  end
+
+  def www_authenticate_header(opts)
+    'Bearer ' + opts.collect { |k, v| %Q(#{k}=#{v.inspect})  }.join(',')
+  end
+end

data/lib/oauth2/rack/authentication/access_token.rb

@@ -0,0 +1,4 @@
+# Auth access token
+module OAuth2::Rack::Authentication::AccessToken
+  autoload :BearerHeader, 'oauth2/rack/authentication/access_token/bearer_header'
+end

data/lib/oauth2/rack/authentication.rb

@@ -2,5 +2,6 @@
 module OAuth2::Rack::Authentication
   autoload :Client, 'oauth2/rack/authentication/client'
   autoload :ResourceOwner, 'oauth2/rack/authentication/resource_owner'
+  autoload :AccessToken, 'oauth2/rack/authentication/access_token'
 end
 

data/lib/oauth2/rack/authorization/client_credentials/access_token_issuer.rb

@@ -27,6 +27,7 @@ class OAuth2::Rack::Authorization::ClientCredentials::AccessTokenIssuer
     if access_token['error']
       error_response(access_token)
     else
+      access_token['token_type'] ||= 'bearer'
       successful_response(access_token)
     end
   end

data/lib/oauth2/rack/authorization/password/access_token_issuer.rb

@@ -29,6 +29,7 @@ class OAuth2::Rack::Authorization::Password::AccessTokenIssuer
     if access_token['error']
       error_response(access_token)
     else
+      access_token['token_type'] ||= 'bearer'
       successful_response(access_token)
     end
   end

data/lib/oauth2/rack/authorization/refresh_token/access_token_issuer.rb

@@ -24,6 +24,7 @@ class OAuth2::Rack::Authorization::RefreshToken::AccessTokenIssuer
     if access_token['error']
       error_response(access_token)
     else
+      access_token['token_type'] ||= 'bearer'
       successful_response(access_token)
     end
   end

data/lib/oauth2/rack/version.rb

@@ -1,5 +1,5 @@
 module OAuth2
   module Rack
-    VERSION = "0.0.5"
+    VERSION = "1.0.0"
   end
 end

data/spec/oauth2/rack/authentication/access_token/bearer_header_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe OAuth2::Rack::Authentication::AccessToken::BearerHeader do
+  let(:access_token) { 'xxx' }
+  let(:authenticator) { double('authenticator').as_null_object }
+  let(:opts) { Hash.new }
+  let(:chained_app_response) { [200, { 'Content-Type' => 'text/plain' }, []] }
+
+  def do_request
+    post '/', opts
+  end
+
+  context 'when auth header is not specified' do
+    context 'and bearer auth is required' do
+      it 'responds with 401 unauthorized' do
+        do_request
+        response.status.should eq(400)
+      end
+    end
+    context 'and http basic auth is optional' do
+      app { OAuth2::Rack::Authentication::AccessToken::BearerHeader.new(chained_app, :required => false) }
+      it 'continues the app' do
+        chained_app.should_receive(:call).and_return(chained_app_response)
+        do_request
+        response.status.should eq(200)
+      end
+    end
+  end
+
+  context 'when schema is not bearer' do
+    before { opts['HTTP_AUTHORIZATION'] = 'Digest ' + access_token }
+
+    it 'responds with 400 bad request' do
+      do_request
+      response.status.should eq(400)
+    end
+  end
+
+  context 'when schema is bearer' do
+    app {
+      OAuth2::Rack::Authentication::AccessToken::BearerHeader.new(chained_app) do |opts|
+        authenticator.call(opts)
+      end
+    }
+    before { opts['HTTP_AUTHORIZATION'] = "Bearer #{access_token}" }
+
+    context 'and credentials are valid' do
+      it 'sets oauth2.client in env' do
+        authenticator.should_receive(:call).with(:access_token => access_token).and_return(access_token)
+        chained_app.should_receive(:call).with(hash_including('oauth2.access_token' => access_token)).and_return(chained_app_response)
+
+        do_request
+      end
+    end
+
+    context 'but credentials are invalid' do
+      it 'responds with 401 unauthorized' do
+        authenticator.should_receive(:call).with(:access_token => access_token).and_return(nil)
+        chained_app.should_not_receive(:call)
+
+        do_request
+
+        response.status.should eq(401)
+      end
+    end
+  end
+end

data/spec/oauth2/rack/authorization/client_credentials/access_token_issuer_spec.rb

@@ -82,6 +82,12 @@ describe OAuth2::Rack::Authorization::ClientCredentials::AccessTokenIssuer do
             response.status.should eq(200)
             response_object['access_token'].should eq('X')
           end
+
+          it 'responds with default token type' do
+            do_request
+
+            response_object['token_type'].should eq('bearer')
+          end
         end
       end
     end

data/spec/oauth2/rack/authorization/password/access_token_issuer_spec.rb

@@ -86,6 +86,12 @@ describe OAuth2::Rack::Authorization::Password::AccessTokenIssuer do
             response.status.should eq(200)
             response_object['access_token'].should eq('X')
           end
+
+          it 'responds with default token type' do
+            do_request
+
+            response_object['token_type'].should eq('bearer')
+          end
         end
       end
     end

data/spec/oauth2/rack/authorization/refresh_token/access_token_issuer_spec.rb

@@ -86,6 +86,12 @@ describe OAuth2::Rack::Authorization::RefreshToken::AccessTokenIssuer do
           response.status.should eq(200)
           response_object['access_token'].should eq('X')
         end
+
+        it 'responds with default token type' do
+          do_request
+
+          response_object['token_type'].should eq('bearer')
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2-rack
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2156611780 !ruby/object:Gem::Requirement
+  requirement: &2152919700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156611780
+  version_requirements: *2152919700
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156611280 !ruby/object:Gem::Requirement
+  requirement: &2152919200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156611280
+  version_requirements: *2152919200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156592240 !ruby/object:Gem::Requirement
+  requirement: &2152918600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156592240
+  version_requirements: *2152918600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156591700 !ruby/object:Gem::Requirement
+  requirement: &2152918080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156591700
+  version_requirements: *2152918080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156591120 !ruby/object:Gem::Requirement
+  requirement: &2152917440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156591120
+  version_requirements: *2152917440
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &2156590520 !ruby/object:Gem::Requirement
+  requirement: &2152917000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156590520
+  version_requirements: *2152917000
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156589980 !ruby/object:Gem::Requirement
+  requirement: &2152916540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156589980
+  version_requirements: *2152916540
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &2156589380 !ruby/object:Gem::Requirement
+  requirement: &2152916060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156589380
+  version_requirements: *2152916060
 description: Rack middlewares for OAuth2 authorization server and resource server
 email:
 - me@iany.me
@@ -120,6 +120,8 @@ files:
 - lib/oauth2-rack.rb
 - lib/oauth2/rack.rb
 - lib/oauth2/rack/authentication.rb
+- lib/oauth2/rack/authentication/access_token.rb
+- lib/oauth2/rack/authentication/access_token/bearer_header.rb
 - lib/oauth2/rack/authentication/client.rb
 - lib/oauth2/rack/authentication/client/http_basic.rb
 - lib/oauth2/rack/authentication/client/request_params.rb
@@ -134,6 +136,7 @@ files:
 - lib/oauth2/rack/authorization/refresh_token/access_token_issuer.rb
 - lib/oauth2/rack/version.rb
 - oauth2-rack.gemspec
+- spec/oauth2/rack/authentication/access_token/bearer_header_spec.rb
 - spec/oauth2/rack/authentication/client/http_basic_spec.rb
 - spec/oauth2/rack/authentication/client/request_params_spec.rb
 - spec/oauth2/rack/authentication/resource_owner/request_params_spec.rb
@@ -157,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2663607301986849054
+      hash: -744756891435917136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2663607301986849054
+      hash: -744756891435917136
 requirements: []
 rubyforge_project: oauth2-rack
 rubygems_version: 1.8.10
@@ -174,6 +177,7 @@ signing_key:
 specification_version: 3
 summary: Rack middlewares for OAuth2 authorization server and resource server
 test_files:
+- spec/oauth2/rack/authentication/access_token/bearer_header_spec.rb
 - spec/oauth2/rack/authentication/client/http_basic_spec.rb
 - spec/oauth2/rack/authentication/client/request_params_spec.rb
 - spec/oauth2/rack/authentication/resource_owner/request_params_spec.rb