Skip to content

Node.js based forum software built for the modern web

fix: escape cover:url/picture

Barış Soner Uşaklı6b281eddad1a
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index bb859d1ecf..a0856e47b8 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -128,6 +128,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})
userData.signature = escape(userData.signature);
userData.birthday = validator.escape(String(userData.birthday || ''));
userData.moderationNote = validator.escape(String(userData.moderationNote || ''));
+ userData['cover:url'] = validator.escape(String(userData['cover:url'] || ''));
userData['cover:position'] = validator.escape(String(userData['cover:position'] || '50% 50%'));
userData['username:disableEdit'] = !userData.isAdmin && meta.config['username:disableEdit'];
userData['email:disableEdit'] = !userData.isAdmin && meta.config['email:disableEdit'];
diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js
index 93be1d2b4e..156605917f 100644
--- a/src/controllers/accounts/profile.js
+++ b/src/controllers/accounts/profile.js
@@ -159,12 +159,12 @@ function addTags(res, userData) {
res.locals.metaTags.push(
{
property: 'og:image',
- content: userData.picture,
+ content: `${url}${userData.picture}`,
noEscape: true,
},
{
property: 'og:image:url',
- content: userData.picture,
+ content: `${url}${userData.picture}`,
noEscape: true,
}
);
diff --git a/src/user/data.js b/src/user/data.js
index dc80a259a1..7cbbb641e0 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -293,6 +293,10 @@ module.exports = function (User) {
user.picture = user.uploadedpicture;
}
}
+ if (user.picture) {
+ user.picture = validator.escape(String(user.picture || ''));
+ }
+
if (user.hasOwnProperty('cover:url')) {
user['cover:url'] = user['cover:url'] ?
prependRelativePath(user['cover:url']) :
diff --git a/test/uploads.js b/test/uploads.js
index 28ba9e3bf2..bb8c6baa76 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -346,6 +346,18 @@ describe('Upload Controllers', () => {
});
});
+ it('should escape cover:url when user profile is loaded', async () => {
+ await user.setUserField(1, 'cover:url', 'http://example.com/"><script>alert(1)</script>');
+ const { body: userData } = await helpers.request('get', '/api/user/admin');
+ assert.strictEqual(userData['cover:url'], 'http:&#x2F;&#x2F;example.com&#x2F;&quot;&gt;&lt;script&gt;alert(1)&lt;&#x2F;script&gt;');
+ });
+
+ it('should escape picture when user profile is loaded', async () => {
+ await user.setUserField(1, 'picture', 'http://example.com/"><script>alert(1)</script>');
+ const { body: userData } = await helpers.request('get', '/api/user/admin');
+ assert.strictEqual(userData['picture'], 'http:&#x2F;&#x2F;example.com&#x2F;&quot;&gt;&lt;script&gt;alert(1)&lt;&#x2F;script&gt;');
+ });
+
it('should delete users uploads if account is deleted', async () => {
const uid = await user.create({ username: 'uploader', password: 'barbar' });
const file = require('../src/file');