pipa-authmagic 0.0.3 → 0.0.4

data/lib/authmagic/rails/modules/login_password.rb

@@ -36,6 +36,29 @@ module Authmagic
       stretches = cfg.fetch(:stretches, 20)
       salt_length = cfg.fetch(:salt_length, 64)
 
+      cols = principal.columns_hash
+      col_pass_hash, col_salt = cols[password_hash.to_s], cols[salt.to_s]
+      raise "missing required attribute #{password_hash} from #{principal} model" unless col_pass_hash
+      raise "missing required attribute #{salt} from #{principal} model" unless col_salt
+
+      digest_method = case col_pass_hash.type
+      when :string
+        :hexdigest
+      when :binary
+        :digest
+      else
+        raise "unsupported type #{col_pass_hash.type} for #{password_hash}"
+      end
+
+      secran_salt = case col_salt.type
+      when :string
+        :hex
+      when :binary
+        :random_bytes
+      else
+        raise "unsupported type #{col_salt.type} for #{salt}"
+      end
+
       principal.class_eval do
         self.class.send(:define_method, :authenticate) do |options|
           conditions = case_sensitive ?
@@ -61,13 +84,13 @@ module Authmagic
         end
 
         define_method encryptor do |plaintext|
-          hash = (digest.new << send(salt) << plaintext).hexdigest
-          stretches.times { hash = (digest.new << hash).hexdigest }
+          hash = (digest.new << (send(salt) || '') << plaintext).send(digest_method)
+          stretches.times { hash = (digest.new << hash).send(digest_method) }
           hash
         end
 
         define_method generate_salt do
-          ActiveSupport::SecureRandom.hex(salt_length)
+          ActiveSupport::SecureRandom.send(secran_salt, salt_length)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipa-authmagic
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Igor Gunko