mirror of
https://github.com/discourse/discourse.git
synced 2025-05-23 22:51:06 +08:00
DEV: Allow run_second_factor!
to be used before login (#25420)
In a handful of situations, we need to verify a user's 2fa credentials before `current_user` is assigned. For example: login, email_login and change-email confirmation. This commit adds an explicit `target_user:` parameter to the centralized 2fa system so that it can be used for those situations. For safety and clarity, this new parameter only works for anon. If some user is logged in, and target_user is set to a different user, an exception will be raised.
This commit is contained in:
@ -1063,9 +1063,15 @@ class ApplicationController < ActionController::Base
|
||||
end
|
||||
end
|
||||
|
||||
def run_second_factor!(action_class, action_data = nil)
|
||||
action = action_class.new(guardian, request, action_data)
|
||||
manager = SecondFactor::AuthManager.new(guardian, action)
|
||||
def run_second_factor!(action_class, action_data: nil, target_user: current_user)
|
||||
if current_user && target_user != current_user
|
||||
# Anon can run 2fa against another target, but logged-in users should not.
|
||||
# This should be validated at the `run_second_factor!` call site.
|
||||
raise "running 2fa against another user is not allowed"
|
||||
end
|
||||
|
||||
action = action_class.new(guardian, request, opts: action_data, target_user: target_user)
|
||||
manager = SecondFactor::AuthManager.new(guardian, action, target_user: target_user)
|
||||
yield(manager) if block_given?
|
||||
result = manager.run!(request, params, secure_session)
|
||||
|
||||
|
Reference in New Issue
Block a user