casino-activerecord_authenticator 2.0.0 → 2.0.1

data/.rspec

@@ -1 +1 @@
---color --format Fivemat
+--color --format documentation

data/README.md

@@ -1,6 +1,6 @@
-# casino-activerecord_authenticator [![Build Status](https://travis-ci.org/rbCAS/casino-activerecord_authenticator.png?branch=master)](https://travis-ci.org/rbCAS/casino-activerecord_authenticator) [![Coverage Status](https://coveralls.io/repos/rbCAS/casino-activerecord_authenticator/badge.png?branch=master)](https://coveralls.io/r/rbCAS/casino-activerecord_authenticator)
+# casino-activerecord_authenticator [![Build Status](https://travis-ci.org/rbCAS/casino-activerecord_authenticator.png?branch=master)](https://travis-ci.org/rbCAS/casino-activerecord_authenticator) [![Coverage Status](https://coveralls.io/repos/rbCAS/casino-activerecord_authenticator/badge.png)](https://coveralls.io/r/rbCAS/casino-activerecord_authenticator)
 
-Provides mechanism to use ActiveRecord as an authenticator for [CASinoCore](https://github.com/rbCAS/CASinoCore).
+Provides mechanism to use ActiveRecord as an authenticator for [CASino](https://github.com/rbCAS/CASino).
 
 ActiveRecord supports many SQL databases such as MySQL, PostgreSQL, SQLite, ...
 

data/casino-activerecord_authenticator.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.7'
   s.add_development_dependency 'sqlite3', '~> 1.3.7'
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'fivemat'
 
   s.add_runtime_dependency 'activerecord', '~> 3.2.12'
   s.add_runtime_dependency 'unix-crypt', '~> 1.1'
   s.add_runtime_dependency 'bcrypt-ruby', '~> 3.0'
   s.add_runtime_dependency 'casino', '~> 2.0'
+  s.add_runtime_dependency 'phpass-ruby', '~> 0.1'
 end

data/lib/casino/activerecord_authenticator.rb

@@ -1,6 +1,7 @@
 require 'active_record'
 require 'unix_crypt'
 require 'bcrypt'
+require 'phpass'
 
 class CASino::ActiveRecordAuthenticator
 
@@ -44,6 +45,8 @@ class CASino::ActiveRecordAuthenticator
     case magic
     when /\A2a?\z/
       valid_password_with_bcrypt?(password, password_from_database)
+    when /\AH\z/, /\AP\z/
+      valid_password_with_phpass?(password, password_from_database)
     else
       valid_password_with_unix_crypt?(password, password_from_database)
     end
@@ -58,6 +61,10 @@ class CASino::ActiveRecordAuthenticator
     UnixCrypt.valid?(password, password_from_database)
   end
 
+  def valid_password_with_phpass?(password, password_from_database)
+    Phpass.new().check(password, password_from_database)
+  end
+
   def extra_attributes(user)
     attributes = {}
     extra_attributes_option.each do |attribute_name, database_column|

data/lib/casino/activerecord_authenticator/version.rb

@@ -1,5 +1,5 @@
 module CASino
   class ActiveRecordAuthenticator
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/spec/casino_core/activerecord_authenticator_spec.rb

@@ -132,6 +132,19 @@ describe CASino::ActiveRecordAuthenticator do
       end
     end
 
+    context 'support for phpass' do
+      before do
+        described_class::User.create!(
+          username: 'test4',
+          password: '$P$9IQRaTwmfeRo7ud9Fh4E2PdI0S3r.L0', # password: test12345
+          mail_address: 'mail@example.org')
+      end
+
+      it 'is able to handle phpass password hashes' do
+        subject.validate('test4', 'test12345').should be_instance_of(Hash)
+      end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casino-activerecord_authenticator
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,22 +92,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fivemat
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +156,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: phpass-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: This gem can be used to allow the CASino backend to authenticate against
   an SQL server using ActiveRecord.
 email: