Skip to content

Node.js based forum software built for the modern web

fix: password confirm modals for admin add/remove

Barış Soner Uşaklı9b72ca37aea2
diff --git a/public/src/admin/manage/admins-mods.js b/public/src/admin/manage/admins-mods.js
index 4298929ee4..6937cced33 100644
--- a/public/src/admin/manage/admins-mods.js
+++ b/public/src/admin/manage/admins-mods.js
@@ -6,8 +6,13 @@ define('admin/manage/admins-mods', [
const AdminsMods = {};
AdminsMods.init = function () {
- autocomplete.user($('#admin-search'), function (ev, ui) {
- api.put(`/groups/administrators/membership/${ui.item.user.uid}`).then(() => {
+ autocomplete.user($('#admin-search'), async function (ev, ui) {
+ const password = await modals.promptPassword();
+ if (!password) {
+ return;
+ }
+
+ api.put(`/groups/administrators/membership/${ui.item.user.uid}`, { password }).then(() => {
$('#admin-search').val('');
if ($('.administrator-area [data-uid="' + ui.item.user.uid + '"]').length) {
@@ -20,19 +25,19 @@ define('admin/manage/admins-mods', [
}).catch(alerts.error);
});
- $('.administrator-area').on('click', '.remove-user-icon', function () {
+ $('.administrator-area').on('click', '.remove-user-icon', async function () {
const userCard = $(this).parents('[data-uid]');
const uid = userCard.attr('data-uid');
if (parseInt(uid, 10) === parseInt(app.user.uid, 10)) {
return alerts.error('[[admin/manage/users:alerts.no-remove-yourself-admin]]');
}
- modals.confirm('[[admin/manage/users:alerts.confirm-remove-admin]]', function (confirm) {
- if (confirm) {
- api.del(`/groups/administrators/membership/${uid}`).then(() => {
- userCard.remove();
- }).catch(alerts.error);
- }
- });
+ const password = await modals.promptPassword();
+ if (!password) {
+ return;
+ }
+ api.del(`/groups/administrators/membership/${uid}`, {}, { 'x-password-confirmation': password }).then(() => {
+ userCard.remove();
+ }).catch(alerts.error);
});
autocomplete.user($('#global-mod-search'), function (ev, ui) {
diff --git a/public/src/admin/manage/api.js b/public/src/admin/manage/api.js
index 75a86d5fdf..57a8abeb1f 100644
--- a/public/src/admin/manage/api.js
+++ b/public/src/admin/manage/api.js
@@ -103,10 +103,7 @@ define('admin/manage/api', [
try {
let password;
if (isMasterToken) {
- password = await modals.promptPassword({
- title: '[[user:current-password]]',
- message: '[[user:emailUpdate.password-challenge]]',
- });
+ password = await modals.promptPassword();
if (!password) {
return false;
}
diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index 597db188bc..99f230032a 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -135,20 +135,16 @@ define('admin/manage/group', [
switch (action) {
case 'toggleOwnership':
- api[isOwner ? 'del' : 'put'](`/groups/${ajaxify.data.group.slug}/ownership/${uid}`, {}).then(() => {
+ memberList.toggleOwnership(ajaxify.data.group.slug, uid, isOwner).then(() => {
ownerFlagEl.toggleClass('invisible');
+ userRow.attr('data-isowner', isOwner ? '0' : '1');
}).catch(alerts.error);
break;
case 'kick':
- modals.confirm('[[admin/manage/groups:edit.confirm-remove-user]]', function (confirm) {
- if (!confirm) {
- return;
- }
- api.del('/groups/' + ajaxify.data.group.slug + '/membership/' + uid).then(() => {
- userRow.slideUp().remove();
- }).catch(alerts.error);
- });
+ memberList.kickMember(ajaxify.data.group.slug, uid).then(() => {
+ userRow.remove();
+ }).catch(alerts.error);
break;
default:
break;
diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index ee55689f8c..9f2bbaeb8f 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -81,27 +81,19 @@ define('forum/groups/details', [
switch (action) {
case 'toggleOwnership':
- api[isOwner ? 'del' : 'put'](`/groups/${ajaxify.data.group.slug}/ownership/${encodeURIComponent(uid)}`, {}).then(() => {
+ memberList.toggleOwnership(ajaxify.data.group.slug, uid, isOwner).then(() => {
ownerFlagEl.toggleClass('invisible');
userRow.attr('data-isowner', isOwner ? '0' : '1');
}).catch(alerts.error);
break;
case 'kick':
- modals.confirm('[[groups:details.kick-confirm]]', function (confirm) {
- if (!confirm) {
- return;
- }
-
- api.del(`/groups/${ajaxify.data.group.slug}/membership/${encodeURIComponent(uid)}`, undefined).then(
- () => {
- userRow.remove();
- $('[component="group/member/count"]').text(
- helpers.humanReadableNumber(ajaxify.data.group.memberCount - 1)
- );
- }
- ).catch(alerts.error);
- });
+ memberList.kickMember(ajaxify.data.group.slug, uid).then(() => {
+ userRow.remove();
+ $('[component="group/member/count"]').text(
+ helpers.humanReadableNumber(ajaxify.data.group.memberCount - 1)
+ );
+ }).catch(alerts.error);
break;
case 'update':
@@ -325,25 +317,40 @@ define('forum/groups/details', [
}
const searchInput = $('[component="groups/members/invite"]');
require(['autocomplete'], function (autocomplete) {
- autocomplete.user(searchInput, function (event, selected) {
- api.post(`/groups/${ajaxify.data.group.slug}/invites/${selected.item.user.uid}`).then(() => updateList()).catch(alerts.error);
+ autocomplete.user(searchInput, async function (event, selected) {
+ const isAdminGroup = ajaxify.data.group.slug === 'administrators';
+ const password = isAdminGroup && await modals.promptPassword();
+ if (isAdminGroup && !password) {
+ return;
+ }
+ api.post(`/groups/${ajaxify.data.group.slug}/invites/${selected.item.user.uid}`, { password })
+ .then(() => updateList()).catch(alerts.error);
});
});
$('[component="groups/members/bulk-invite-button"]').on('click', async () => {
- let usernames = $('[component="groups/members/bulk-invite"]').val();
+ const usernames = $('[component="groups/members/bulk-invite"]').val();
if (!usernames) {
return false;
}
-
+ const isAdminGroup = ajaxify.data.group.slug === 'administrators';
+ const password = isAdminGroup && await modals.promptPassword();
+ if (isAdminGroup && !password) {
+ return;
+ }
// Filter out bad usernames
- usernames = usernames.split(',').map(username => slugify(username));
- usernames = await Promise.all(usernames.map(slug => api.head(`/users/bySlug/${slug}`).then(() => slug).catch(() => false)));
- usernames = usernames.filter(Boolean);
-
- const uids = await Promise.all(usernames.map(slug => api.get(`/users/bySlug/${slug}`).then(({ uid }) => uid)));
-
- await Promise.all(uids.map(async uid => api.post(`/groups/${ajaxify.data.group.slug}/invites/${uid}`))).then(() => {
+ const userslugs = usernames.split(',').map(slugify);
+ const validSlugs = (await Promise.all(
+ userslugs.map(slug => api.head(`/users/bySlug/${slug}`).then(() => slug).catch(() => false))
+ )).filter(Boolean);
+
+ const uids = await Promise.all(validSlugs.map(slug => api.get(`/users/bySlug/${slug}`).then(({ uid }) => uid)));
+
+ await Promise.all(
+ uids.map(async uid => api.post(`/groups/${ajaxify.data.group.slug}/invites/${uid}`, {
+ ...(password ? { password } : {}),
+ }))
+ ).then(() => {
updateList();
}).catch(alerts.error);
});
diff --git a/public/src/client/groups/memberlist.js b/public/src/client/groups/memberlist.js
index e3aab9f030..45ba1164cf 100644
--- a/public/src/client/groups/memberlist.js
+++ b/public/src/client/groups/memberlist.js
@@ -85,16 +85,10 @@ define('forum/groups/memberlist', [
}
async function addUsersToGroup(users) {
- 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;
- }
+ const password = isAdminGroup && await modals.promptPassword();
+ if (isAdminGroup && !password) {
+ return;
}
let addedUsers = [];
@@ -175,5 +169,27 @@ define('forum/groups/memberlist', [
});
}
+ MemberList.toggleOwnership = async function (groupslug, uid, isOwner) {
+ const isAdminGroup = groupslug === 'administrators';
+ const password = isAdminGroup && await modals.promptPassword();
+ if (isAdminGroup && !password) {
+ return;
+ }
+ return await api[isOwner ? 'del' : 'put'](`/groups/${groupslug}/ownership/${encodeURIComponent(uid)}`, {
+ ...(password ? { password } : {}),
+ });
+ };
+
+ MemberList.kickMember = async function (groupslug, uid) {
+ const isAdminGroup = groupslug === 'administrators';
+ const password = isAdminGroup && await modals.promptPassword();
+ if (isAdminGroup && !password) {
+ return;
+ }
+ return await api.del(`/groups/${groupslug}/membership/${encodeURIComponent(uid)}`, {}, {
+ 'x-password-confirmation': password,
+ });
+ };
+
return MemberList;
});
diff --git a/public/src/modules/api.js b/public/src/modules/api.js
index d76b124aca..a5fb4c8f58 100644
--- a/public/src/modules/api.js
+++ b/public/src/modules/api.js
@@ -116,46 +116,31 @@ export function head(route, data, onSuccess) {
}, onSuccess);
}
-export function post(route, data, onSuccess) {
- return call({
- url: route,
- method: 'POST',
- data,
- headers: {
- 'x-csrf-token': config.csrf_token,
- },
- }, onSuccess);
+export function post(route, data, headers, onSuccess) {
+ return callWithHeaders('POST', route, data, headers, onSuccess);
}
-export function patch(route, data, onSuccess) {
- return call({
- url: route,
- method: 'PATCH',
- data,
- headers: {
- 'x-csrf-token': config.csrf_token,
- },
- }, onSuccess);
+export function patch(route, data, headers, onSuccess) {
+ return callWithHeaders('PATCH', route, data, headers, onSuccess);
}
-export function put(route, data, onSuccess) {
- return call({
- url: route,
- method: 'PUT',
- data,
- headers: {
- 'x-csrf-token': config.csrf_token,
- },
- }, onSuccess);
+export function put(route, data, headers, onSuccess) {
+ return callWithHeaders('PUT', route, data, headers, onSuccess);
}
-export function del(route, data, onSuccess) {
+export function del(route, data, headers, onSuccess) {
+ return callWithHeaders('DELETE', route, data, headers, onSuccess);
+}
+
+function callWithHeaders(method, route, data, headers, onSuccess) {
+ typeof headers === 'function' && (onSuccess = headers, headers = {});
return call({
url: route,
- method: 'DELETE',
+ method,
data,
headers: {
'x-csrf-token': config.csrf_token,
+ ...headers,
},
}, onSuccess);
-}
+}
\ No newline at end of file
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 7013d7be30..98ba3e3b1a 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -352,7 +352,7 @@ middleware.checkRequired = function (fields, req, res, next) {
};
middleware.requirePasswordAuth = helpers.try(async function (req, res, next) {
- const { password } = req.body;
+ const password = req.body?.password ?? req.headers['x-password-confirmation'];
if (!password) {
throw new Error('[[error:invalid-password]]');
}
diff --git a/src/routes/write/groups.js b/src/routes/write/groups.js
index 083bc71950..507a60ca3c 100644
--- a/src/routes/write/groups.js
+++ b/src/routes/write/groups.js
@@ -40,7 +40,7 @@ module.exports = function () {
setupApiRoute(router, 'delete', '/:slug/pending/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.reject);
setupApiRoute(router, 'get', '/:slug/invites', [...middlewares, middleware.assert.group], controllers.write.groups.getInvites);
- setupApiRoute(router, 'post', '/:slug/invites/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.issueInvite);
+ setupApiRoute(router, 'post', '/:slug/invites/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.issueInvite);
setupApiRoute(router, 'put', '/:slug/invites/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.acceptInvite);
setupApiRoute(router, 'delete', '/:slug/invites/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.rejectInvite);