Node.js based forum software built for the modern web
fix: dont allow global mods gdpr export
Barış Soner Uşaklı39299bdbf53d
diff --git a/src/api/users.js b/src/api/users.jsindex 4d8a50d885..8f8e7a7f9c 100644--- a/src/api/users.js+++ b/src/api/users.js@@ -696,9 +696,26 @@ const prepareExport = async ({ uid, type }) => {}};-usersAPI.checkExportByType = async (caller, { uid, type }) => await prepareExport({ uid, type });+async function checkExportPrivileges(uid, targetUid) {+ if (String(uid) === String(targetUid)) {+ return;+ }+ const [isAdmin, hadAdminUsersPrivilege] = await Promise.all([+ privileges.users.isAdministrator(uid),+ privileges.admin.can('admin:users', uid),+ ]);+ if (!isAdmin && !hadAdminUsersPrivilege) {+ throw new Error('[[error:no-privileges]]');+ }+}++usersAPI.checkExportByType = async (caller, { uid, type }) => {+ await checkExportPrivileges(caller.uid, uid);+ await prepareExport({ uid, type });+};usersAPI.getExportByType = async (caller, { uid, type }) => {+ await checkExportPrivileges(caller.uid, uid);const [extension, mime] = exportMetadata.get(type);const filename = `${uid}_${type}.${extension}`;@@ -711,6 +728,7 @@ usersAPI.getExportByType = async (caller, { uid, type }) => {};usersAPI.generateExport = async (caller, { uid, type }) => {+ await checkExportPrivileges(caller.uid, uid);const validTypes = ['profile', 'posts', 'uploads'];if (!validTypes.includes(type)) {throw new Error('[[error:invalid-data]]');diff --git a/src/notifications.js b/src/notifications.jsindex 095665683e..9eb5c570bf 100644--- a/src/notifications.js+++ b/src/notifications.js@@ -406,13 +406,14 @@ Notifications.markUnread = async function (nid, uid) {User.notifications.ownsNids([nid], uid),]);if (!notification || !userOwns) {- throw new Error('[[error:no-notification]]');+ return;}- notification.datetime = notification.datetime || Date.now();++ const timestamp = notification.datetime || Date.now();await Promise.all([db.sortedSetRemove(`uid:${uid}:notifications:read`, nid),- db.sortedSetAdd(`uid:${uid}:notifications:unread`, notification.datetime, nid),+ db.sortedSetAdd(`uid:${uid}:notifications:unread`, timestamp, nid),]);};@@ -422,18 +423,20 @@ Notifications.markReadMultiple = async function (nids, uid) {return;}const userOwns = await User.notifications.ownsNids(nids, uid);- if (userOwns.some(owns => !owns)) {- throw new Error('[[error:no-notification]]');- }- let notificationKeys = nids.map(nid => `notifications:${nid}`);- let mergeIds = await db.getObjectsFields(notificationKeys, ['mergeId']);+ nids = nids.filter((nid, index) => userOwns[index]);+ let mergeIds = await db.getObjectsFields(+ nids.map(nid => `notifications:${nid}`),+ ['mergeId']+ );// Isolate mergeIds and find related notificationsmergeIds = _.uniq(mergeIds.map(set => set.mergeId));const relatedNids = await Notifications.findRelated(mergeIds, `uid:${uid}:notifications:unread`);- notificationKeys = _.union(nids, relatedNids).map(nid => `notifications:${nid}`);- let notificationData = await db.getObjectsFields(notificationKeys, ['nid', 'datetime']);+ let notificationData = await db.getObjectsFields(+ _.union(nids, relatedNids).map(nid => `notifications:${nid}`),+ ['nid', 'datetime']+ );notificationData = notificationData.filter(n => n && n.nid);nids = notificationData.map(n => n.nid);diff --git a/src/routes/write/users.js b/src/routes/write/users.jsindex 139ed483c3..6b92c9bb83 100644--- a/src/routes/write/users.js+++ b/src/routes/write/users.js@@ -57,9 +57,9 @@ function authenticatedRoutes() {setupApiRoute(router, 'get', '/:uid/emails/:email', [...middlewares, middleware.assert.user], controllers.write.users.getEmail);setupApiRoute(router, 'post', '/:uid/emails/:email/confirm', [...middlewares, middleware.assert.user], controllers.write.users.confirmEmail);- setupApiRoute(router, 'head', '/:uid/exports/:type', [...middlewares, middleware.assert.user, middleware.checkAccountPermissions], controllers.write.users.checkExportByType);- setupApiRoute(router, 'get', '/:uid/exports/:type', [...middlewares, middleware.assert.user, middleware.checkAccountPermissions], controllers.write.users.getExportByType);- setupApiRoute(router, 'post', '/:uid/exports/:type', [...middlewares, middleware.assert.user, middleware.checkAccountPermissions], controllers.write.users.generateExportsByType);+ setupApiRoute(router, 'head', '/:uid/exports/:type', [...middlewares, middleware.assert.user], controllers.write.users.checkExportByType);+ setupApiRoute(router, 'get', '/:uid/exports/:type', [...middlewares, middleware.assert.user], controllers.write.users.getExportByType);+ setupApiRoute(router, 'post', '/:uid/exports/:type', [...middlewares, middleware.assert.user], controllers.write.users.generateExportsByType);// Shorthand route to access user routes by userslugrouter.all('/+bySlug/:userslug*?', [], controllers.write.users.redirectBySlug);diff --git a/test/notifications.js b/test/notifications.jsindex 8b29abc55b..de2bf7a83d 100644--- a/test/notifications.js+++ b/test/notifications.js@@ -148,13 +148,6 @@ describe('Notifications', () => {await socketNotifications.markUnread({ uid: uid }, null);});- it('should error if notification does not exist', async () => {- await assert.rejects(- socketNotifications.markUnread({ uid: uid }, 123123),- { message: '[[error:no-notification]]' }- );- });-it('should mark a notification unread', async () => {await socketNotifications.markUnread({ uid: uid }, notification.nid);@@ -227,14 +220,16 @@ describe('Notifications', () => {it('should not mark unread/read if notification does not belong to user', async () => {const uid = await user.create({ username: utils.generateUUID().slice(0, 8) });- await assert.rejects(- api.notifications.markUnread({ uid: uid }, { nid: notification.nid }),- { message: '[[error:no-notification]]' },+ await api.notifications.markUnread({ uid: uid }, { nid: notification.nid });+ assert.strictEqual(+ await db.isSortedSetMember(`uid:${uid}:notifications:unread`, notification.nid),+ false);- await assert.rejects(- api.notifications.markRead({ uid: uid }, { nid: notification.nid }),- { message: '[[error:no-notification]]' },+ await api.notifications.markRead({ uid: uid }, { nid: notification.nid }),+ assert.strictEqual(+ await db.isSortedSetMember(`uid:${uid}:notifications:read`, notification.nid),+ false,);});