jimmy/nas-tools
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge dev to main: Security improvements and comprehensive test infrastructure #39

Merged
jimmy merged 195 commits from dev into main 2026-04-08 01:42:27 +08:00
Conversation 0 Commits 195 Files Changed 87
+8 -5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b07246d0d - Show all commits
dashboard/backend/rbac.py
+8 -5
View File
@@ -8,7 +8,9 @@ from fastapi import HTTPException, Request, status, Depends
import config import config
RBAC_FILE = os.path.join(config.VOLUME_ROOT, "docker/nas-dashboard/rbac.json") def get_rbac_file():
return os.path.join(config.VOLUME_ROOT, "docker/nas-dashboard/rbac.json")
_rbac_lock = threading.RLock() _rbac_lock = threading.RLock()
ROLE_GROUP_MAP = { ROLE_GROUP_MAP = {
@@ -38,8 +40,9 @@ class User(BaseModel):
def load_rbac() -> dict: def load_rbac() -> dict:
try: try:
if os.path.exists(RBAC_FILE): rbac_path = get_rbac_file()
with open(RBAC_FILE) as f: if os.path.exists(rbac_path):
with open(rbac_path) as f:
return json.load(f) return json.load(f)
except Exception: except Exception:
pass pass
@@ -64,12 +67,12 @@ def update_rbac(mutator):
with _rbac_lock: with _rbac_lock:
data = load_rbac() data = load_rbac()
result = mutator(data) result = mutator(data)
_atomic_json_write(RBAC_FILE, data) _atomic_json_write(get_rbac_file(), data)
return result return result
def save_rbac(data: dict): def save_rbac(data: dict):
_atomic_json_write(RBAC_FILE, data) _atomic_json_write(get_rbac_file(), data)
def resolve_role(groups: list[str]) -> Optional[str]: def resolve_role(groups: list[str]) -> Optional[str]: