auth 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,8 @@
-*1.0.0*
+*0.0.3*
+
+* Added json gem dependency
+* Added a more flexible sentry system
+
+*0.0.1*
 
 * First public release

data/lib/auth.rb

@@ -49,6 +49,18 @@ module Auth
     self.redis
   end
 
+  #
+  # Sentry
+  #
+
+  def sentry=(sentry)
+    @sentry = sentry
+  end
+
+  def sentry
+    @sentry
+  end
+
   #
   # Accounts
   #

data/lib/auth/sentry.rb

@@ -9,16 +9,29 @@ module Auth
       @request = request
     end
 
-    def authenticate!
-      if Auth.authenticate_account(@request.params['username'], @request.params['password'])
-        @user_id = @request.params['username']
+    def authenticate!(domain=:default)
+      case domain.to_sym
+      when :client
+        @client = Auth.authenticate_client(@request.params['client_id'], @request.params['client_secret'])
+        unless @client
+          raise AuthException, 'Invalid client'
+        end
       else
-        raise AuthException, 'Invalid username or password'
+        if Auth.authenticate_account(@request.params['username'], @request.params['password'])
+          @user_id = @request.params['username']
+        else
+          raise AuthException, 'Invalid username or password'
+        end
       end
     end
 
-    def user
-      @user_id ? User.new(@user_id) : nil
+    def user(domain=:default)
+      case domain.to_sym
+      when :client
+        @client ? @client : nil
+      else
+        @user_id ? User.new(@user_id) : nil
+      end
     end
   end
 end

data/lib/auth/server.rb

@@ -55,22 +55,16 @@ module Auth
       end
 
       def sentry
-        @sentry ||= request.env['warden'] || request.env['rack.auth'] || Sentry.new(request)
-      end
-
-      def require_client_identification!
-        @client = Auth.authenticate_client(params[:client_id])
-        halt(403, 'Invalid client identifier') unless @client
-      end
-
-      def require_client_authentication!
-        @client = Auth.authenticate_client(params[:client_id], params[:client_secret])
-        halt(403, 'Invalid client identifier or client secret') unless @client
+        if Auth.sentry
+          @sentry ||= Auth.sentry.new(request)
+        else
+          @sentry ||= request.env['warden'] || request.env['rack.auth'] || Sentry.new(request)
+        end
       end
 
       def validate_redirect_uri!
-        params[:redirect_uri] ||= @client.redirect_uri
-        if URI(params[:redirect_uri]).host.downcase != URI(@client.redirect_uri).host.downcase
+        params[:redirect_uri] ||= sentry.user(:client).redirect_uri
+        if URI(params[:redirect_uri]).host.downcase != URI(sentry.user(:client).redirect_uri).host.downcase
           halt(400, 'Invalid redirect URI')
         end
       rescue URI::InvalidURIError
@@ -103,7 +97,7 @@ module Auth
 
     ['', '/authorize'].each do |action|
       get action do
-        require_client_identification!
+        sentry.authenticate!(:client)
         validate_redirect_uri!
         sentry.authenticate!
         unless ['code', 'token', 'code_and_token', nil].include?(params[:response_type])
@@ -111,19 +105,20 @@ module Auth
             'The authorization server does not support obtaining an ' +
             'authorization code using this method.'
         end
+        @client = sentry.user(:client)
         erb(:authorize)
       end
     end
 
     ['', '/authorize'].each do |action|
       post action do
-        require_client_identification!
+        sentry.authenticate!(:client)
         validate_redirect_uri!
         sentry.authenticate!
         case params[:response_type]
         when 'code', nil
           authorization_code = Auth.issue_code(sentry.user.id,
-                                               params[:client_id],
+                                               sentry.user(:client).id,
                                                params[:redirect_uri],
                                                params[:scope])
           redirect_uri = merge_uri_with_query_parameters(
@@ -146,7 +141,7 @@ module Auth
         when 'code_and_token'
           ttl = ENV['AUTH_TOKEN_TTL'].to_i
           authorization_code = Auth.issue_code(sentry.user.id,
-                                               params[:client_id],
+                                               sentry.user(:client).id,
                                                params[:redirect_uri],
                                                params[:scope])
           access_token = Auth.issue_token(sentry.user.id, params[:scope], ttl)
@@ -170,12 +165,12 @@ module Auth
 
     ['/token', '/access_token'].each do |action|
       post action do
-        require_client_authentication!
+        sentry.authenticate!(:client)
         validate_redirect_uri!
         case params[:grant_type]
         when 'authorization_code', nil
           account_id, scopes = Auth.validate_code(
-            params[:code], params[:client_id], params[:redirect_uri])
+            params[:code], sentry.user(:client).id, params[:redirect_uri])
           if account_id
             ttl = ENV['AUTH_TOKEN_TTL'].to_i
             access_token = Auth.issue_token(account_id, scopes, ttl)
@@ -203,7 +198,7 @@ module Auth
         when 'refresh_token'
           raise AuthException, 'Unsupported grant type'
         when 'client_credentials'
-          access_token = Auth.issue_token("client:#{@client.id}")
+          access_token = Auth.issue_token("client:#{sentry.user(:client).id}")
           @token = {
             :access_token => access_token,
             :token_type => 'client'
@@ -222,7 +217,7 @@ module Auth
     end
 
     get '/validate' do
-      require_client_authentication!
+      sentry.authenticate!(:client)
       headers['Content-Type'] = 'text/plain;charset=utf-8'
       if account_id = Auth.validate_token(params[:access_token], params[:scope])
         [200, account_id]

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  Version = VERSION = '0.0.2'
+  Version = VERSION = '0.0.3'
 end

data/test/auth_test.rb

@@ -13,6 +13,12 @@ class AuthTest < Test::Unit::TestCase
     assert_equal 'namespace', Auth.redis.namespace
   end
 
+  def test_can_set_a_custom_sentry
+    assert_nil Auth.sentry
+    Auth.sentry = Auth::Sentry
+    assert_equal Auth::Sentry, Auth.sentry
+  end
+
   def test_can_register_an_account
     assert Auth.register_account('test', 'test')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Niklas Holmgren
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 +02:00
+date: 2011-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack-contrib
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack-contrib
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,9 +48,24 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -61,11 +76,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: redis-namespace
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -76,11 +91,11 @@ dependencies:
         - 0
         version: 0.8.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -91,7 +106,7 @@ dependencies:
         - 6
         version: 0.5.6
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: A high performance OAuth2 authorization server using Sinatra and Redis, inspired by Resque. Can be run both as a standalone server or as a rack middleware.
 email: niklas@sutajio.se
 executables: []