Node.js based forum software built for the modern web
fix: crosspost remove bypass via cid type manipulation
Barış Soner Uşaklı1a90f8a4b530
diff --git a/src/api/topics.js b/src/api/topics.jsindex b77834c895..516c0d0d76 100644--- a/src/api/topics.js+++ b/src/api/topics.js@@ -295,6 +295,7 @@ topicsAPI.bump = async (caller, { tid }) => {topicsAPI.move = async (caller, { tid, cid }) => {const tids = Array.isArray(tid) ? tid : [tid];+ cid = String(cid);const [isAdmin, isModOfDestination, [canCreate, canRead], uids] = await Promise.all([privileges.users.isAdministrator(caller.uid),privileges.users.isModerator(caller.uid, cid),diff --git a/src/controllers/write/topics.js b/src/controllers/write/topics.jsindex 671de65fa0..a9a7dade9c 100644--- a/src/controllers/write/topics.js+++ b/src/controllers/write/topics.js@@ -227,7 +227,7 @@ Topics.getCrossposts = async (req, res) => {};Topics.crosspost = async (req, res) => {- const { cid } = req.body;+ const cid = String(req.body.cid);const crossposts = await topics.crossposts.add(req.params.tid, cid, req.uid);await activitypub.out.announce.topic(req.params.tid, req.uid, cid);@@ -235,7 +235,7 @@ Topics.crosspost = async (req, res) => {};Topics.uncrosspost = async (req, res) => {- const cid = req.body.cid || req.query.cid;+ const cid = String(req.body.cid || req.query.cid);const crossposts = await topics.crossposts.remove(req.params.tid, cid, req.uid);await activitypub.out.undo.announce('uid', req.uid, req.params.tid);diff --git a/src/flags.js b/src/flags.jsindex 94a7a890ba..c747555d85 100644--- a/src/flags.js+++ b/src/flags.js@@ -716,7 +716,7 @@ Flags.canView = async (flagId, uid) => {if (type === 'post') {const cid = await Flags.getTargetCid(type, targetId);- const isModerator = await user.isModerator(uid, cid);+ const isModerator = await user.isModerator(uid, String(cid));return isAdminOrGlobalMod || isModerator;}diff --git a/src/privileges/categories.js b/src/privileges/categories.jsindex 0c7e1eab9d..6b767ffb86 100644--- a/src/privileges/categories.js+++ b/src/privileges/categories.js@@ -118,7 +118,7 @@ privsCategories.get = async function (cid, uid) {'topics:create', 'topics:read', 'topics:schedule','topics:tag', 'read', 'posts:view_deleted',];-+ cid = String(cid);let [userPrivileges, isAdministrator, isModerator, disabled] = await Promise.all([helpers.isAllowedTo(privs, uid, cid),user.isAdministrator(uid),@@ -251,7 +251,7 @@ privsCategories.rescind = async function (privileges, cid, members) {privsCategories.canMoveAllTopics = async function (currentCid, targetCid, uid) {const [isAdmin, isModerators] = await Promise.all([user.isAdministrator(uid),- user.isModerator(uid, [currentCid, targetCid]),+ user.isModerator(uid, [String(currentCid), String(targetCid)]),]);return isAdmin || !isModerators.includes(false);};diff --git a/src/socket.io/categories.js b/src/socket.io/categories.jsindex 68e9f1942b..add1b4f744 100644--- a/src/socket.io/categories.js+++ b/src/socket.io/categories.js@@ -135,12 +135,6 @@ async function ignoreOrWatch(fn, socket, data) {return cids;}-SocketCategories.isModerator = async function (socket, cid) {- sockets.warnDeprecated(socket);-- return await user.isModerator(socket.uid, cid);-};-SocketCategories.loadMoreSubCategories = async function (socket, data) {sockets.warnDeprecated(socket, `GET /api/v3/categories/:cid/children`);diff --git a/src/topics/crossposts.js b/src/topics/crossposts.jsindex 7a2aa54309..e0a8717674 100644--- a/src/topics/crossposts.js+++ b/src/topics/crossposts.js@@ -99,7 +99,7 @@ Crossposts.add = async function (tid, cid, uid) {* NOTE: If uid is 0, the assumption is that it is a "system" crosspost, not a guest!* (Normally guest uid is 0)*/-+ cid = String(cid);// Target cid must existif (!utils.isNumber(cid)) {await activitypub.actors.assert(cid);@@ -191,6 +191,7 @@ Crossposts.queue = async function (tid, cid, uid) {};Crossposts.remove = async function (tid, cid, uid) {+ cid = String(cid);let crossposts = await Crossposts.get(tid);const [isPrivileged, isMod] = await Promise.all([user.isAdminOrGlobalMod(uid),diff --git a/test/categories.js b/test/categories.jsindex ed78befc1b..36080cb0f0 100644--- a/test/categories.js+++ b/test/categories.js@@ -320,14 +320,6 @@ describe('Categories', () => {});});- it('should check if user is moderator', (done) => {- socketCategories.isModerator({ uid: posterUid }, {}, (err, isModerator) => {- assert.ifError(err);- assert(!isModerator);- done();- });- });-it('should get category data', async () => {const data = await apiCategories.get({ uid: posterUid }, { cid: categoryObj.cid });assert.equal(categoryObj.cid, data.cid);diff --git a/test/user.js b/test/user.jsindex 60ef5bb072..bc423942da 100644--- a/test/user.js+++ b/test/user.js@@ -213,30 +213,21 @@ describe('User', () => {});describe('.isModerator()', () => {- it('should return false', (done) => {- User.isModerator(testUid, testCid, (err, isModerator) => {- assert.equal(err, null);- assert.equal(isModerator, false);- done();- });+ it('should return false', async () => {+ const isModerator = await User.isModerator(testUid, testCid);+ assert.strictEqual(isModerator, false);});- it('should return two false results', (done) => {- User.isModerator([testUid, testUid], testCid, (err, isModerator) => {- assert.equal(err, null);- assert.equal(isModerator[0], false);- assert.equal(isModerator[1], false);- done();- });+ it('should return two false results', async () => {+ const isModerator = await User.isModerator([testUid, testUid], testCid);+ assert.strictEqual(isModerator[0], false);+ assert.strictEqual(isModerator[1], false);});- it('should return two false results', (done) => {- User.isModerator(testUid, [testCid, testCid], (err, isModerator) => {- assert.equal(err, null);- assert.equal(isModerator[0], false);- assert.equal(isModerator[1], false);- done();- });+ it('should return two false results', async () => {+ const isModerator = await User.isModerator(testUid, [testCid, testCid]);+ assert.strictEqual(isModerator[0], false);+ assert.strictEqual(isModerator[1], false);});});