Refactor some more amf_controller tests to use factories.

[rails.git] / lib / password_hash.rb

diff --git a/lib/password_hash.rb b/lib/password_hash.rb
index 1bd80291aad8371d9947d479097e437b741f7c9b..c65df2c4fd7fc070496cf8dac2c5851e3e12f25a 100644 (file)
--- a/lib/password_hash.rb
+++ b/lib/password_hash.rb
@@ -6,13 +6,13 @@ require "digest/md5"
 module PasswordHash
   SALT_BYTE_SIZE = 32
   HASH_BYTE_SIZE = 32
-  PBKDF2_ITERATIONS = 1000
-  DIGEST_ALGORITHM = "sha512"
+  PBKDF2_ITERATIONS = 10000
+  DIGEST_ALGORITHM = "sha512".freeze
 
   def self.create(password)
     salt = SecureRandom.base64(SALT_BYTE_SIZE)
     hash = self.hash(password, salt, PBKDF2_ITERATIONS, HASH_BYTE_SIZE, DIGEST_ALGORITHM)
-    return hash, [DIGEST_ALGORITHM, PBKDF2_ITERATIONS, salt].join("!")
+    [hash, [DIGEST_ALGORITHM, PBKDF2_ITERATIONS, salt].join("!")]
   end
 
   def self.check(hash, salt, candidate)
@@ -26,14 +26,28 @@ module PasswordHash
       candidate = Digest::MD5.hexdigest(salt + candidate)
     end
 
-    return hash == candidate
+    hash == candidate
   end
 
-private
+  def self.upgrade?(hash, salt)
+    if salt.nil?
+      return true
+    elsif salt =~ /!/
+      algorithm, iterations, salt = salt.split("!")
+      return true if Base64.strict_decode64(salt).length != SALT_BYTE_SIZE
+      return true if Base64.strict_decode64(hash).length != HASH_BYTE_SIZE
+      return true if iterations.to_i != PBKDF2_ITERATIONS
+      return true if algorithm != DIGEST_ALGORITHM
+    else
+      return true
+    end
+
+    false
+  end
 
   def self.hash(password, salt, iterations, size, algorithm)
     digest = OpenSSL::Digest.new(algorithm)
-    pbkdf2 = OpenSSL::PKCS5::pbkdf2_hmac(password, salt, iterations, size, digest)
+    pbkdf2 = OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, size, digest)
     Base64.strict_encode64(pbkdf2)
   end
 end