Minor fixes.
This commit is contained in:
+7
-7
@@ -18,15 +18,15 @@ module Players
|
||||
raise ArgumentError, "Password must be at least 8 characters and of valid format." unless
|
||||
pass.match?(/\A[a-zA-Z0-9_.!?@#$%^&*()+=-]+\z/) && pass.length >= 8
|
||||
|
||||
digest = Zlib.crc32(pass, ENV_HASH["SALT"])
|
||||
code = ENV_HASH["ENV"] == "prod" ? Array.new(24) { ALPHANUM.sample }.join : "!"
|
||||
digest = Zlib.crc32(pass, ENV["SALT"])
|
||||
code = ENV["ENV"] == "prod" ? Array.new(24) { ALPHANUM.sample }.join : "!"
|
||||
|
||||
DB[
|
||||
"insert into Players (username, digest, email, activation_code) values (?, ?, ?, ?)",
|
||||
username, digest, email, code
|
||||
].insert
|
||||
|
||||
send_email(:new, email, username, code) if ENV_HASH["ENV"] == "prod"
|
||||
send_email(:new, email, username, code) if ENV["ENV"] == "prod"
|
||||
|
||||
[200, "Successfully signed up!"]
|
||||
rescue ArgumentError => e
|
||||
@@ -53,11 +53,11 @@ module Players
|
||||
|
||||
true
|
||||
|
||||
# send_email(:pass_req, email, code)
|
||||
send_email(:pass_req, email, code)
|
||||
end
|
||||
|
||||
def self.pass_reset(new_pass, code)
|
||||
digest = XXhash.xxh32(new_pass, ENV_HASH["SALT"])
|
||||
def self.pass_reset(pass, code)
|
||||
digest = Zlib.crc32(pass, ENV["SALT"])
|
||||
DB["update Players set digest = ?, new_pass_code = ? where new_pass_code = ?", digest, "", code].update != 0
|
||||
end
|
||||
|
||||
@@ -78,7 +78,7 @@ module Players
|
||||
end
|
||||
|
||||
def self.authorized?(username, pass)
|
||||
digest = Zlib.crc32(pass, ENV_HASH["SALT"])
|
||||
digest = Zlib.crc32(pass, ENV["SALT"])
|
||||
Logman.log "Authorized: #{username} & #{digest}"
|
||||
player = self[username]
|
||||
player && player[:digest].to_i == digest.to_i ? player : false
|
||||
|
||||
Reference in New Issue
Block a user