Skip to content

fix(security): escape user names in admin Users panel — stored-XSS keystone (chain PR 7) #36357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mbiuki wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(security): escape user names in admin Users panel — stored-XSS keystone (chain PR 7) #36357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users_js_inc.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,21 @@
};
var usersStore = new dojo.data.ItemFileReadStore({data: usersData});

// HTML-escape user-controlled grid values so a name/email containing markup
// renders as text instead of executing (stored XSS). See dotCMS/private-issues#651.
var escapeGridHtml = function (value) {
if (value === null || value === undefined) { return ""; }
return String(value)
.replace(/&/g, "&")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&#39;");
};

var usersGridLayout = [[
{ name: nameColumn, field: 'name', width:'50%' },
{ name: emailColumn, field: 'email', width:'50%' },
{ name: nameColumn, field: 'name', width:'50%', formatter: escapeGridHtml },
{ name: emailColumn, field: 'email', width:'50%', formatter: escapeGridHtml },
]];

//Initialization kicking the loading of users
Expand Down Expand Up @@ -418,7 +430,7 @@
dijit.byId('userId').attr('value', user.id);
dijit.byId('userId').setDisabled(true);
} else {
dojo.byId('userIdValue').innerHTML = user.id;
dojo.byId('userIdValue').textContent = user.id;
dojo.byId('userId').value = user.id;
}

Expand Down Expand Up @@ -457,7 +469,9 @@

dijit.byId('password').attr('value', '********');
dijit.byId('passwordCheck').attr('value', '********');
dojo.query(".fullUserName").forEach(function (elem) { elem.innerHTML = user.name; });
// Render the user's name as text, never as HTML, to prevent stored XSS
// (first/last name are user-controlled). See dotCMS/private-issues#651.
dojo.query(".fullUserName").forEach(function (elem) { elem.textContent = user.name; });

userChanged = false;
newUser = false;
Expand Down
Loading