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

Rubocop fixes for ruby 2.5

Browse source
This commit is contained in:
Andy Allan 2019-03-13 10:33:33 +01:00
parent f28e236bdd
commit 1ca77d6dda
8 changed files with 41 additions and 53 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 =~ /!/
elsif /!/.match?(salt)
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 =~ /!/
elsif /!/.match?(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