Skip to content

A platform for community discussion. Free, open, simple.

SECURITY: Escape second factor name in delete confirmation dialog

OsamaSayegh40de62cddadc
diff --git a/frontend/discourse/app/controllers/preferences/second-factor.js b/frontend/discourse/app/controllers/preferences/second-factor.js
index 46ad99a474a..553bcf80d15 100644
--- a/frontend/discourse/app/controllers/preferences/second-factor.js
+++ b/frontend/discourse/app/controllers/preferences/second-factor.js
@@ -10,6 +10,7 @@ import SecondFactorEdit from "discourse/components/modal/second-factor-edit";
import SecondFactorEditSecurityKey from "discourse/components/modal/second-factor-edit-security-key";
import { popupAjaxError } from "discourse/lib/ajax-error";
import DiscourseURL, { userPath } from "discourse/lib/url";
+import { escapeExpression } from "discourse/lib/utilities";
import { findAll } from "discourse/models/login-method";
import { SECOND_FACTOR_METHODS } from "discourse/models/user";
import { i18n } from "discourse-i18n";
@@ -245,7 +246,7 @@ export default class SecondFactorController extends Controller {
this.dialog.deleteConfirm({
title: i18n("user.second_factor.delete_single_confirm_title"),
message: i18n("user.second_factor.delete_single_confirm_message", {
- name: secondFactorMethod.name,
+ name: escapeExpression(secondFactorMethod.name),
}),
confirmButtonLabel: "user.second_factor.delete",
confirmButtonIcon: "ban",
diff --git a/frontend/discourse/tests/acceptance/user-preferences-second-factor-test.js b/frontend/discourse/tests/acceptance/user-preferences-second-factor-test.js
index 4ff1e3886d1..53c40fe84c7 100644
--- a/frontend/discourse/tests/acceptance/user-preferences-second-factor-test.js
+++ b/frontend/discourse/tests/acceptance/user-preferences-second-factor-test.js
@@ -149,6 +149,47 @@ acceptance("User Preferences - Second Factor", function (needs) {
});
});
+acceptance(
+ "User Preferences - Second Factor - Escaping Name",
+ function (needs) {
+ needs.user();
+
+ const name = '<img src=x onerror="window.__xssTriggered = true">';
+
+ needs.pretender((server, helper) => {
+ server.post("/u/second_factors.json", () => {
+ return helper.response({
+ success: "OK",
+ totps: [
+ { id: 1, name },
+ { id: 3, name: "safe one" },
+ ],
+ security_keys: [{ id: 2, name: "key" }],
+ });
+ });
+
+ server.get("/u/trusted-session.json", () => {
+ return helper.response({ success: "OK" });
+ });
+ });
+
+ test("escapes the authenticator name in the delete confirmation", async function (assert) {
+ updateCurrentUser({ moderator: false, admin: false, trust_level: 1 });
+ await visit("/u/eviltrout/preferences/second-factor");
+
+ await click(".token-based-auth-dropdown .select-kit-header");
+ await click("li[data-name='Disable']");
+
+ assert
+ .dom(".dialog-body img")
+ .doesNotExist("does not render the name as an HTML element");
+ assert
+ .dom(".dialog-body")
+ .includesText(name, "shows the authenticator name as plain text");
+ });
+ }
+);
+
acceptance(
"User Preferences - Second Factor - Unconfirmed Session",
function (needs) {