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

FIX: Do not check for suspicious login when impersonating. (#6534)

Browse Source 
* FIX: Do not check for suspicious login when impersonating.

* DEV: Add 'impersonate' parameter to log_on_user.
This commit is contained in:
Bianca Nenciu
2018-11-12 16:34:12 +02:00
committed by Régis Hanol
parent 012da86a07
commit 5af9a69a3b
7 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/auth/current_user_provider.rb
View File

@@ -12,7 +12,7 @@ class Auth::CurrentUserProvider
end
# log on a user and set cookies and session etc.
def log_on_user(user, session, cookies)
def log_on_user(user, session, cookies, opts = {})
raise NotImplementedError
end

5
lib/auth/default_current_user_provider.rb
View File

@@ -149,13 +149,14 @@ class Auth::DefaultCurrentUserProvider
end
end
def log_on_user(user, session, cookies)
def log_on_user(user, session, cookies, opts = {})
@user_token = UserAuthToken.generate!(
user_id: user.id,
user_agent: @env['HTTP_USER_AGENT'],
path: @env['REQUEST_PATH'],
client_ip: @request.ip,
staff: user.staff?)
staff: user.staff?,
impersonate: opts.impersonate)
cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
unstage_user(user)

4
lib/current_user.rb
View File

@@ -13,8 +13,8 @@ module CurrentUser
@current_user_provider = Discourse.current_user_provider.new({})
end
def log_on_user(user)
current_user_provider.log_on_user(user, session, cookies)
def log_on_user(user, opts = {})
current_user_provider.log_on_user(user, session, cookies, opts)
user.logged_in
end