Skip to content

Node.js based forum software built for the modern web

refactor: make requirePassword middleware

Barış Soner Uşaklıae87aea498b4
diff --git a/public/src/client/groups/memberlist.js b/public/src/client/groups/memberlist.js
index e3d4de4bc0..e3aab9f030 100644
--- a/public/src/client/groups/memberlist.js
+++ b/public/src/client/groups/memberlist.js
@@ -85,15 +85,33 @@ define('forum/groups/memberlist', [
}
async function addUsersToGroup(users) {
- const uids = users.map(u => u.uid);
- for (const uid of uids) {
- // eslint-disable-next-line no-await-in-loop
- await api.put(`/groups/${ajaxify.data.group.slug}/membership/${uid}`, {})
- .catch(alerts.error);
+ let password;
+ const isAdminGroup = ajaxify.data.group.slug === 'administrators';
+ if (isAdminGroup) {
+ password = await modals.promptPassword({
+ title: '[[user:current-password]]',
+ message: '[[user:emailUpdate.password-challenge]]',
+ });
+ if (!password) {
+ return;
+ }
}
- users = users.filter(user => !$('[component="groups/members"] [data-uid="' + user.uid + '"]').length);
- const html = await parseAndTranslate(users);
+ let addedUsers = [];
+ for (const user of users) {
+ try {
+ // eslint-disable-next-line no-await-in-loop
+ await api.put(`/groups/${ajaxify.data.group.slug}/membership/${user.uid}`, {
+ ...(isAdminGroup ? { password } : {}),
+ });
+ addedUsers.push(user);
+ } catch (err) {
+ alerts.error(err);
+ }
+ }
+ const membersEl = $('[component="groups/members"]');
+ addedUsers = addedUsers.filter(user => !membersEl.find(`[data-uid="${user.uid}"]`).length);
+ const html = await parseAndTranslate(addedUsers);
$('[component="groups/members"] tbody').prepend(html);
}
diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.js
index bbab1f0345..fefe54a691 100644
--- a/src/controllers/write/admin.js
+++ b/src/controllers/write/admin.js
@@ -7,7 +7,6 @@ const messaging = require('../../messaging');
const events = require('../../events');
const activitypub = require('../../activitypub');
const utils = require('../../utils');
-const user = require('../../user');
const Admin = module.exports;
@@ -37,17 +36,6 @@ Admin.getAnalyticsData = async (req, res) => {
Admin.generateToken = async (req, res) => {
const uid = String(req.body.uid).trim();
- if (uid === '0') {
- const { password } = req.body;
- if (!password) {
- throw new Error('[[error:invalid-password]]');
- }
-
- const validPassword = await user.isPasswordCorrect(req.uid, password, req.ip);
- if (!validPassword) {
- throw new Error('[[error:invalid-password]]');
- }
- }
const { description } = req.body;
const token = await api.utils.tokens.generate({ uid, description });
await events.log({
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 7a480b2073..0c007c8ed6 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -343,10 +343,26 @@ middleware.checkRequired = function (fields, req, res, next) {
);
};
+middleware.requirePasswordAuth = helpers.try(async function (req, res, next) {
+ const { password } = req.body;
+ if (!password) {
+ throw new Error('[[error:invalid-password]]');
+ }
+
+ const validPassword = await user.isPasswordCorrect(req.uid, password, req.ip);
+ if (!validPassword) {
+ throw new Error('[[error:invalid-password]]');
+ }
+ if (req.session?.meta) {
+ req.session.meta.reAuthAt = Date.now();
+ }
+ next();
+});
+
// handles both cold load(/foo/baz) and ajaxify(/api/foo/baz) for regular routes
// cold load /foo/baz => returnTo /foo/baz
// ajaxify /api/foo/baz => returnTo /foo/baz
-middleware.requirePageReAuth = function ({ maxAgeInMinutes = 5 } = {}) {
+middleware.requirePageReAuth = function ({ maxAgeInMinutes = 2 } = {}) {
async function redirect(req, res) {
if (res.locals.isAPI) {
req.session.returnTo = req.url.replace(/^\/api/, '');
diff --git a/src/routes/write/admin.js b/src/routes/write/admin.js
index 29967c1677..8033b92050 100644
--- a/src/routes/write/admin.js
+++ b/src/routes/write/admin.js
@@ -14,8 +14,18 @@ module.exports = function () {
setupApiRoute(router, 'get', '/analytics', [...middlewares], controllers.write.admin.getAnalyticsKeys);
setupApiRoute(router, 'get', '/analytics/:set', [...middlewares], controllers.write.admin.getAnalyticsData);
-
- setupApiRoute(router, 'post', '/tokens', [...middlewares, middleware.requireAPIReAuth()], controllers.write.admin.generateToken);
+ const requireAPIReAuth = middleware.requireAPIReAuth();
+ async function tokenCreateMiddleware(req, res, next) {
+ const uid = String(req.body.uid).trim();
+ if (uid === '0') {
+ // creating master token requires password
+ await middleware.requirePasswordAuth(req, res, next);
+ } else {
+ await requireAPIReAuth(req, res, next);
+ }
+ }
+
+ setupApiRoute(router, 'post', '/tokens', [...middlewares, tokenCreateMiddleware], controllers.write.admin.generateToken);
setupApiRoute(router, 'get', '/tokens/:token', [...middlewares], controllers.write.admin.getToken);
setupApiRoute(router, 'put', '/tokens/:token', [...middlewares], controllers.write.admin.updateToken);
setupApiRoute(router, 'delete', '/tokens/:token', [...middlewares], controllers.write.admin.deleteToken);
diff --git a/src/routes/write/groups.js b/src/routes/write/groups.js
index 0f05d55206..083bc71950 100644
--- a/src/routes/write/groups.js
+++ b/src/routes/write/groups.js
@@ -13,6 +13,14 @@ module.exports = function () {
maxAgeInMinutes: 5,
});
+ async function groupReAuthMiddleware(req, res, next) {
+ if (req.params.slug === 'administrators') {
+ await middleware.requirePasswordAuth(req, res, next);
+ } else {
+ await groupsReAuth(req, res, next);
+ }
+ }
+
setupApiRoute(router, 'get', '/', [], controllers.write.groups.list);
setupApiRoute(router, 'post', '/', [...middlewares, middleware.checkRequired.bind(null, ['name'])], controllers.write.groups.create);
setupApiRoute(router, 'head', '/:slug', [middleware.assert.group], controllers.write.groups.exists);
@@ -21,11 +29,11 @@ module.exports = function () {
setupApiRoute(router, 'get', '/:slug/members', [...middlewares, middleware.assert.group], controllers.write.groups.listMembers);
- setupApiRoute(router, 'put', '/:slug/membership/:uid', [...middlewares, groupsReAuth, middleware.assert.group], controllers.write.groups.join);
- setupApiRoute(router, 'delete', '/:slug/membership/:uid', [...middlewares, groupsReAuth, middleware.assert.group], controllers.write.groups.leave);
+ setupApiRoute(router, 'put', '/:slug/membership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.join);
+ setupApiRoute(router, 'delete', '/:slug/membership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.leave);
- setupApiRoute(router, 'put', '/:slug/ownership/:uid', [...middlewares, groupsReAuth, middleware.assert.group], controllers.write.groups.grant);
- setupApiRoute(router, 'delete', '/:slug/ownership/:uid', [...middlewares, groupsReAuth, middleware.assert.group], controllers.write.groups.rescind);
+ setupApiRoute(router, 'put', '/:slug/ownership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.grant);
+ setupApiRoute(router, 'delete', '/:slug/ownership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.rescind);
setupApiRoute(router, 'get', '/:slug/pending', [...middlewares, middleware.assert.group], controllers.write.groups.getPending);
setupApiRoute(router, 'put', '/:slug/pending/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.accept);
diff --git a/src/views/admin/manage/api.tpl b/src/views/admin/manage/api.tpl
index 1734a68fc8..1e45da2704 100644
--- a/src/views/admin/manage/api.tpl
+++ b/src/views/admin/manage/api.tpl
@@ -18,12 +18,11 @@
<p class="lead">[[admin/settings/api:lead-text]]</p>
<p>[[admin/settings/api:intro]]</p>
<p class="text-danger">[[admin/settings/api:warning]]</p>
- <p class="d-flex flex-column gap-2">
+ <p class="d-flex flex-column gap-2 mb-4">
<a href="https://docs.nodebb.org/api">
<i class="fa fa-external-link"></i>
[[admin/settings/api:docs]]
</a>
- <br />
<a href="https://docs.nodebb.org/api/write">
<i class="fa fa-external-link"></i>
[[admin/settings/api:docs.write]]
diff --git a/src/views/admin/partials/groups/add-members.tpl b/src/views/admin/partials/groups/add-members.tpl
index 2127b072ea..b365212ca7 100644
--- a/src/views/admin/partials/groups/add-members.tpl
+++ b/src/views/admin/partials/groups/add-members.tpl
@@ -3,6 +3,6 @@
<div class="list-group" id="search-result">
{{{each users}}}
- <a href="#" class="list-group-item" data-username="{users.username}" data-uid="{users.uid}"><i class="fa fa-fw fa-check invisible"></i> {users.username}</a>
+ <a href="#" class="list-group-item list-group-item-action" data-username="{users.username}" data-uid="{users.uid}">{users.username} <i class="fa fa-fw fa-check invisible"></i></a>
{{{end}}}
</div>