rack-oauth2 0.6.6 → 0.6.7

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/lib/rack/oauth2/access_token/mac/verifier.rb

@@ -6,7 +6,6 @@ module Rack
           include AttrRequired, AttrOptional
           attr_required :algorithm
 
-          # TODO: rescue this in proper location later
           class VerificationFailed < StandardError; end
 
           def initialize(attributes = {})
@@ -14,6 +13,8 @@ module Rack
               self.send :"#{key}=", attributes[key]
             end
             attr_missing!
+          rescue AttrRequired::AttrMissing => e
+            raise VerificationFailed.new("#{self.class.to_s.split('::').last} Invalid: #{e.message}")
           end
 
           def verify!(expected)

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

@@ -34,6 +34,8 @@ module Rack
             :query     => request.GET
           )
           _signature_.verify!(request.signature)
+        rescue Verifier::VerificationFailed => e
+          request.invalid_token! e.message
         end
 
         def get(url, headers = {}, &block)

data/lib/rack/oauth2/server/abstract/error.rb

@@ -11,6 +11,7 @@ module Rack
             @description = description
             @uri         = options[:uri]
             @realm       = options[:realm]
+            super [error, description].compact.join(' :: ')
           end
 
           def protocol_params

data/lib/rack/oauth2/server/resource/bearer.rb

@@ -12,7 +12,7 @@ module Rack
 
           class Request < Resource::Request
             def setup!
-              tokens = [access_token_in_haeder, access_token_in_payload].compact
+              tokens = [access_token_in_header, access_token_in_payload].compact
               @access_token = case Array(tokens).size
               when 1
                 tokens.first
@@ -23,10 +23,10 @@ module Rack
             end
 
             def oauth2?
-              (access_token_in_haeder || access_token_in_payload).present?
+              (access_token_in_header || access_token_in_payload).present?
             end
 
-            def access_token_in_haeder
+            def access_token_in_header
               if @auth_header.provided? && @auth_header.scheme == :bearer
                 @auth_header.params
               else

data/spec/rack/oauth2/access_token/mac_spec.rb

@@ -107,8 +107,8 @@ describe Rack::OAuth2::AccessToken::MAC do
         let(:signature) { 'invalid' }
         it do
           expect { token.verify!(request.setup!) }.should raise_error(
-            Rack::OAuth2::AccessToken::MAC::Verifier::VerificationFailed,
-            'Signature Invalid'
+            Rack::OAuth2::Server::Resource::MAC::Unauthorized,
+            'invalid_token :: Signature Invalid'
           )
         end
       end
@@ -131,8 +131,8 @@ describe Rack::OAuth2::AccessToken::MAC do
         let(:body_hash) { 'invalid' }
         it do
           expect { token.verify!(request.setup!) }.should raise_error(
-            Rack::OAuth2::AccessToken::MAC::Verifier::VerificationFailed,
-            'BodyHash Invalid'
+            Rack::OAuth2::Server::Resource::MAC::Unauthorized,
+            'invalid_token :: BodyHash Invalid'
           )
         end
       end
@@ -152,8 +152,8 @@ describe Rack::OAuth2::AccessToken::MAC do
         context 'otherwise' do
           it do
             expect { token.verify!(request.setup!) }.should raise_error(
-              Rack::OAuth2::AccessToken::MAC::Verifier::VerificationFailed,
-              'Signature Invalid'
+              Rack::OAuth2::Server::Resource::MAC::Unauthorized,
+              'invalid_token :: Signature Invalid'
             )
           end
         end

data/spec/rack/oauth2/server/resource/mac_spec.rb

@@ -5,7 +5,11 @@ describe Rack::OAuth2::Server::Resource::MAC do
     Rack::OAuth2::Server::Resource::MAC.new(simple_app) do |request|
       case request.access_token
       when 'valid_token'
-        # nothing to do
+        Rack::OAuth2::AccessToken::MAC.new(
+          :access_token => 'valid_token',
+          :secret => 'secret',
+          :algorithm => 'hmac-sha-256'
+        ).verify!(request)
       when 'insufficient_scope_token'
         request.insufficient_scope!
       else
@@ -57,8 +61,20 @@ describe Rack::OAuth2::Server::Resource::MAC do
   end
 
   context 'when valid_token is given' do
-    let(:env) { Rack::MockRequest.env_for('/protected_resource', 'HTTP_AUTHORIZATION' => 'MAC token="valid_token"') }
-    it_behaves_like :authenticated_mac_request
+    context 'when other required params are missing' do
+      let(:env) { Rack::MockRequest.env_for('/protected_resource', 'HTTP_AUTHORIZATION' => 'MAC token="valid_token"') }
+      it_behaves_like :unauthorized_mac_request
+    end
+
+    context 'when other required params are invalid' do
+      let(:env) { Rack::MockRequest.env_for('/protected_resource', 'HTTP_AUTHORIZATION' => 'MAC token="valid_token", timestamp="1302361200", nonce="51e74de734c05613f37520872e68db5f", signature="invalid""') }
+      it_behaves_like :unauthorized_mac_request
+    end
+
+    context 'when all required params are valid' do
+      let(:env) { Rack::MockRequest.env_for('/protected_resource', 'HTTP_AUTHORIZATION' => 'MAC token="valid_token", timestamp="1302361200", nonce="51e74de734c05613f37520872e68db5f", signature="0rykQnhMJ3/yoogoDM0R2ReCN7aiFFPQmQTQotBOQaI=""') }
+      it_behaves_like :authenticated_mac_request
+    end
   end
 
   context 'when invalid_token is given' do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
-  version: 0.6.6
+  segments: 
+  - 0
+  - 6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 Z
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
@@ -42,6 +56,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -53,6 +70,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
   type: :runtime
   version_requirements: *id004
@@ -64,6 +85,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -75,6 +99,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id006
@@ -86,6 +115,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id007
@@ -97,6 +130,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id008
@@ -108,6 +145,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id009
@@ -119,6 +159,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
         version: "1.3"
   type: :development
   version_requirements: *id010
@@ -227,12 +271,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []