password_rehasher 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94368ad8a1bab6440f2386e8328bcc2ad0ba3ae1
-  data.tar.gz: 6286b64166341f8797ffc7969d47415c1b206a73
+  metadata.gz: b1f78be1bc044d2df5fbfb0129e60ce77c09fe79
+  data.tar.gz: c5563eb7c48b1089412a2dc982c4275cb7375761
 SHA512:
-  metadata.gz: 1e77fdf6d1a5c8bbc55ba54aef8b4f030a75ef6bf3b5cf0eca491eec1b030738a7efacfaf6daebedbd26dc025910406112c82d873023e2a20556198175843095
-  data.tar.gz: 4f18018cdf9e3cacae55ae9ef8185a04db031b6e78ae034a8ea30c8f3231dfd05228e8488744dc8bd5fa68eedf4178b59d97759fd86ba1d511c7ce7722e17091
+  metadata.gz: 448ddb670a977cf6303aa8678d5f476e28b51c60aa81dbe462f70b5305df0e00f4b570d9d5fbbf22cf531f9a15a43c58b16f9f586c3e404a582b5ac32e117240
+  data.tar.gz: 14ab4d51c05e473ed7760a496b843e55883f02007d4a7bd085dc5be34069b0a998d8344219bef05f4498ffd4cde19e6fbfd2bcee093d5b9245793a4d4f329066

data/lib/password_rehasher.rb

@@ -2,47 +2,50 @@ require "scrypt"
 require 'digest/sha1'
 
 class PasswordRehasher
-	VERSION = "0.2.2"
+  VERSION = "0.2.3"
 
-	def self.password_valid?(plaintext_password, hashed_password, salt = nil)
-		case hashed_password.length
-		when 40
-			return false unless salt
-			hashed_password == Digest::SHA1.hexdigest("--#{salt}--#{plaintext_password}--")
-		when 90
-			password = SCrypt::Password.new(hashed_password)
-			password == plaintext_password
-		when 103
-			return false unless salt
-			scrypt_plus_sha1_hash =  hashed_password[13..-1]
-			sha1_hashed_password = Digest::SHA1.hexdigest("--#{salt}--#{plaintext_password}--")
-			password = SCrypt::Password.new(scrypt_plus_sha1_hash)
-			password == sha1_hashed_password
-		else
-			false
-		end
-	end
+  def self.password_valid?(plaintext_password, hashed_password, salt = nil)
+    return false if plaintext_password.nil? || hashed_password.nil?
 
-	def self.rehash_needed?(hashed_password)
-		hashed_password.length != 90
-	end
+    case hashed_password.length
+    when 40
+      return false unless salt
+      hashed_password == Digest::SHA1.hexdigest("--#{salt}--#{plaintext_password}--")
+    when 90
+      password = SCrypt::Password.new(hashed_password)
+      password == plaintext_password
+    when 103
+      return false unless salt
+      scrypt_plus_sha1_hash =  hashed_password[13..-1]
+      sha1_hashed_password = Digest::SHA1.hexdigest("--#{salt}--#{plaintext_password}--")
+      password = SCrypt::Password.new(scrypt_plus_sha1_hash)
+      password == sha1_hashed_password
+    else
+      false
+    end
+  end
 
-	def self.hash_password(plaintext_password)
-		SCrypt::Password.create(plaintext_password).to_s
-	end
+  def self.rehash_needed?(hashed_password)
+    return false if hashed_password.nil?
+    hashed_password.length != 90
+  end
 
-	def self.nested_hash(sha1_password)
-		"nested hash: #{SCrypt::Password.create(sha1_password)}"
-	end
+  def self.hash_password(plaintext_password)
+    SCrypt::Password.create(plaintext_password).to_s
+  end
 
-	def self.validate_and_rehash?(user, plaintext_password, hashed_password)
-		if (plaintext_password && password_valid?(plaintext_password, hashed_password, user.salt))
-			if (rehash_needed?(hashed_password))
-				user.update_attribute("crypted_password", hash_password(plaintext_password))
-			end
-			return true
-		else
-			return false
-		end
-	end
+  def self.nested_hash(sha1_password)
+    "nested hash: #{SCrypt::Password.create(sha1_password)}"
+  end
+
+  def self.validate_and_rehash?(user, plaintext_password, hashed_password)
+    if password_valid?(plaintext_password, hashed_password, user.salt)
+      if (rehash_needed?(hashed_password))
+        user.update_attribute("crypted_password", hash_password(plaintext_password))
+      end
+      return true
+    else
+      return false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: password_rehasher
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - John Hyland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrypt