From 88f6c3c0f54d851c55d6d6620d1ae449fc8f876d Mon Sep 17 00:00:00 2001 From: AIIrondev Date: Fri, 31 Jul 2026 20:45:16 +0200 Subject: [PATCH] backwarts compaibility and integration of encryption in the manage-tenant.sh --- Web/modules/database/user.py | 8 ++++++-- manage-tenant.sh | 9 +++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Web/modules/database/user.py b/Web/modules/database/user.py index 35f5b8e..7836913 100755 --- a/Web/modules/database/user.py +++ b/Web/modules/database/user.py @@ -476,8 +476,12 @@ def check_nm_pwd(username, password): user_record = users.find_one(query) if user_record is None: - logger.warning("Kein Benutzer für %r in DB %r gefunden.", dp.encrypt_text(username), db_name) - return None + query = {'$or': [{'Username': username}, {'username': username}]} + user_record_fallback = users.find_one(query) + if user_record_fallback is None: + logger.warning("Kein Benutzer für %r in DB %r gefunden.", dp.encrypt_text(username), db_name) + return None + stored_password = user_record.get('Password') or user_record.get('password') diff --git a/manage-tenant.sh b/manage-tenant.sh index a1d6eed..4c31acf 100755 --- a/manage-tenant.sh +++ b/manage-tenant.sh @@ -200,6 +200,7 @@ sys.path.insert(0, "/app") sys.path.insert(0, "/app/Web") from Web.modules.database import settings from pymongo import MongoClient +import Web.modules.inventarsystem.data_protection as dp tenant_id = sys.argv[1].lower() mode = sys.argv[2] @@ -244,14 +245,14 @@ page_permissions = { "manage_locations": True, } -if db.users.count_documents({"Username": "admin"}) == 0: +if db.users.count_documents({"Username": dp.encrypt_text("admin")}) == 0: db.users.insert_one({ - "Username": "admin", + "Username": dp.encrypt_text("admin"), "Password": hashed_pw_string, "Admin": True, "active_ausleihung": None, - "name": "Admin", - "last_name": "User", + "name": dp.encrypt_text("Admin"), + "last_name": dp.encrypt_text("User"), "IsStudent": False, "PermissionPreset": "full_access", "ActionPermissions": action_permissions,