Node.js based forum software built for the modern web
feat: changing others emails requires password reauth, closes #14575
Barış Soner Uşaklı4ea6f9e3a26b
diff --git a/public/src/admin/modules/change-email.js b/public/src/admin/modules/change-email.jsindex a652890576..17d8befe25 100644--- a/public/src/admin/modules/change-email.js+++ b/public/src/admin/modules/change-email.js@@ -21,11 +21,13 @@ define('admin/modules/change-email', [change: {label: '[[admin/manage/users:alerts.button-change]]',className: 'btn-primary',- callback: function () {+ callback: async function () {+ const password = await modals.promptPassword();const newEmail = modal.find('#newEmail').val();- api.post('/users/' + params.uid + '/emails', {+ api.post(`/users/${params.uid}/emails`, {skipConfirmation: true,email: newEmail,+ password,}).then(() => {modal.modal('hide');params.onSuccess(newEmail);diff --git a/src/routes/write/users.js b/src/routes/write/users.jsindex ced9980b10..c2759089b1 100644--- a/src/routes/write/users.js+++ b/src/routes/write/users.js@@ -15,12 +15,21 @@ function guestRoutes() {function authenticatedRoutes() {const middlewares = [middleware.ensureLoggedIn];+ const requirePasswordForEmailChange = async function (req, res, next) {+ const isChangingSomeonesEmail = req?.body?.email && String(req.uid) !== String(req.params.uid);+ if (isChangingSomeonesEmail) {+ await middleware.requirePasswordAuth(req, res, next);+ } else {+ next();+ }+ };+setupApiRoute(router, 'post', '/', [...middlewares, middleware.checkRequired.bind(null, ['username'])], controllers.write.users.create);setupApiRoute(router, 'delete', '/', [...middlewares, middleware.checkRequired.bind(null, ['uids'])], controllers.write.users.deleteMany);setupApiRoute(router, 'head', '/:uid', [middleware.assert.user], controllers.write.users.exists);setupApiRoute(router, 'get', '/:uid', [...middlewares, middleware.assert.user], controllers.write.users.get);- setupApiRoute(router, 'put', '/:uid', [...middlewares, middleware.assert.user], controllers.write.users.update);+ setupApiRoute(router, 'put', '/:uid', [...middlewares, middleware.assert.user, requirePasswordForEmailChange], controllers.write.users.update);setupApiRoute(router, 'delete', '/:uid', [...middlewares, middleware.assert.user], controllers.write.users.delete);setupApiRoute(router, 'put', '/:uid/picture', [...middlewares, middleware.assert.user], controllers.write.users.changePicture);setupApiRoute(router, 'delete', '/:uid/content', [...middlewares, middleware.assert.user], controllers.write.users.deleteContent);@@ -53,7 +62,7 @@ function authenticatedRoutes() {setupApiRoute(router, 'get', '/:uid/invites/groups', [...middlewares, middleware.assert.user], controllers.write.users.getInviteGroups);setupApiRoute(router, 'get', '/:uid/emails', [...middlewares, middleware.assert.user], controllers.write.users.listEmails);- setupApiRoute(router, 'post', '/:uid/emails', [...middlewares, middleware.assert.user], controllers.write.users.addEmail);+ setupApiRoute(router, 'post', '/:uid/emails', [...middlewares, middleware.assert.user, requirePasswordForEmailChange], controllers.write.users.addEmail);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);diff --git a/src/user/auth.js b/src/user/auth.jsindex 847e40de75..f95057e28a 100644--- a/src/user/auth.js+++ b/src/user/auth.js@@ -130,7 +130,7 @@ module.exports = function (User) {const sids = await db.getSortedSetsMembers(uids.map(uid => `uid:${uid}:sessions`));const promises = [];uids.forEach((uid, index) => {- const ids = sids[index].filter(id => id !== except);+ const ids = except ? sids[index].filter(id => id !== except) : sids[index];if (ids.length) {promises.push(User.auth.revokeSession(ids, uid));}diff --git a/src/user/email.js b/src/user/email.jsindex 16ec7e04bc..6828da4092 100644--- a/src/user/email.js+++ b/src/user/email.js@@ -41,7 +41,7 @@ UserEmail.remove = async function (uid, sessionId) {['email:sorted', `${email.toLowerCase()}:${uid}`],]),user.email.expireValidation(uid),- sessionId ? user.auth.revokeAllSessions(uid, sessionId) : Promise.resolve(),+ user.auth.revokeAllSessions(uid, sessionId),events.log({targetUid: uid,type: 'email-change',