A platform for community discussion. Free, open, simple.
FIX: Always allow stop impersonation (#43137)
Steven Chang2239124ce41d
diff --git a/app/controllers/admin/impersonate_controller.rb b/app/controllers/admin/impersonate_controller.rbindex 400ccaf8d72..11fbbba1324 100644--- a/app/controllers/admin/impersonate_controller.rb+++ b/app/controllers/admin/impersonate_controller.rb@@ -2,6 +2,7 @@class Admin::ImpersonateController < Admin::AdminControllerskip_before_action :ensure_admin, only: :destroy+ skip_before_action :redirect_to_login_if_required, only: :destroydef createparams.require(:username_or_email)diff --git a/spec/requests/admin/impersonate_controller_spec.rb b/spec/requests/admin/impersonate_controller_spec.rbindex 265c4fc830f..2b38fcf8e4e 100644--- a/spec/requests/admin/impersonate_controller_spec.rb+++ b/spec/requests/admin/impersonate_controller_spec.rb@@ -124,24 +124,40 @@ RSpec.describe Admin::ImpersonateController doit "succeeds and logs the impersonation" dopost "/admin/impersonate.json", params: { username_or_email: user.username }- delete "/admin/impersonate.json"+ delete "/admin/impersonate"expect(response.status).to eq(200)expect(session[:current_user_id]).to eq(admin.id)endit "does nothing and returns success if not impersonating" do- delete "/admin/impersonate.json"+ delete "/admin/impersonate"expect(response.status).to eq(200)endit "stops impersonating" dopost "/admin/impersonate.json", params: { username_or_email: user.username }- delete "/admin/impersonate.json"+ delete "/admin/impersonate"expect(response.status).to eq(200)expect(session[:current_user_id]).to eq(admin.id)end++ context "when enforce_second_factor is enabled and impersonated user has no 2FA" do+ before do+ SiteSetting.enforce_second_factor = "all"+ Fabricate(:user_second_factor_totp, user: admin)+ end++ it "stops impersonating despite 2FA enforcement on the impersonated user" do+ post "/admin/impersonate.json", params: { username_or_email: user.username }++ delete "/admin/impersonate"++ expect(response.status).to eq(200)+ expect(session[:current_user_id]).to eq(admin.id)+ end+ endendend