Skip to content

Node.js based forum software built for the modern web

fix: closes #14569, prevent socket.emit('admin.xxx') if

Barış Soner Uşaklı0d073823e966
diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index 14220f37ee..7cba2d528c 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -12,6 +12,10 @@ app.onDomReady();
(function () {
require(['hooks', 'admin/settings', 'admin/modules/relogin-timer'], (hooks, Settings, reloginTimer) => {
+ socket.on('event:admin.reloginRequired', () => {
+ reloginTimer.show();
+ });
+
hooks.on('action:ajaxify.end', (data) => {
updatePageTitle(data.url);
setupRestartLinks();
diff --git a/public/src/admin/modules/relogin-timer.js b/public/src/admin/modules/relogin-timer.js
index f8504b51a2..82afd2dba4 100644
--- a/public/src/admin/modules/relogin-timer.js
+++ b/public/src/admin/modules/relogin-timer.js
@@ -1,32 +1,28 @@
-import { translate } from 'translator';
-import { alert as bootboxAlert } from 'bootbox';
+import { alert as modalsAlert } from 'modals';
let logoutTimer = 0;
-let logoutMessage;
-
+let alertShown = false;
export function start(adminReloginDuration) {
clearTimer();
if (adminReloginDuration <= 0) {
return;
}
- // pre-translate language string gh#9046
- if (!logoutMessage) {
- translate('[[login:logged-out-due-to-inactivity]]', function (translated) {
- logoutMessage = translated;
- });
- }
-
const timeoutMs = adminReloginDuration * 60000;
- logoutTimer = setTimeout(function () {
- bootboxAlert({
+ logoutTimer = setTimeout(show, timeoutMs);
+}
+
+export function show() {
+ if (!alertShown) {
+ modalsAlert({
closeButton: false,
- message: logoutMessage,
+ message: '[[login:logged-out-due-to-inactivity]]',
callback: function () {
window.location.reload();
},
});
- }, timeoutMs);
+ alertShown = true;
+ }
}
function clearTimer() {
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index db7438e681..872492d5b7 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -33,23 +33,39 @@ SocketAdmin.errors = require('./admin/errors');
SocketAdmin.digest = require('./admin/digest');
SocketAdmin.cache = require('./admin/cache');
-SocketAdmin.before = async function (socket, method) {
+async function checkAdminPrivileges(socket, method) {
const isAdmin = await user.isAdministrator(socket.uid);
if (isAdmin) {
- return;
+ return true;
}
-
// Check admin privileges mapping (if not in mapping, deny access)
- const privilegeSet = privileges.admin.socketMap.hasOwnProperty(method) ? privileges.admin.socketMap[method].split(';') : [];
+ const privilegeSet = privileges.admin.socketMap.hasOwnProperty(method) ?
+ privileges.admin.socketMap[method].split(';') :
+ [];
const hasPrivilege = (await Promise.all(privilegeSet.map(
async privilege => privileges.admin.can(privilege, socket.uid)
))).some(Boolean);
+
if (privilegeSet.length && hasPrivilege) {
- return;
+ return true;
+ }
+ return false;
+}
+
+SocketAdmin.before = async function (socket, method) {
+ if (!await checkAdminPrivileges(socket, method)) {
+ winston.warn(`[socket.io] Call to admin method ( ${method} ) blocked (accessed by uid ${socket.uid})`);
+ throw new Error('[[error:no-privileges]]');
}
- winston.warn(`[socket.io] Call to admin method ( ${method} ) blocked (accessed by uid ${socket.uid})`);
- throw new Error('[[error:no-privileges]]');
+ const session = socket.request?.session || {};
+ const loginTime = session?.meta ? session.meta.datetime : 0;
+ const adminReloginDuration = meta.config.adminReloginDuration * 60000;
+ const disabled = meta.config.adminReloginDuration === 0;
+ if (!disabled && (!loginTime || parseInt(loginTime, 10) <= Date.now() - adminReloginDuration)) {
+ socket.emit('event:admin.reloginRequired');
+ throw new Error('[[login:logged-out-due-to-inactivity]]');
+ }
};
SocketAdmin.restart = async function (socket) {