X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1ca77d6ddac1910e85eb7ef4dedf6f1e885307e1..255ce8708a4e9099f9a9eaa92278a40629a4d883:/lib/password_hash.rb diff --git a/lib/password_hash.rb b/lib/password_hash.rb index 5bafe6dda..afea82c11 100644 --- a/lib/password_hash.rb +++ b/lib/password_hash.rb @@ -18,7 +18,7 @@ module PasswordHash def self.check(hash, salt, candidate) if salt.nil? candidate = Digest::MD5.hexdigest(candidate) - elsif /!/.match?(salt) + 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 /!/.match?(salt) + 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