cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2020-07-07 10:44:52 +01:00
parent 1ea946636b
commit 9f993fe8c8
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/password_hash.rb
View file

@ -18,7 +18,7 @@ module PasswordHash
def self.check(hash, salt, candidate)
if salt.nil?
candidate = Digest::MD5.hexdigest(candidate)
elsif salt.match?(/!/)
elsif salt.include?("!")
algorithm, iterations, salt = salt.split("!")
size = Base64.strict_decode64(hash).length
candidate = self.hash(candidate, salt, iterations.to_i, size, algorithm)
@ -32,7 +32,7 @@ module PasswordHash
def self.upgrade?(hash, salt)
if salt.nil?
return true
elsif salt.match?(/!/)
elsif salt.include?("!")
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