heedley-merb-auth-with-account 0.0.1 → 0.0.2

data/heedley-merb-auth-with-account.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = %q{merb-auth-with-account}
-  s.version  = "0.0.1"
-  s.date     = %q{2008-12-23}
+  s.version  = "0.0.2"
+  s.date     = %q{2009-01-09}
   s.summary  = %q{strategy to authenticate users on per account basis}
   s.email    = "hedley.robertson@gmail.com"
   s.homepage = %q{http://github.com/heedley/merb-pagination/tree/master}
@@ -11,7 +11,15 @@ Gem::Specification.new do |s|
   s.authors  = ["Hedley Robertson"]
   s.files    = ["heedley-merb-auth-with-account.gemspec",
                 "lib/heedley-merb-auth-with-account.rb",
+                "lib/heedley-merb-auth-with-account/strategies/abstract_password.rb",
                 "lib/heedley-merb-auth-with-account/strategies/password_form_with_account.rb",
+                "lib/heedley-merb-auth-with-account/mixins",
+                "lib/heedley-merb-auth-with-account/mixins/salted_user",
+                "lib/heedley-merb-auth-with-account/mixins/salted_user.rb",
+                "lib/heedley-merb-auth-with-account/mixins/salted_user/ar_salted_user.rb",
+                "lib/heedley-merb-auth-with-account/mixins/salted_user/dm_salted_user_with_account.rb",
+                "lib/heedley-merb-auth-with-account/mixins/salted_user/relaxdb_salted_user.rb",
+                "lib/heedley-merb-auth-with-account/mixins/salted_user/sq_salted_user.rb",
                 "README.txt"
   ]
   s.rdoc_options = ["--main", "README.txt"]

data/lib/heedley-merb-auth-with-account/mixins/salted_user.rb

@@ -0,0 +1,79 @@
+require "digest/sha1"
+require File.expand_path(File.dirname(__FILE__) / "..") / "strategies" / "abstract_password"
+
+class Merb::Authentication
+  module Mixins
+    # This mixin provides basic salted user password encryption.
+    # 
+    # Added properties:
+    #  :crypted_password, String
+    #  :salt,             String
+    #
+    # To use it simply require it and include it into your user class.
+    #
+    # class User
+    #   include Merb::Authentication::Mixins::SaltedUser
+    #
+    # end
+    #
+    module SaltedUserWithAccount
+      
+      def self.included(base)
+        base.class_eval do 
+          attr_accessor :password, :password_confirmation
+          
+          include Merb::Authentication::Mixins::SaltedUserWithAccount::InstanceMethods
+          extend  Merb::Authentication::Mixins::SaltedUserWithAccount::ClassMethods
+          
+          path = File.expand_path(File.dirname(__FILE__)) / "salted_user"
+          if defined?(DataMapper) && DataMapper::Resource > self
+            p "require: " + path / "dm_salted_user_with_account"
+            require path / "dm_salted_user_with_account"
+            extend(Merb::Authentication::Mixins::SaltedUserWithAccount::DMClassMethods)
+          elsif defined?(ActiveRecord) && ancestors.include?(ActiveRecord::Base)
+            require path / "ar_salted_user_with_account"
+            extend(Merb::Authentication::Mixins::SaltedUserWithAccount::ARClassMethods)
+          elsif defined?(Sequel) && ancestors.include?(Sequel::Model)
+            require path / "sq_salted_user_with_account"
+            extend(Merb::Authentication::Mixins::SaltedUserWithAccount::SQClassMethods)
+          elsif defined?(RelaxDB) && ancestors.include?(RelaxDB::Document)
+            require path / "relaxdb_salted_user_with_account"
+            extend(Merb::Authentication::Mixins::SaltedUserWithAccount::RDBClassMethods)
+          end
+          
+        end # base.class_eval
+      end # self.included
+      
+      
+      module ClassMethods
+        # Encrypts some data with the salt.
+        def encrypt(password, salt)
+          Digest::SHA1.hexdigest("--#{salt}--#{password}--")
+        end
+      end    
+      
+      module InstanceMethods
+        def authenticated?(password, account)
+          ( crypted_password == encrypt(password) ) && ( account == self.account.title )
+        end
+        
+        def encrypt(password)
+          self.class.encrypt(password, salt)
+        end
+        
+        def password_required?
+          crypted_password.blank? || !password.blank?
+        end
+        
+        def encrypt_password
+          return if password.blank?
+          self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{Merb::Authentication::Strategies::Basic::Base.login_param}--") if new_record?
+          self.crypted_password = encrypt(password)
+        end
+        
+      end # InstanceMethods
+      
+    end # SaltedUser    
+  end # Mixins
+end # Merb::Authentication
+

data/lib/heedley-merb-auth-with-account/mixins/salted_user/ar_salted_user.rb

@@ -0,0 +1,25 @@
+class Merb::Authentication
+  module Mixins
+    module SaltedUser
+      module ARClassMethods
+        
+        def self.extended(base)
+          base.class_eval do
+            
+            validates_presence_of     :password,                   :if => :password_required?
+            validates_presence_of     :password_confirmation,      :if => :password_required?
+            validates_confirmation_of :password,                   :if => :password_required?
+            
+            before_save :encrypt_password
+          end # base.class_eval
+                  
+        end # self.extended
+        
+        def authenticate(login, password)
+          @u = find(:first, :conditions => ["#{Merb::Authentication::Strategies::Basic::Base.login_param} = ?", login])
+          @u && @u.authenticated?(password) ? @u : nil
+        end
+      end # ARClassMethods
+    end # SaltedUser
+  end # Mixins
+end # Merb::Authentication 

data/lib/heedley-merb-auth-with-account/mixins/salted_user/dm_salted_user_with_account.rb

@@ -0,0 +1,41 @@
+class Merb::Authentication
+  module Mixins
+    module SaltedUserWithAccount
+      module DMClassMethods
+        def self.extended(base)
+          base.class_eval do
+            
+            property :crypted_password,           String
+            property :salt,                       String
+            belongs_to :account
+            validates_present        :password, :if => proc{|m| m.password_required?}
+            validates_is_confirmed   :password, :if => proc{|m| m.password_required?}
+            
+            before :save,   :encrypt_password
+          end # base.class_eval
+          
+        end # self.extended
+        
+        def authenticate(login, password, account_name = nil)
+          if account_name.nil? || account_name.empty?
+            Merb.logger.error "User.authenticate MISSING account_name!"
+            return nil
+          end
+          
+          @account = Account.find_by_title(account_name)
+
+          if @account.nil?
+            Merb.logger.error "User.authenticate account NOT FOUND"
+            return nil
+          end
+          
+          @u = first(
+            Merb::Authentication::Strategies::Basic::Base.login_param => login,
+            :account_id => @account.id
+          )
+          @u && @u.authenticated?(password, account_name) ? @u : nil
+        end
+      end # DMClassMethods      
+    end # SaltedUser
+  end # Mixins
+end # Merb::Authentication

data/lib/heedley-merb-auth-with-account/mixins/salted_user/relaxdb_salted_user.rb

@@ -0,0 +1,34 @@
+class Merb::Authentication
+  module Mixins
+    module SaltedUser
+      module RDBClassMethods
+        
+        def self.extended(base)
+          base.class_eval do
+ 
+            property :crypted_password
+            property :salt
+ 
+            before_save :password_checks
+            
+            def password_checks
+              if password_required?
+                return false unless !password.blank? && password == password_confirmation
+              end
+              encrypt_password
+              true
+            end
+            
+          end
+        end
+ 
+        def authenticate(login, password)
+          login_param = Merb::Authentication::Strategies::Basic::Base.login_param
+          @u = all.sorted_by(login_param) { |q| q.key(login) }.first
+          @u && @u.authenticated?(password) ? @u : nil
+        end 
+                 
+      end # RDBClassMethods
+    end # SaltedUser
+  end # Mixins
+end # Merb::Authentication

data/lib/heedley-merb-auth-with-account/mixins/salted_user/sq_salted_user.rb

@@ -0,0 +1,35 @@
+class Merb::Authentication
+  module Mixins
+    module SaltedUser
+      module SQClassMethods
+        
+        def self.extended(base)
+          base.class_eval do
+            
+            validates_presence_of     :password,                   :if => :password_required?
+            validates_presence_of     :password_confirmation,      :if => :password_required?
+            validates_confirmation_of :password,                   :if => :password_required?
+            
+            before_save :encrypt_password
+
+            include Merb::Authentication::Mixins::SaltedUser::SQInstanceMethods
+
+          end # base.class_eval 
+          
+        end # self.extended
+        
+        def authenticate(login, password)
+          @u = find(Merb::Authentication::Strategies::Basic::Base.login_param => login)
+          @u && @u.authenticated?(password) ? @u : nil
+        end
+      end # SQClassMethods
+
+      module SQInstanceMethods
+        def new_record?
+          new?
+        end
+      end
+
+    end # SaltedUser
+  end # Mixins
+end # Merb::Authentication 

data/lib/heedley-merb-auth-with-account/strategies/abstract_password.rb

@@ -0,0 +1,31 @@
+class Merb::Authentication
+  module Strategies
+    # To use the password strategies, it is expected that you will provide
+    # an @authenticate@ method on your user class.  This should take two parameters
+    # login, and password.  It should return nil or the user object.
+    module Basic
+      
+      class Base < Merb::Authentication::Strategy
+        abstract!
+        
+        # Overwrite this method to customize the field
+        def self.password_param
+          (Merb::Plugins.config[:"merb-auth"][:password_param] || :password).to_s.to_sym
+        end
+        
+        # Overwrite this method to customize the field
+        def self.login_param
+          (Merb::Plugins.config[:"merb-auth"][:login_param] || :login).to_s.to_sym
+        end
+        
+        def password_param
+          @password_param ||= Base.password_param
+        end
+        
+        def login_param
+          @login_param ||= Base.login_param
+        end
+      end # Base      
+    end # Password
+  end # Strategies
+end # Merb::Authentication

data/lib/heedley-merb-auth-with-account/strategies/password_form_with_account.rb

@@ -21,14 +21,30 @@ p "REQUIRED password_form_with_account.rb"
 #    end
 #  end
 #end
+
 module Merb::Authentication::Strategies
   class FormWithAccount < Merb::Authentication::Strategy
+
+    def redirect!(url, opts = {})
+      self.headers["Location"] = url
+      self.status = opts[:permanent] ? 301 : 302
+      self.status = opts[:status] if opts[:status]
+      if ROOT_DOMAIN
+        url = url.gsub(Regexp.new("\/([a-zA-Z0-9]+)\.#{ROOT_DOMAIN}\/"),'/')
+      end
+
+      self.body   = opts[:message] || "<div>You are being redirected to <a href='#{url}'>#{url}</a></div>"
+      halt!
+      return true
+    end
+
     def run!
        if params[:account_subdomain]
-          User.authenticate(request.params[:login], request.params[:password], params[:account_subdomain])
+          user = User.authenticate(request.params[:login], request.params[:password], params[:account_subdomain])
        else
          raise "missing :account_subdomain route param #{params.inspect}"
        end
+       user
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: heedley-merb-auth-with-account
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Hedley Robertson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 -08:00
+date: 2009-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,15 @@ extra_rdoc_files:
 files: 
 - heedley-merb-auth-with-account.gemspec
 - lib/heedley-merb-auth-with-account.rb
+- lib/heedley-merb-auth-with-account/strategies/abstract_password.rb
 - lib/heedley-merb-auth-with-account/strategies/password_form_with_account.rb
+- lib/heedley-merb-auth-with-account/mixins
+- lib/heedley-merb-auth-with-account/mixins/salted_user
+- lib/heedley-merb-auth-with-account/mixins/salted_user.rb
+- lib/heedley-merb-auth-with-account/mixins/salted_user/ar_salted_user.rb
+- lib/heedley-merb-auth-with-account/mixins/salted_user/dm_salted_user_with_account.rb
+- lib/heedley-merb-auth-with-account/mixins/salted_user/relaxdb_salted_user.rb
+- lib/heedley-merb-auth-with-account/mixins/salted_user/sq_salted_user.rb
 - README.txt
 has_rdoc: true
 homepage: http://github.com/heedley/merb-pagination/tree/master