rack-oauth2 0.6.0 → 0.6.1

data/README.rdoc

@@ -1,10 +1,16 @@
 = rack-oauth2
 
-Rack Middleware for OAuth2 server.
-OAuth2 client library is also included.
+OAuth 2.0 Server & Client Library.
+Both Bearer and MAC token type are supported.
 
-This gem is based on OAuth 2.0 draft v.13
-http://tools.ietf.org/html/draft-ietf-oauth-v2-13
+The OAuth 2.0 Authorization Protocol (draft 15)
+http://tools.ietf.org/html/draft-ietf-oauth-v2-15
+
+The OAuth 2.0 Protocol: Bearer Tokens (draft 03)
+http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-03
+
+HTTP Authentication: MAC Authentication (draft 02)
+http://tools.ietf.org/html/draft-hammer-oauth-v2-mac-token-02
 
 == Installation
 
@@ -18,14 +24,26 @@ http://tools.ietf.org/html/draft-ietf-oauth-v2-13
 
 == Sample Server Application (Rails3)
 
+=== Bearer
+
 Running on Heroku
 http://rack-oauth2-sample.heroku.com
 
 Source on GitHub
 http://github.com/nov/rack-oauth2-sample
 
+=== MAC
+
+Running on Heroku
+http://rack-oauth2-sample-mac.heroku.com
+
+Source on GitHub
+http://github.com/nov/rack-oauth2-sample-mac
+
 == Sample Client
 
+=== Bearer
+
 Authorization Request (request_type: 'code' and 'token')
 https://gist.github.com/862393
 
@@ -35,6 +53,10 @@ https://gist.github.com/883541
 Resource Request (request both for resource owner resource and for client resource)
 https://gist.github.com/883575
 
+=== MAC
+
+Coming soon..
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

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

@@ -88,12 +88,12 @@ module Rack
         end
 
         def authorization_header
-          header = "MAC"
-          header << " token=\"#{access_token}\""
-          header << " timestamp=\"#{timestamp}\""
-          header << " nonce=\"#{nonce}\""
-          header << " bodyhash=\"#{body_hash}\"" if self.body_hash.present?
-          header << " signature=\"#{signature}\""
+          header = "MAC "
+          header << "token=\"#{access_token}\","
+          header << "timestamp=\"#{timestamp}\","
+          header << "nonce=\"#{nonce}\","
+          header << "bodyhash=\"#{body_hash}\"," if self.body_hash.present?
+          header << "signature=\"#{signature}\""
         end
 
         def generate_nonce

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

@@ -14,7 +14,7 @@ module Rack
             attr_reader :timestamp, :nonce, :body_hash, :signature
 
             def setup!
-              auth_params = @auth_header.params.split(' ').inject({}) do |auth_params, pair|
+              auth_params = @auth_header.params.split(',').inject({}) do |auth_params, pair|
                 key, value = pair.scan(/^(.*)=\"(.*)\"/).flatten
                 auth_params.merge!(key => value)
               end.with_indifferent_access

data/rack-oauth2.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.version = File.read("VERSION")
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.description = %q{Rack Middleware for OAuth2 server. OAuth2 client library is also included.}
-  s.summary = %q{Rack Middleware for OAuth2 server}
+  s.description = %q{OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are supported.}
+  s.summary = %q{OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported}
   s.email = "nov@matake.jp"
   s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
   s.rdoc_options = ["--charset=UTF-8"]

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

@@ -37,7 +37,7 @@ describe Rack::OAuth2::AccessToken::MAC do
         Time.fix(Time.at(1302361200)) do
           RestClient.should_receive(:get).with(
             resource_endpoint,
-            :AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"yYDSkZMrEbOOqj0anHNLA9ougNA+lxU0zmPiMSPtmJ8=\""
+            :AUTHORIZATION => "MAC token=\"access_token\",timestamp=\"1302361200\",nonce=\"51e74de734c05613f37520872e68db5f\",signature=\"yYDSkZMrEbOOqj0anHNLA9ougNA+lxU0zmPiMSPtmJ8=\""
           )
           token.get resource_endpoint
         end
@@ -50,7 +50,7 @@ describe Rack::OAuth2::AccessToken::MAC do
           RestClient.should_receive(:post).with(
             resource_endpoint,
             {:key => :value},
-            {:AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\" signature=\"xRvIiA+rmjhPjULVpyCCgiHEsOkLEHZik4ZaB+cyqgk=\""}
+            {:AUTHORIZATION => "MAC token=\"access_token\",timestamp=\"1302361200\",nonce=\"51e74de734c05613f37520872e68db5f\",bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\",signature=\"xRvIiA+rmjhPjULVpyCCgiHEsOkLEHZik4ZaB+cyqgk=\""}
           )
           token.post resource_endpoint, :key => :value
         end
@@ -63,7 +63,7 @@ describe Rack::OAuth2::AccessToken::MAC do
           RestClient.should_receive(:put).with(
             resource_endpoint,
             {:key => :value},
-            {:AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\" signature=\"2lWgkUCtD9lNBlDi5fe9eVDwEwbxfLGAqjgykaSV1ww=\""}
+            {:AUTHORIZATION => "MAC token=\"access_token\",timestamp=\"1302361200\",nonce=\"51e74de734c05613f37520872e68db5f\",bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\",signature=\"2lWgkUCtD9lNBlDi5fe9eVDwEwbxfLGAqjgykaSV1ww=\""}
           )
           token.put resource_endpoint, :key => :value
         end
@@ -75,7 +75,7 @@ describe Rack::OAuth2::AccessToken::MAC do
         Time.fix(Time.at(1302361200)) do
           RestClient.should_receive(:delete).with(
             resource_endpoint,
-            :AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"PX2GhHuo5yYNEs51e4Zlllw8itQ4Te0v+6ZuRCK7k+s=\""
+            :AUTHORIZATION => "MAC token=\"access_token\",timestamp=\"1302361200\",nonce=\"51e74de734c05613f37520872e68db5f\",signature=\"PX2GhHuo5yYNEs51e4Zlllw8itQ4Te0v+6ZuRCK7k+s=\""
           )
           token.delete resource_endpoint
         end
@@ -90,7 +90,7 @@ describe Rack::OAuth2::AccessToken::MAC do
       let(:env) do
         Rack::MockRequest.env_for(
           '/protected_resources',
-          'HTTP_AUTHORIZATION' => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"#{signature}\""
+          'HTTP_AUTHORIZATION' => "MAC token=\"access_token\",timestamp=\"1302361200\",nonce=\"51e74de734c05613f37520872e68db5f\",signature=\"#{signature}\""
         )
       end
 
@@ -122,7 +122,7 @@ describe Rack::OAuth2::AccessToken::MAC do
           :params => {
             :key1 => 'value1'
           },
-          'HTTP_AUTHORIZATION' => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"#{body_hash}\" signature=\"#{signature}\""
+          'HTTP_AUTHORIZATION' => "MAC token=\"access_token\",timestamp=\"1302361200\",nonce=\"51e74de734c05613f37520872e68db5f\",bodyhash=\"#{body_hash}\",signature=\"#{signature}\""
         )
       end
       let(:signature) { 'invalid' }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +09:00
+date: 2011-04-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,7 +167,7 @@ dependencies:
         version: "1.3"
   type: :development
   version_requirements: *id010
-description: Rack Middleware for OAuth2 server. OAuth2 client library is also included.
+description: OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are supported.
 email: nov@matake.jp
 executables: []
 
@@ -288,7 +288,7 @@ rubyforge_project:
 rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: Rack Middleware for OAuth2 server
+summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported
 test_files: 
 - spec/fake_response/facebook_token_response.txt
 - spec/fake_response/invalid_request.json