Skip to content

Node.js based forum software built for the modern web

fix: reject invalid cid in topic post route

Barış Soner Uşaklı35c4975f08da
diff --git a/public/src/utils.common.js b/public/src/utils.common.js
index 99b2cb41a0..fb9232f82a 100644
--- a/public/src/utils.common.js
+++ b/public/src/utils.common.js
@@ -354,6 +354,10 @@ const utils = {
},
isNumber: function (n) {
+ const typeOf = typeof n;
+ if (typeOf !== 'number' && typeOf !== 'string') {
+ return false;
+ }
// `isFinite('') === true` so isNan parseFloat check is necessary
return !isNaN(parseFloat(n)) && isFinite(n);
},
diff --git a/src/api/topics.js b/src/api/topics.js
index a970697e83..0a9d925449 100644
--- a/src/api/topics.js
+++ b/src/api/topics.js
@@ -50,7 +50,7 @@ topicsAPI.get = async function (caller, data) {
};
topicsAPI.create = async function (caller, data) {
- if (!data) {
+ if (!data || (!Number.isInteger(data.cid) && typeof data.cid !== 'string')) {
throw new Error('[[error:invalid-data]]');
}
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index 36e4f775fe..4680e4d042 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -152,8 +152,8 @@ privsCategories.isUserAllowedTo = async function (privilege, cid, uid) {
};
privsCategories.can = async function (privilege, cid, uid) {
- if (!cid) {
- return false;
+ if (!Number.isInteger(cid) && typeof cid !== 'string') {
+ return Array.isArray(privilege) ? privilege.map(() => false) : false;
}
const [disabled, isAdmin, isAllowed] = await Promise.all([
diff --git a/src/topics/create.js b/src/topics/create.js
index 8944bb7b09..28592e179e 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -94,12 +94,14 @@ module.exports = function (Topics) {
Topics.post = async function (data) {
data = await plugins.hooks.fire('filter:topic.post', data);
const { uid } = data;
+ const cid = String(data.cid);
const remoteUid = activitypub.helpers.isUri(uid);
-
- const [categoryExists, canCreate, canTag, isAdmin] = await Promise.all([
- parseInt(data.cid, 10) > 0 ? categories.exists(data.cid) : true,
- privileges.categories.can('topics:create', utils.isNumber(data.cid) ? data.cid : -1, remoteUid ? -2 : uid),
- privileges.categories.can('topics:tag', utils.isNumber(data.cid) ? data.cid : -1, remoteUid ? -2 : uid),
+ const isRemoteCid = !utils.isNumber(cid) || parseInt(cid, 10) === -1;
+ const [categoryExists, [canCreate, canTag], isAdmin] = await Promise.all([
+ isRemoteCid ? true : categories.exists(cid),
+ privileges.categories.can(
+ ['topics:create', 'topics:tag'], isRemoteCid ? -1 : cid, remoteUid ? -2 : uid
+ ),
privileges.users.isAdministrator(uid),
]);
@@ -118,8 +120,8 @@ module.exports = function (Topics) {
Topics.checkTitle(data.title);
}
- await Topics.validateTags(data.tags, data.cid, uid);
- data.tags = await Topics.filterTags(data.tags, data.cid);
+ await Topics.validateTags(data.tags, cid, uid);
+ data.tags = await Topics.filterTags(data.tags, cid);
if (!data.fromQueue && !isAdmin) {
Topics.checkContent(data.sourceContent || data.content);
if (!await posts.canUserPostContentWithLinks(uid, data.content)) {
@@ -137,7 +139,7 @@ module.exports = function (Topics) {
await guestHandleValid(data);
if (!data.fromQueue) {
- await user.isReadyToPost(uid, data.cid);
+ await user.isReadyToPost(uid, cid);
}
const tid = await Topics.create(data);
diff --git a/test/categories.js b/test/categories.js
index 984acefda3..51bc8b0443 100644
--- a/test/categories.js
+++ b/test/categories.js
@@ -491,9 +491,20 @@ describe('Categories', () => {
assert.deepStrictEqual(privilegesArray, [true, false]);
});
+ it('should return false cid is an array', async () => {
+ assert.deepStrictEqual(
+ await privileges.categories.can(['topics:create', 'topics:delete'], [categoryObj.cid], posterUid),
+ [false, false]
+ );
+ assert.strictEqual(
+ await privileges.categories.can('topics:create', [categoryObj.cid], posterUid),
+ false
+ );
+ });
+
it('should error if both cid and privilege are arrays', async () => {
await assert.rejects(
- privileges.categories.can(['topics:create', 'topics:delete'], [categoryObj.cid], posterUid),
+ privileges.categories.isUserAllowedTo(['topics:create', 'topics:delete'], [categoryObj.cid], posterUid),
{ message: '[[error:invalid-data]]' },
);
});
diff --git a/test/topics.js b/test/topics.js
index 551e880649..3214fedfc9 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -163,6 +163,43 @@ describe('Topic\'s', () => {
assert.strictEqual(result.body.status.message, 'You do not have enough privileges for this action.');
});
+ it('should fail to post a topic as guest with invalid cid', async () => {
+ const categoryObj = await categories.create({
+ name: 'Test Category',
+ description: 'Test category created by testing script',
+ });
+ const jar = request.jar();
+ const result1 = await helpers.request('post', '/api/v3/topics', {
+ body: {
+ title: 'just a title',
+ cid: [categoryObj.cid],
+ content: 'content for the main post',
+ },
+ jar: jar,
+ });
+ assert.strictEqual(result1.body.status.message, 'Invalid Data');
+
+ const result2 = await helpers.request('post', '/api/v3/topics', {
+ body: {
+ title: 'just a title',
+ cid: { cid: categoryObj.cid },
+ content: 'content for the main post',
+ },
+ jar: jar,
+ });
+ assert.strictEqual(result2.body.status.message, 'Invalid Data');
+
+ const result3 = await helpers.request('post', '/api/v3/topics', {
+ body: {
+ title: 'just a title',
+ cid: 0,
+ content: 'content for the main post',
+ },
+ jar: jar,
+ });
+ assert.strictEqual(result3.body.status.message, 'Category does not exist');
+ });
+
it('should post a topic as guest if guest group has privileges', async () => {
const categoryObj = await categories.create({
name: 'Test Category',
diff --git a/test/utils.js b/test/utils.js
index 614ca9f9a2..ebb19f1297 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -35,6 +35,25 @@ describe('Utility Methods', () => {
done();
});
+ it('isNumber should return true for numbers false for everything else', (done) => {
+ assert.strictEqual(utils.isNumber(1), true);
+ assert.strictEqual(utils.isNumber(0), true);
+ assert.strictEqual(utils.isNumber('1'), true);
+ assert.strictEqual(utils.isNumber('1.1'), true);
+ assert.strictEqual(utils.isNumber('0'), true);
+
+ assert.strictEqual(utils.isNumber('1asd'), false);
+ assert.strictEqual(utils.isNumber('asd1'), false);
+ assert.strictEqual(utils.isNumber('asd'), false);
+ assert.strictEqual(utils.isNumber([]), false);
+ assert.strictEqual(utils.isNumber([3]), false);
+ assert.strictEqual(utils.isNumber(false), false);
+ assert.strictEqual(utils.isNumber(null), false);
+ assert.strictEqual(utils.isNumber(undefined), false);
+ assert.strictEqual(utils.isNumber(''), false);
+ done();
+ });
+
it('should strip HTML tags', (done) => {
assert.strictEqual(utils.stripHTMLTags('<p>just <b>some</b> text</p>'), 'just some text');
assert.strictEqual(utils.stripHTMLTags('<p>just <b>some</b> text</p>', ['p']), 'just <b>some</b> text');