Node.js based forum software built for the modern web
refactor: canExportData check
Barış Soner Uşaklı304665dea003
diff --git a/src/api/users.js b/src/api/users.jsindex 8f8e7a7f9c..358e8e214a 100644--- a/src/api/users.js+++ b/src/api/users.js@@ -696,26 +696,17 @@ const prepareExport = async ({ 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) {+usersAPI.checkExportByType = async (caller, { uid, type }) => {+ if (!await privileges.users.canExportData(caller.uid, uid)) {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);+ if (!await privileges.users.canExportData(caller.uid, uid)) {+ throw new Error('[[error:no-privileges]]');+ }const [extension, mime] = exportMetadata.get(type);const filename = `${uid}_${type}.${extension}`;@@ -728,7 +719,9 @@ usersAPI.getExportByType = async (caller, { uid, type }) => {};usersAPI.generateExport = async (caller, { uid, type }) => {- await checkExportPrivileges(caller.uid, uid);+ if (!await privileges.users.canExportData(caller.uid, uid)) {+ throw new Error('[[error:no-privileges]]');+ }const validTypes = ['profile', 'posts', 'uploads'];if (!validTypes.includes(type)) {throw new Error('[[error:invalid-data]]');diff --git a/src/controllers/accounts/consent.js b/src/controllers/accounts/consent.jsindex ecd8915bd7..ef97f7f33f 100644--- a/src/controllers/accounts/consent.js+++ b/src/controllers/accounts/consent.js@@ -3,6 +3,7 @@const db = require('../../database');const meta = require('../../meta');const helpers = require('../helpers');+const privileges = require('../../privileges');const consentController = module.exports;@@ -12,14 +13,17 @@ consentController.get = async function (req, res, next) {}const payload = res.locals.userData;const { username, userslug } = payload;- const consented = await db.getObjectField(`user:${res.locals.uid}`, 'gdpr_consent');+ const [consented, canExport] = await Promise.all([+ db.getObjectField(`user:${res.locals.uid}`, 'gdpr_consent'),+ privileges.users.canExportData(res.uid, res.locals.uid),+ ]);payload.gdpr_consent = parseInt(consented, 10) === 1;payload.digest = {frequency: meta.config.dailyDigestFreq || 'off',enabled: meta.config.dailyDigestFreq !== 'off',};-+ payload.canExport = canExport;payload.title = '[[user:consent.title]]';payload.breadcrumbs = helpers.buildBreadcrumbs([{ text: username, url: `/user/${userslug}` }, { text: '[[user:consent.title]]' }]);diff --git a/src/privileges/users.js b/src/privileges/users.jsindex 02b837d9d1..57b5a3cd0d 100644--- a/src/privileges/users.js+++ b/src/privileges/users.js@@ -143,6 +143,18 @@ privsUsers.canFlag = async function (callerUid, uid) {return { flag: canFlag };};+privsUsers.canExportData = async function (callerUid, uid) {+ if (String(callerUid) === String(uid)) {+ return true;+ }+ const privsAdmin = require('./admin');+ const [isAdmin, hadAdminUsersPrivilege] = await Promise.all([+ privsUsers.isAdministrator(uid),+ privsAdmin.can('admin:users', uid),+ ]);+ return isAdmin || hadAdminUsersPrivilege;+};+privsUsers.hasBanPrivilege = async uid => await hasGlobalPrivilege('ban', uid);privsUsers.hasMutePrivilege = async uid => await hasGlobalPrivilege('mute', uid);privsUsers.hasInvitePrivilege = async uid => await hasGlobalPrivilege('invite', uid);