IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove dupe code, correct logging logic

Browse Source
This commit is contained in:
Sam 2017-03-07 10:57:48 -05:00
parent c310a32ac1
commit 9f8cfee450
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/models/user_auth_token.rb
View File

@ -10,6 +10,12 @@ class UserAuthToken < ActiveRecord::Base
attr_accessor :unhashed_auth_token attr_accessor :unhashed_auth_token
def self.log(info)
if SiteSetting.verbose_auth_token_logging
UserAuthTokenLog.create!(info)
end
end
def self.generate!(info) def self.generate!(info)
token = SecureRandom.hex(16) token = SecureRandom.hex(16)
hashed_token = hash_token(token) hashed_token = hash_token(token)
@ -23,16 +29,12 @@ class UserAuthToken < ActiveRecord::Base
) )
user_auth_token.unhashed_auth_token = token user_auth_token.unhashed_auth_token = token
if SiteSetting.verbose_auth_token_logging log(action: 'generate',
UserAuthTokenLog.create!(
action: 'generate',
user_auth_token_id: user_auth_token.id, user_auth_token_id: user_auth_token.id,
user_id: info[:user_id], user_id: info[:user_id],
user_agent: info[:user_agent], user_agent: info[:user_agent],
client_ip: info[:client_ip], client_ip: info[:client_ip],
auth_token: hashed_token auth_token: hashed_token)
)
end
user_auth_token user_auth_token
end end
@ -51,15 +53,11 @@ class UserAuthToken < ActiveRecord::Base
if !user_token if !user_token
if SiteSetting.verbose_auth_token_logging log(action: "miss token",
UserAuthTokenLog.create(
action: "miss token",
user_id: user_token&.user_id, user_id: user_token&.user_id,
auth_token: token, auth_token: token,
user_agent: opts && opts[:user_agent], user_agent: opts && opts[:user_agent],
client_ip: opts && opts[:client_ip] client_ip: opts && opts[:client_ip])
)
end
return nil return nil
end end
@ -71,7 +69,7 @@ class UserAuthToken < ActiveRecord::Base
# not updating AR model cause we want to give it one more req # not updating AR model cause we want to give it one more req
# with wrong cookie # with wrong cookie
UserAuthTokenLog.create( UserAuthToken.log(
action: changed_rows == 0 ? "prev seen token unchanged" : "prev seen token", action: changed_rows == 0 ? "prev seen token unchanged" : "prev seen token",
user_auth_token_id: user_token.id, user_auth_token_id: user_token.id,
user_id: user_token.user_id, user_id: user_token.user_id,
@ -93,16 +91,12 @@ class UserAuthToken < ActiveRecord::Base
user_token.seen_at = Time.zone.now user_token.seen_at = Time.zone.now
end end
if SiteSetting.verbose_auth_token_logging log(action: changed_rows == 0 ? "seen wrong token" : "seen token",
UserAuthTokenLog.create(
action: changed_rows == 0 ? "seen wrong token" : "seen token",
user_auth_token_id: user_token.id, user_auth_token_id: user_token.id,
user_id: user_token.user_id, user_id: user_token.user_id,
auth_token: user_token.auth_token, auth_token: user_token.auth_token,
user_agent: opts && opts[:user_agent], user_agent: opts && opts[:user_agent],
client_ip: opts && opts[:client_ip] client_ip: opts && opts[:client_ip])
)
end
end end
user_token user_token
@ -153,8 +147,7 @@ class UserAuthToken < ActiveRecord::Base
reload reload
self.unhashed_auth_token = token self.unhashed_auth_token = token
if SiteSetting.verbose_auth_token_logging UserAuthToken.log(
UserAuthTokenLog.create(
action: "rotate", action: "rotate",
user_auth_token_id: id, user_auth_token_id: id,
user_id: user_id, user_id: user_id,
@ -162,7 +155,6 @@ class UserAuthToken < ActiveRecord::Base
user_agent: user_agent, user_agent: user_agent,
client_ip: client_ip client_ip: client_ip
) )
end
true true
else else