Node.js based forum software built for the modern web
fix: validate group hex colors
Barış Soner Uşaklıa30dfd18f020
diff --git a/src/groups/data.js b/src/groups/data.jsindex a1d34c0682..822affa05b 100644--- a/src/groups/data.js+++ b/src/groups/data.js@@ -1,6 +1,7 @@'use strict';const nconf = require('nconf');+const validator = require('validator');const db = require('../database');const plugins = require('../plugins');@@ -101,11 +102,13 @@ module.exports = function (Groups) {}if (hasField('labelColor')) {- group.labelColor = String(group.labelColor || '#000000');+ group.labelColor = validator.isHexColor(String(group.labelColor), { requireHash: true }) ?+ group.labelColor : '#000000';}if (hasField('textColor')) {- group.textColor = String(group.textColor || '#ffffff');+ group.textColor = validator.isHexColor(String(group.textColor), { requireHash: true }) ?+ group.textColor : '#ffffff';}if (hasField('icon')) {diff --git a/src/groups/update.js b/src/groups/update.jsindex 905d28d34d..9dfa61f07f 100644--- a/src/groups/update.js+++ b/src/groups/update.js@@ -1,6 +1,7 @@'use strict';const winston = require('winston');+const validator = require('validator');const categories = require('../categories');const plugins = require('../plugins');@@ -35,10 +36,16 @@ module.exports = function (Groups) {const payload = {description: values.description || '',icon: values.icon || '',- labelColor: values.labelColor || '#000000',- textColor: values.textColor || '#ffffff',};+ if (values.hasOwnProperty('labelColor')) {+ payload.labelColor = validateColor(values.labelColor, '#000000');+ }++ if (values.hasOwnProperty('textColor')) {+ payload.textColor = validateColor(values.textColor, '#ffffff');+ }+if (values.hasOwnProperty('userTitle')) {payload.userTitle = values.userTitle || '';}@@ -90,6 +97,14 @@ module.exports = function (Groups) {});};+ function validateColor(color, fallback) {+ color = String(color || fallback);+ if (!validator.isHexColor(color, { requireHash: true })) {+ throw new Error('[[error:invalid-data]]');+ }+ return color;+ };+async function updateVisibility(groupName, hidden) {if (hidden) {await db.sortedSetRemoveBulk([diff --git a/test/groups.js b/test/groups.jsindex 02432cff8c..dbf8aa4f06 100644--- a/test/groups.js+++ b/test/groups.js@@ -1318,6 +1318,24 @@ describe('Groups', () => {assert.equal(groupData.disableJoinRequests, true);assert.equal(groupData.private, false);});++ it('should fail to update group if color values are invalid', async () => {+ await Groups.create({ name: 'colortestgroup' });+ await assert.rejects(+ apiGroups.update({ uid: adminUid }, {+ slug: 'colortestgroup',+ labelColor: '#invalidcolor',+ }),+ { message: '[[error:invalid-data]]' }+ );+ await assert.rejects(+ apiGroups.update({ uid: adminUid }, {+ slug: 'colortestgroup',+ textColor: '#invalidcolor',+ }),+ { message: '[[error:invalid-data]]' }+ );+ });});describe('groups cover', () => {