Skip to content

Node.js based forum software built for the modern web

fix: dont parse ajaxify.data from element with id

Barış Soner Uşaklı35fdedddefda
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 1ab54e3187..caefd0c283 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -7,6 +7,9 @@ const hooks = require('./modules/hooks');
const { render } = require('./widgets');
window.ajaxify = window.ajaxify || {};
+ajaxify.data = window._ajaxifyData || {};
+delete window._ajaxifyData;
+$('script#ajaxify-data').remove();
ajaxify.widgets = { render: render };
(function () {
let apiXHR = null;
@@ -367,20 +370,6 @@ ajaxify.widgets = { render: render };
app.processPage();
};
- ajaxify.parseData = () => {
- const dataEl = document.getElementById('ajaxify-data');
- if (dataEl) {
- try {
- ajaxify.data = JSON.parse(dataEl.textContent);
- } catch (e) {
- console.error(e);
- ajaxify.data = {};
- } finally {
- dataEl.remove();
- }
- }
- };
-
ajaxify.removeRelativePath = function (url) {
if (config.relative_path && url) {
const prefix = config.relative_path.slice(1);
diff --git a/public/src/app.js b/public/src/app.js
index eb57dab0a0..e7bb65ed15 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -35,12 +35,6 @@ app.onDomReady = function () {
});
};
-if (document.readyState === 'loading') {
- document.addEventListener('DOMContentLoaded', ajaxify.parseData);
-} else {
- ajaxify.parseData();
-}
-
(function () {
let appLoaded = false;
const isTouchDevice = utils.isTouchDevice();
diff --git a/src/middleware/render.js b/src/middleware/render.js
index a25dce640b..7aa0d847bc 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -104,9 +104,7 @@ module.exports = function (middleware) {
const str = `${header +
(res.locals.postHeader || '') +
content
- }<script id="ajaxify-data" type="application/json">${
- optionsString
- }</script>${
+ }<script id="ajaxify-data">window._ajaxifyData=${optionsString}</script>${
res.locals.preFooter || ''
}${footer}`;
diff --git a/src/routes/write/users.js b/src/routes/write/users.js
index 6b92c9bb83..ced9980b10 100644
--- a/src/routes/write/users.js
+++ b/src/routes/write/users.js
@@ -33,7 +33,7 @@ function authenticatedRoutes() {
setupApiRoute(router, 'put', '/:uid/settings', [...middlewares, middleware.checkRequired.bind(null, ['settings'])], controllers.write.users.updateSettings);
- setupApiRoute(router, 'put', '/:uid/password', [...middlewares, middleware.checkRequired.bind(null, ['newPassword']), middleware.assert.user], controllers.write.users.changePassword);
+ setupApiRoute(router, 'put', '/:uid/password', [...middlewares, middleware.checkRequired.bind(null, ['newPassword']), middleware.assert.user, middleware.requireAPIReAuth()], controllers.write.users.changePassword);
setupApiRoute(router, 'put', '/:uid/follow', [...middlewares, middleware.assert.user], controllers.write.users.follow);
setupApiRoute(router, 'delete', '/:uid/follow', [...middlewares, middleware.assert.user], controllers.write.users.unfollow);
diff --git a/src/user/profile.js b/src/user/profile.js
index fdee1f7131..9feffc31b2 100644
--- a/src/user/profile.js
+++ b/src/user/profile.js
@@ -360,9 +360,12 @@ module.exports = function (User) {
if (uid <= 0 || !data || !data.uid) {
throw new Error('[[error:invalid-uid]]');
}
+ uid = String(uid);
+ data.uid = String(data.uid);
User.isPasswordValid(data.newPassword);
- const [isAdmin, hasPassword] = await Promise.all([
- User.isAdministrator(uid),
+ const [isAdmin, isTargetAdmin, hasPassword] = await Promise.all([
+ User.isAdministrator(uid, data.uid),
+ User.isAdministrator(data.uid),
User.hasPassword(uid),
]);
@@ -370,9 +373,9 @@ module.exports = function (User) {
throw new Error('[[error:no-privileges]]');
}
- const isSelf = parseInt(uid, 10) === parseInt(data.uid, 10);
-
- if (!isAdmin && !isSelf) {
+ const isSelf = uid === data.uid;
+ const allowedToChange = isSelf || (isAdmin && !isTargetAdmin);
+ if (!allowedToChange) {
throw new Error('[[user:change-password-error-privileges]]');
}