sequel_password 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7be80a93422a9c18bd61e2d309b61481fb4c4d1
-  data.tar.gz: b89e1934f8373ba7e341d50312b1620574f93f19
+  metadata.gz: 536c42e3a0e81d54a1ede80ebf0d02384efb8e9d
+  data.tar.gz: 85510cee1cc2c043139dee879e7b5eef2519436a
 SHA512:
-  metadata.gz: a15ae5358ab1e5601c50dc6cc4c5b10bd4c223c3f3e5d2726e8a022b8dd28989a24e8b7b0e5321add1835549fcc5bbc1277e8df0ee12866db2748bb090e07863
-  data.tar.gz: 1014dcda3e264885bb94301736b00bfce78f574444919b11d6f0c71c53079192fb81345403385cc838e552ddc79d021d65d2acc7a7ede82d426af3822ef7909a
+  metadata.gz: 4188cd381e1de2ed42f27881271bbdc385090cd4249c5b8ae7c67dc20f09fc7728285992e6fec3b5fc9b26cfce117a4db4446e0b6447dd9f19fa686ae8b524fb
+  data.tar.gz: 729291c54d8c8bdb03198ce58ddebc5909f9c16af68e5e0691c4dffee8063b1e5d856c5ba3a075c4e231f0ea3497a6af1da1d65d8100478ed0decdad11123ceb

data/.gitignore

@@ -1 +1,2 @@
 coverage
+*.gem

data/Gemfile.lock

@@ -2,9 +2,9 @@ PATH
   remote: .
   specs:
     sequel_password (0.1)
-      bcrypt (~> 3.1.10)
+      bcrypt (~> 3.1, >= 3.1.10)
       pbkdf2-ruby (~> 0.2.1)
-      sequel (~> 4.21.0)
+      sequel (~> 4.21, >= 4.21.0)
 
 GEM
   remote: https://rubygems.org/
@@ -39,7 +39,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec (~> 3.2.0)
+  rspec (~> 3.2, >= 3.2.0)
   sequel_password!
   simplecov (~> 0.9.2)
-  sqlite3 (~> 1.3.10)
+  sqlite3 (~> 1.3, >= 1.3.10)

data/README.md

@@ -2,3 +2,5 @@
 
 This sequel plugin adds authentication and password hashing to Sequel models.
 It supports pbkdf2 and bcrypt hashers.
+
+# Usage

data/lib/sequel_password/hashers.rb

@@ -0,0 +1,118 @@
+require "base64"
+require "bcrypt"
+require "openssl"
+require "pbkdf2"
+require "securerandom"
+
+module Sequel
+  module Plugins
+    module Password
+      class Hasher
+        attr_reader :algorithm
+
+        def salt
+          # 72 bits
+          SecureRandom.hex(9)
+        end
+
+        def verify(password, encoded)
+          raise NotImplementedError
+        end
+
+        def encode(password, salt)
+          raise NotImplementedError
+        end
+
+        def must_update(encoded)
+          false
+        end
+
+        private
+
+        def constant_time_compare(a, b)
+          check = a.bytesize ^ b.bytesize
+          a.bytes.zip(b.bytes) { |x, y| check |= x ^ y }
+          check == 0
+        end
+      end
+
+      class PBKDF2Hasher < Hasher
+        def initialize
+          @algorithm = :pbkdf2_sha256
+          @iterations = 24000
+          @digest = OpenSSL::Digest::SHA256.new
+        end
+
+        def encode(password, salt, iterations = nil)
+          iterations = @iterations if iterations.nil?
+          hash = PBKDF2.new(password: password, salt: salt,
+            iterations: iterations, hash_function: @digest)
+          hash = Base64.strict_encode64(hash.value)
+          "#{@algorithm}$#{iterations}$#{salt}$#{hash}"
+        end
+
+        def verify(password, encoded)
+          algorithm, iterations, salt, hash = encoded.split('$', 4)
+          hash = encode(password, salt, iterations.to_i)
+          constant_time_compare(encoded, hash)
+        end
+
+        def must_update(encoded)
+          algorithm, iterations, salt, hash = encoded.split('$', 4)
+          iterations.to_i != @iterations
+        end
+      end
+
+      class BCryptSHA256Hasher < Hasher
+        def initialize
+          @algorithm = :bcrypt_sha256
+          @cost = 12
+          @digest = OpenSSL::Digest::SHA256.new
+        end
+
+        def salt
+          BCrypt::Engine.generate_salt(@cost)
+        end
+
+        def encode(password, salt)
+          password = @digest.digest(password) unless @digest.nil?
+          hash = BCrypt::Engine.hash_secret(password, salt)
+          "#{@algorithm}$#{hash}"
+        end
+
+        def verify(password, encoded)
+          algorithm, data = encoded.split('$', 2)
+          password = @digest.digest(password) unless @digest.nil?
+          hash = BCrypt::Engine.hash_secret(password, data)
+          constant_time_compare(data, hash)
+        end
+      end
+
+      class BCryptHasher < BCryptSHA256Hasher
+        def initialize
+          @algorithm = :bcrypt
+          @cost = 12
+          @digest = nil
+        end
+      end
+
+      class SHA1Hasher < Hasher
+        def initialize
+          @algorithm = :sha1
+          @digest = OpenSSL::Digest::SHA1.new
+        end
+
+        def encode(password, salt)
+          hash = @digest.digest(salt + password).unpack('H*').first
+          "#{@algorithm}$#{salt}$#{hash}"
+        end
+
+        def verify(password, encoded)
+          algorithm, salt, hash = encoded.split('$', 3)
+          hash = encode(password, salt)
+          constant_time_compare(encoded, hash)
+        end
+      end
+    end
+  end
+end

data/lib/sequel_password.rb

@@ -1,8 +1,5 @@
-require "base64"
-require "bcrypt"
-require "openssl"
-require "pbkdf2"
 require "securerandom"
+require "sequel_password/hashers"
 
 module Sequel
   module Plugins
@@ -33,10 +30,6 @@ module Sequel
           hasher(algorithm).encode(password, salt)
         end
 
-        def hasher(algorithm = :default)
-          @hashers.fetch(algorithm.to_sym, @hashers.values.first)
-        end
-
         def usable_password?(encoded)
           return false if encoded.nil? || encoded.start_with?("!")
 
@@ -58,6 +51,12 @@ module Sequel
 
           correct
         end
+
+        private
+
+        def hasher(algorithm = :default)
+          @hashers.fetch(algorithm.to_sym, @hashers.values.first)
+        end
       end
 
       module InstanceMethods
@@ -74,113 +73,6 @@ module Sequel
           send("#{model.column}=", model.make_password(nil))
         end
       end
-
-      class Hasher
-        attr_reader :algorithm
-
-        def salt
-          # 72 bits
-          SecureRandom.hex(9)
-        end
-
-        def verify(password, encoded)
-          raise NotImplementedError
-        end
-
-        def encode(password, salt)
-          raise NotImplementedError
-        end
-
-        def must_update(encoded)
-          false
-        end
-
-        private
-
-        def constant_time_compare(a, b)
-          check = a.bytesize ^ b.bytesize
-          a.bytes.zip(b.bytes) { |x, y| check |= x ^ y }
-          check == 0
-        end
-      end
-
-      class PBKDF2Hasher < Hasher
-        def initialize
-          @algorithm = :pbkdf2_sha256
-          @iterations = 24000
-          @digest = OpenSSL::Digest::SHA256.new
-        end
-
-        def encode(password, salt, iterations = nil)
-          iterations = @iterations if iterations.nil?
-          hash = PBKDF2.new(password: password, salt: salt,
-            iterations: iterations, hash_function: @digest)
-          hash = Base64.strict_encode64(hash.value)
-          "#{@algorithm}$#{iterations}$#{salt}$#{hash}"
-        end
-
-        def verify(password, encoded)
-          algorithm, iterations, salt, hash = encoded.split('$', 4)
-          hash = encode(password, salt, iterations.to_i)
-          constant_time_compare(encoded, hash)
-        end
-
-        def must_update(encoded)
-          algorithm, iterations, salt, hash = encoded.split('$', 4)
-          iterations.to_i != @iterations
-        end
-      end
-
-      class BCryptSHA256Hasher < Hasher
-        def initialize
-          @algorithm = :bcrypt_sha256
-          @cost = 12
-          @digest = OpenSSL::Digest::SHA256.new
-        end
-
-        def salt
-          BCrypt::Engine.generate_salt(@cost)
-        end
-
-        def encode(password, salt)
-          password = @digest.digest(password) unless @digest.nil?
-          hash = BCrypt::Engine.hash_secret(password, salt)
-          "#{@algorithm}$#{hash}"
-        end
-
-        def verify(password, encoded)
-          algorithm, data = encoded.split('$', 2)
-          password = @digest.digest(password) unless @digest.nil?
-          hash = BCrypt::Engine.hash_secret(password, data)
-          constant_time_compare(data, hash)
-        end
-      end
-
-      class BCryptHasher < BCryptSHA256Hasher
-        def initialize
-          @algorithm = :bcrypt
-          @cost = 12
-          @digest = nil
-        end
-      end
-
-      class SHA1Hasher < Hasher
-        def initialize
-          @algorithm = :sha1
-          @digest = OpenSSL::Digest::SHA1.new
-        end
-
-        def encode(password, salt)
-          hash = @digest.digest(salt + password).unpack('H*').first
-          "#{@algorithm}$#{salt}$#{hash}"
-        end
-
-        def verify(password, encoded)
-          algorithm, salt, hash = encoded.split('$', 3)
-          hash = encode(password, salt)
-          constant_time_compare(encoded, hash)
-        end
-      end
     end
   end
 end

data/sequel_password.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sequel_password"
   gem.require_paths = ["lib"]
-  gem.version       = '0.1'
+  gem.version       = '0.1.1'
 
   gem.add_runtime_dependency 'sequel', '~> 4.21', '>= 4.21.0'
   gem.add_runtime_dependency 'bcrypt', '~> 3.1', '>= 3.1.10'
-  gem.add_runtime_dependency 'pbkf2-ruby', '~> 0.2.1'
+  gem.add_runtime_dependency 'pbkdf2-ruby', '~> 0.2.1'
 
   gem.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
   gem.add_development_dependency 'simplecov', '~> 0.9.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_password
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -51,7 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.10
 - !ruby/object:Gem::Dependency
-  name: pbkf2-ruby
+  name: pbkdf2-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -132,6 +132,7 @@ files:
 - Gemfile.lock
 - README.md
 - lib/sequel_password.rb
+- lib/sequel_password/hashers.rb
 - sequel_password.gemspec
 - spec/sequel_password_spec.rb
 - spec/spec_helper.rb