bunny-lab/Borealis-Github-Replica
1
0
Fork 0
mirror of https://github.com/bunny-lab-io/Borealis.git synced 2025-10-26 17:41:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated OS Detection Logic

Browse Source
This commit is contained in:
Nicole Rappe
2025-10-09 17:46:25 -06:00
parent b6eac6a112
commit 7509cb7d86
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Data/Agent/Roles/role_DeviceAudit.py
View File

@@ -68,7 +68,15 @@ def detect_agent_os():
else: else:
major_label = platform.release() major_label = platform.release()
os_name = f"Windows {major_label}" # Prefer the registry product name so Windows Server editions keep their
# native branding (e.g., "Windows Server 2022 Standard"). Fall back to
# the major label when the product name is unavailable.
base_name = (product_name or "").strip()
if not base_name:
base_name = f"Windows {major_label}".strip()
elif not base_name.lower().startswith("windows"):
base_name = f"Windows {major_label} {base_name}".strip()
version_label = display_version or release_id or "" version_label = display_version or release_id or ""
if isinstance(ubr, int): if isinstance(ubr, int):
build_str = f"{build_number}.{ubr}" if build_number else str(ubr) build_str = f"{build_number}.{ubr}" if build_number else str(ubr)
@@ -78,14 +86,7 @@ def detect_agent_os():
except Exception: except Exception:
build_str = build_number or "" build_str = build_number or ""
parts = [os_name] parts = [base_name]
if product_name and product_name.lower().startswith('windows '):
try:
tail = product_name.split(' ', 2)[2]
if tail:
parts.append(tail)
except Exception:
pass
if version_label: if version_label:
parts.append(version_label) parts.append(version_label)
if build_str: if build_str: