rack-oauth2 0.1.0 → 0.2.0

data/rack-oauth2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-oauth2}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-09-18}
+  s.date = %q{2010-10-03}
   s.description = %q{Rack Middleware for OAuth2. Currently support only Server/Provider, not Client/Consumer.}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -23,9 +23,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "example/server/authorize.rb",
-     "example/server/oauth2_controller.rb",
-     "example/server/token.rb",
      "lib/rack/oauth2.rb",
      "lib/rack/oauth2/server.rb",
      "lib/rack/oauth2/server/abstract.rb",
@@ -37,6 +34,9 @@ Gem::Specification.new do |s|
      "lib/rack/oauth2/server/authorize/code_and_token.rb",
      "lib/rack/oauth2/server/authorize/token.rb",
      "lib/rack/oauth2/server/error.rb",
+     "lib/rack/oauth2/server/error/authorize.rb",
+     "lib/rack/oauth2/server/error/resource.rb",
+     "lib/rack/oauth2/server/error/token.rb",
      "lib/rack/oauth2/server/resource.rb",
      "lib/rack/oauth2/server/token.rb",
      "lib/rack/oauth2/server/token/assertion.rb",
@@ -49,6 +49,9 @@ Gem::Specification.new do |s|
      "spec/rack/oauth2/server/authorize/code_spec.rb",
      "spec/rack/oauth2/server/authorize/token_spec.rb",
      "spec/rack/oauth2/server/authorize_spec.rb",
+     "spec/rack/oauth2/server/error/authorize_spec.rb",
+     "spec/rack/oauth2/server/error/resource_spec.rb",
+     "spec/rack/oauth2/server/error/token_spec.rb",
      "spec/rack/oauth2/server/error_spec.rb",
      "spec/rack/oauth2/server/resource_spec.rb",
      "spec/rack/oauth2/server/token/assertion_spec.rb",
@@ -56,6 +59,7 @@ Gem::Specification.new do |s|
      "spec/rack/oauth2/server/token/password_spec.rb",
      "spec/rack/oauth2/server/token/refresh_token_spec.rb",
      "spec/rack/oauth2/server/token_spec.rb",
+     "spec/rack/oauth2/server/util_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -63,12 +67,15 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Rack Middleware for OAuth2 Client & Server}
+  s.summary = %q{Rack Middleware for OAuth2 Server}
   s.test_files = [
     "spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
      "spec/rack/oauth2/server/authorize/code_spec.rb",
      "spec/rack/oauth2/server/authorize/token_spec.rb",
      "spec/rack/oauth2/server/authorize_spec.rb",
+     "spec/rack/oauth2/server/error/authorize_spec.rb",
+     "spec/rack/oauth2/server/error/resource_spec.rb",
+     "spec/rack/oauth2/server/error/token_spec.rb",
      "spec/rack/oauth2/server/error_spec.rb",
      "spec/rack/oauth2/server/resource_spec.rb",
      "spec/rack/oauth2/server/token/assertion_spec.rb",
@@ -76,6 +83,7 @@ Gem::Specification.new do |s|
      "spec/rack/oauth2/server/token/password_spec.rb",
      "spec/rack/oauth2/server/token/refresh_token_spec.rb",
      "spec/rack/oauth2/server/token_spec.rb",
+     "spec/rack/oauth2/server/util_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/rack/oauth2/server/authorize/code_and_token_spec.rb

@@ -5,7 +5,6 @@ describe Rack::OAuth2::Server::Authorize::CodeAndToken do
   context "when authorized" do
 
     before do
-      # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::CodeAndToken directly
       @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         response.approve!
         response.code = "authorization_code"
@@ -20,14 +19,21 @@ describe Rack::OAuth2::Server::Authorize::CodeAndToken do
       response.location.should == "http://client.example.com/callback?code=authorization_code#access_token=access_token"
     end
 
+    context "when redirect_uri already includes query and fragment" do
+      it "should keep original query and fragment" do
+        response = @request.get("/?response_type=code_and_token&client_id=client&redirect_uri=http://client.example.com/callback?k=v%23fragment")
+        response.status.should == 302
+        response.location.should == "http://client.example.com/callback?k=v&code=authorization_code#fragment&access_token=access_token"
+      end
+    end
+
   end
 
   context "when denied" do
 
     before do
-      # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
       @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
-        raise Rack::OAuth2::Server::Unauthorized.new(:access_denied, 'User rejected the requested access.', :redirect_uri => request.redirect_uri)
+        request.access_denied! 'User rejected the requested access.'
       end
       @request = Rack::MockRequest.new @app
     end
@@ -35,7 +41,11 @@ describe Rack::OAuth2::Server::Authorize::CodeAndToken do
     it "should redirect to redirect_uri with error message" do
       response = @request.get("/?response_type=code_and_token&client_id=client&redirect_uri=http://client.example.com/callback")
       response.status.should == 302
-      response.location.should == "http://client.example.com/callback?error_description=User+rejected+the+requested+access.&error=access_denied"
+      error_message = {
+        :error => :access_denied,
+        :error_description => "User rejected the requested access."
+      }
+      response.location.should == "http://client.example.com/callback?#{error_message.to_query}"
     end
 
   end

data/spec/rack/oauth2/server/authorize/code_spec.rb

@@ -5,7 +5,6 @@ describe Rack::OAuth2::Server::Authorize::Code do
   context "when authorized" do
 
     before do
-      # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
       @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         response.approve!
         response.code = "authorization_code"
@@ -19,14 +18,21 @@ describe Rack::OAuth2::Server::Authorize::Code do
       response.location.should == "http://client.example.com/callback?code=authorization_code"
     end
 
+    context "when redirect_uri already includes query" do
+      it "should keep original query" do
+        response = @request.get("/?response_type=code&client_id=client&redirect_uri=http://client.example.com/callback?k=v")
+        response.status.should == 302
+        response.location.should == "http://client.example.com/callback?k=v&code=authorization_code"
+      end
+    end
+
   end
 
   context "when denied" do
 
     before do
-      # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
       @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
-        raise Rack::OAuth2::Server::Unauthorized.new(:access_denied, 'User rejected the requested access.', :redirect_uri => request.redirect_uri)
+        request.access_denied! 'User rejected the requested access.'
       end
       @request = Rack::MockRequest.new @app
     end
@@ -34,7 +40,11 @@ describe Rack::OAuth2::Server::Authorize::Code do
     it "should redirect to redirect_uri with error message" do
       response = @request.get("/?response_type=code&client_id=client&redirect_uri=http://client.example.com/callback")
       response.status.should == 302
-      response.location.should == "http://client.example.com/callback?error_description=User+rejected+the+requested+access.&error=access_denied"
+      error_message = {
+        :error => :access_denied,
+        :error_description => "User rejected the requested access."
+      }
+      response.location.should == "http://client.example.com/callback?#{error_message.to_query}"
     end
 
   end

data/spec/rack/oauth2/server/authorize/token_spec.rb

@@ -5,7 +5,6 @@ describe Rack::OAuth2::Server::Authorize::Token do
   context "when authorized" do
 
     before do
-      # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Token directly
       @app = Rack::OAuth2::Server::Authorize.new do |request, response|
         response.approve!
         response.access_token = "access_token"
@@ -19,14 +18,21 @@ describe Rack::OAuth2::Server::Authorize::Token do
       response.location.should == "http://client.example.com/callback#access_token=access_token"
     end
 
+    context "when redirect_uri already includes fragment" do
+      it "should keep original fragment" do
+        response = @request.get("/?response_type=token&client_id=client&redirect_uri=http://client.example.com/callback%23fragment")
+        response.status.should == 302
+        response.location.should == "http://client.example.com/callback#fragment&access_token=access_token"
+      end
+    end
+
   end
 
   context "when denied" do
 
     before do
-      # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
       @app = Rack::OAuth2::Server::Authorize.new do |request, response|
-        raise Rack::OAuth2::Server::Unauthorized.new(:access_denied, 'User rejected the requested access.', :redirect_uri => request.redirect_uri)
+        request.access_denied! 'User rejected the requested access.'
       end
       @request = Rack::MockRequest.new @app
     end
@@ -34,7 +40,11 @@ describe Rack::OAuth2::Server::Authorize::Token do
     it "should redirect to redirect_uri with error message" do
       response = @request.get("/?response_type=token&client_id=client&redirect_uri=http://client.example.com/callback")
       response.status.should == 302
-      response.location.should == "http://client.example.com/callback?error_description=User+rejected+the+requested+access.&error=access_denied"
+      error_message = {
+        :error => :access_denied,
+        :error_description => "User rejected the requested access."
+      }
+      response.location.should == "http://client.example.com/callback?#{error_message.to_query}"
     end
 
   end

data/spec/rack/oauth2/server/error/authorize_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Server::Authorize::Request do
+  
+  before do
+    @request = Rack::OAuth2::Server::Authorize::Request.new(
+      Rack::MockRequest.env_for("/authorize", :params => {
+        :client_id => "client_id",
+        :response_type => "code"
+      })
+    )
+  end
+
+  describe "#error!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.error! :something
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :something
+        e.description.should be_nil
+      }
+    end
+  end
+
+  describe "#invalid_request!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_request!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_request
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:invalid_request]
+      }
+    end
+  end
+
+  describe "#invalid_client!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_client!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_client
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:invalid_client]
+      }
+    end
+  end
+
+  describe "#unauthorized_client!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.unauthorized_client!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :unauthorized_client
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:unauthorized_client]
+      }
+    end
+  end
+
+  describe "#redirect_uri_mismatch!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.redirect_uri_mismatch!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :redirect_uri_mismatch
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:redirect_uri_mismatch]
+      }
+    end
+  end
+
+  describe "#access_denied!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.access_denied!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :access_denied
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:access_denied]
+      }
+    end
+  end
+
+  describe "#unsupported_response_type!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.unsupported_response_type!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        p e
+        e.error.should == :unsupported_response_type
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:unsupported_response_type]
+      }
+    end
+  end
+
+  describe "#invalid_scope!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_scope!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_scope
+        e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:invalid_scope]
+      }
+    end
+  end
+
+end

data/spec/rack/oauth2/server/error/resource_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Server::Resource::Request do
+  
+  before do
+    @request = Rack::OAuth2::Server::Resource::Request.new(
+      Rack::MockRequest.env_for("/resource", :params => {
+        :oauth_token => "oauth_token"
+      }), "server.example.com"
+    )
+  end
+
+  describe "#error!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.error! :something
+      end.should raise_error(Rack::OAuth2::Server::Error) { |e|
+        e.status.should == 400
+        e.error.should == :something
+        e.description.should be_nil
+      }
+    end
+  end
+
+  describe "#invalid_request!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_request!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_request
+        e.description.should == Rack::OAuth2::Server::Error::Resource::DEFAULT_DESCRIPTION[:invalid_request]
+      }
+    end
+  end
+
+  describe "#invalid_token!" do
+    it "should raise Unauthorized error" do
+      lambda do
+        @request.invalid_token!
+      end.should raise_error(Rack::OAuth2::Server::Unauthorized) { |e|
+        e.error.should == :invalid_token
+        e.description.should == Rack::OAuth2::Server::Error::Resource::DEFAULT_DESCRIPTION[:invalid_token]
+      }
+    end
+  end
+
+  describe "#expired_token!" do
+    it "should raise Unauthorized error" do
+      lambda do
+        @request.expired_token!
+      end.should raise_error(Rack::OAuth2::Server::Unauthorized) { |e|
+        e.error.should == :expired_token
+        e.description.should == Rack::OAuth2::Server::Error::Resource::DEFAULT_DESCRIPTION[:expired_token]
+      }
+    end
+  end
+
+  describe "#insufficient_scope!" do
+    it "should raise Forbidden error" do
+      lambda do
+        @request.insufficient_scope!
+      end.should raise_error(Rack::OAuth2::Server::Forbidden) { |e|
+        e.error.should == :insufficient_scope
+        e.description.should == Rack::OAuth2::Server::Error::Resource::DEFAULT_DESCRIPTION[:insufficient_scope]
+      }
+    end
+  end
+
+end

data/spec/rack/oauth2/server/error/token_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Server::Token::Request do
+  
+  before do
+    @request = Rack::OAuth2::Server::Token::Request.new(
+      Rack::MockRequest.env_for("/token", :params => {
+        :client_id => "client_id",
+        :grant_type => "authorization_code",
+        :code => "code"
+      })
+    )
+  end
+
+  describe "#error!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.error! :something
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :something
+        e.description.should be_nil
+      }
+    end
+  end
+
+  describe "#invalid_request!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_request!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_request
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:invalid_request]
+      }
+    end
+  end
+
+  describe "#invalid_client!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_client!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_client
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:invalid_client]
+      }
+    end
+
+    context "when Authorization header is used" do
+      it "should raise Unauthorized error" do
+        lambda do
+          @request.via_authorization_header = true
+          @request.invalid_client!
+        end.should raise_error(Rack::OAuth2::Server::Unauthorized) { |e|
+          e.error.should == :invalid_client
+          e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:invalid_client]
+        }
+      end
+    end
+  end
+
+  describe "#unauthorized_client!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.unauthorized_client!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :unauthorized_client
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:unauthorized_client]
+      }
+    end
+  end
+
+  describe "#invalid_grant!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_grant!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_grant
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:invalid_grant]
+      }
+    end
+  end
+
+  describe "#unsupported_grant_type!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.unsupported_grant_type!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :unsupported_grant_type
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:unsupported_grant_type]
+      }
+    end
+  end
+
+  describe "#unsupported_response_type!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.unsupported_response_type!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :unsupported_response_type
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:unsupported_response_type]
+      }
+    end
+  end
+
+  describe "#invalid_scope!" do
+    it "should raise BadRequest error" do
+      lambda do
+        @request.invalid_scope!
+      end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
+        e.error.should == :invalid_scope
+        e.description.should == Rack::OAuth2::Server::Error::Token::DEFAULT_DESCRIPTION[:invalid_scope]
+      }
+    end
+  end
+
+end