From 604d50585bbe4e096708c93de65167e1fdd06b98 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sun, 24 Sep 2023 12:00:33 -0700 Subject: [PATCH] Blocked user group creation when domain is in LDAP mode. --- meshuser.js | 3 +++ package.json | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meshuser.js b/meshuser.js index 18945489..4fe53fb3 100644 --- a/meshuser.js +++ b/meshuser.js @@ -1490,6 +1490,9 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use { var ugrpdomain, err = null; try { + // Check if we are in a mode that does not allow manual user group creation + if (domain.auth == 'ldap') { err = "Not allowed in LDAP mode"; } + // Check if we have new group restriction if ((user.siteadmin & SITERIGHT_USERGROUPS) == 0) { err = "Permission denied"; } diff --git a/package.json b/package.json index a2ddf681..582cc6d8 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "sample-config-advanced.json" ], "dependencies": { + "@yetzt/nedb": "1.8.0", "archiver": "5.3.2", "body-parser": "1.20.2", "cbor": "5.2.0", @@ -46,10 +47,15 @@ "express-handlebars": "5.3.5", "express-ws": "5.0.2", "ipcheck": "0.1.0", + "ldapauth-fork": "5.0.5", + "loadavg-windows": "1.1.1", "minimist": "1.2.8", "multiparty": "4.2.3", - "@yetzt/nedb": "1.8.0", "node-forge": "1.3.1", + "node-pushover": "1.0.0", + "node-windows": "0.1.14", + "otplib": "10.2.3", + "ssh2": "1.14.0", "ua-parser-js": "1.0.36", "ws": "8.14.2", "yauzl": "2.10.0"