github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Rescue from readonly errors when looking up auth tokens.

Browse Source 
Since this is rare, we don't want to check for
`Discourse.pg_readonly_mode?` on every request since we have to reach
for Redis. Instead, just rescue the error here.
This commit is contained in:
Guo Xiang Tan
2020-06-03 16:36:51 +08:00
committed by Alan Guo Xiang Tan
parent 81e6bc7a0f
commit d3c972c30c
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/auth/default_current_user_provider.rb
View File

@ -93,11 +93,17 @@ class Auth::DefaultCurrentUserProvider
limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60) limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60)
if limiter.can_perform? if limiter.can_perform?
@user_token = UserAuthToken.lookup(auth_token, @user_token = begin
seen: true, UserAuthToken.lookup(
user_agent: @env['HTTP_USER_AGENT'], auth_token,
path: @env['REQUEST_PATH'], seen: true,
client_ip: @request.ip) user_agent: @env['HTTP_USER_AGENT'],
path: @env['REQUEST_PATH'],
client_ip: @request.ip
)
rescue ActiveRecord::ReadOnlyError
nil
end
current_user = @user_token.try(:user) current_user = @user_token.try(:user)
end end