Compare commits

...
1 Commits
Author SHA1 Message Date
iv3jdv 019e518534 Release v5.3.6: Strict RBAC e separazione permessi Admin/Nodi 2026-11-03 19:45:38 +01:00
3 changed files with 18 additions and 10 deletions
+8
View File
@@ -226,6 +226,9 @@ def service_control():
d = json_body()
cid = str(d.get('clientId', '')).strip().lower()
if not check_node_allowed(auth['allowed_nodes'], cid):
return err("Permesso negato per questo nodo", 403)
action = str(d.get('action', '')).strip().lower()
service = str(d.get('service', '')).strip()
if not CID_RE.match(cid):
@@ -323,6 +326,8 @@ def get_config_file(cid, service):
if not auth or auth['role'] != 'admin':
return err("Non autorizzato", 403)
cid = cid.lower()
if not check_node_allowed(auth['allowed_nodes'], cid):
return err("Permesso negato per questo nodo", 403)
service = service.lower()
if not CID_RE.match(cid) or not SERVICE_RE.match(service):
return err("Parametri non validi")
@@ -339,6 +344,9 @@ def save_config_file():
d = json_body()
cid = str(d.get('clientId', '')).strip().lower()
if not check_node_allowed(auth['allowed_nodes'], cid):
return err("Permesso negato per questo nodo", 403)
service = str(d.get('service', '')).strip().lower()
new_config = d.get('config_data')
if not CID_RE.match(cid) or not SERVICE_RE.match(service):
+8 -8
View File
@@ -112,7 +112,7 @@ function openNodeFocus(clientId) {
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
const modesCard = document.getElementById('focus-modes-card');
if (modesCard) {
@@ -290,7 +290,7 @@ function sendTgCommand(clientId, comando) {
async function fetchNodeConfigForModes(clientId) {
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
const modesCard = document.getElementById('focus-modes-card');
if (!canControl) {
if (modesCard) modesCard.style.display = 'none';
@@ -349,7 +349,7 @@ async function fetchNodeConfigForModes(clientId) {
function renderModeToggles(clientId, statusMsg = "") {
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
const modesCard = document.getElementById('focus-modes-card');
if (modesCard) {
@@ -530,7 +530,7 @@ async function initUI() {
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
if (isAuthenticated) {
const hasAllNodes = role === 'admin' || allowedList.includes('all');
const hasAllNodes = allowedList.includes('all');
const canOverride = hasAllNodes;
let actionBtns = '';
@@ -554,8 +554,8 @@ async function initUI() {
}
grid.innerHTML = clients.map(c => {
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
let showReboot = (role === 'admin');
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
let showReboot = (role === 'admin' && canControl);
return `
<div class="card" id="card-${c.id}" data-status="offline" data-gateways="" data-loc="" data-has-warn="false">
@@ -765,8 +765,8 @@ async function refreshStates() {
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
let showReboot = (role === 'admin');
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
let showReboot = (role === 'admin' && canControl);
let isTx = false;
let activeModeColor = "var(--primary)";
+2 -2
View File
@@ -232,7 +232,7 @@ async function saveSettings() {
function triggerGlobalEmergency() {
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
const hasAll = role === 'admin' || allowedList.includes('all');
const hasAll = allowedList.includes('all');
let uniqueProfiles = {};
for (const id in globalHealthData) {
@@ -259,7 +259,7 @@ function sendGlobalAction(action) {
document.getElementById('override-modal').style.display = 'none';
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
const hasAll = role === 'admin' || allowedList.includes('all');
const hasAll = allowedList.includes('all');
const confirmMsg = hasAll
? t('promptOvrConfirm')