Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further tighten regex: stricter version pattern, no underscores in name segments, precise trailing-dot strip

Browse Source 
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/d75fe7da-369a-40e9-913e-7dba45de21c3

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-07 02:10:15 +00:00
committed by GitHub
parent 8240b9af3c
commit 185ed4e3d8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/sovran_systemsos_web/server.py
View File

@@ -1508,12 +1508,13 @@ _BTC_VERSION_CACHE_TTL = 60 # seconds — version doesn't change at runtime
# Regex to extract the version from a Nix store ExecStart path. # Regex to extract the version from a Nix store ExecStart path.
# Pattern: /nix/store/<32-char-hash>-<name-segments>-<version>/... # Pattern: /nix/store/<32-char-hash>-<name-segments>-<version>/...
# Name segments may begin with a letter or digit (e.g. 'python3', 'gtk3', # Name segments may begin with a letter or digit (e.g. 'python3', 'gtk3',
# 'lib32-foo') so each segment allows [a-zA-Z0-9] as the leading character. # 'lib32-foo') and consist of alphanumeric characters only (no underscores,
# since Nix store paths use hyphens as separators).
# The version is identified as the first token starting with digit.digit. # The version is identified as the first token starting with digit.digit.
_NIX_STORE_VERSION_RE = re.compile( _NIX_STORE_VERSION_RE = re.compile(
r"/nix/store/[a-z0-9]{32}-" # hash prefix r"/nix/store/[a-z0-9]{32}-" # hash prefix
r"(?:[a-zA-Z0-9][a-zA-Z0-9_]*(?:-[a-zA-Z0-9][a-zA-Z0-9_]*)*)+" # package name r"(?:[a-zA-Z0-9][a-zA-Z0-9]*(?:-[a-zA-Z0-9][a-zA-Z0-9]*)*)+" # package name
r"-(\d+\.\d+[a-zA-Z0-9._+-]*)/" # version (group 1) r"-(\d+\.\d+(?:\.\d+)*(?:[+-][a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?)/" # version (group 1)
) )
# Nix path suffixes that indicate a wrapper environment, not a real package version. # Nix path suffixes that indicate a wrapper environment, not a real package version.
@@ -1554,7 +1555,9 @@ def _get_service_version(unit: str) -> str | None:
if result.returncode == 0 and result.stdout.strip(): if result.returncode == 0 and result.stdout.strip():
m = _NIX_STORE_VERSION_RE.search(result.stdout) m = _NIX_STORE_VERSION_RE.search(result.stdout)
if m: if m:
ver = m.group(1).rstrip(".") ver = m.group(1)
# Strip a single trailing period (defensive; shouldn't appear in store paths)
ver = ver[:-1] if ver.endswith(".") else ver
# Skip Nix environment/wrapper suffixes that are not real versions # Skip Nix environment/wrapper suffixes that are not real versions
if not _NIX_WRAPPER_SUFFIX_RE.search(ver): if not _NIX_WRAPPER_SUFFIX_RE.search(ver):
version = ver if ver.startswith("v") else f"v{ver}" version = ver if ver.startswith("v") else f"v{ver}"