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

Address review feedback: module-level wrapper suffix regex, allow digit-starting name segments

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:08:23 +00:00
committed by GitHub
parent deb66c9cb7
commit 8240b9af3c
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/sovran_systemsos_web/server.py
View File

@@ -1507,14 +1507,20 @@ _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>/...
# The name segments consist of alphabetic-starting words separated by hyphens. # Name segments may begin with a letter or digit (e.g. 'python3', 'gtk3',
# The version is the first hyphen-delimited token that starts with a digit. # 'lib32-foo') so each segment allows [a-zA-Z0-9] as the leading character.
# 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-Z][a-zA-Z0-9_]*(?:-[a-zA-Z][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+[a-zA-Z0-9._+-]*)/" # version (group 1)
) )
# Nix path suffixes that indicate a wrapper environment, not a real package version.
_NIX_WRAPPER_SUFFIX_RE = re.compile(
r"-(?:env|wrapper|wrapped|script|hook|setup|compat)$"
)
# Cache: unit → (monotonic_timestamp, version_str | None) # Cache: unit → (monotonic_timestamp, version_str | None)
_svc_version_cache: dict[str, tuple[float, str | None]] = {} _svc_version_cache: dict[str, tuple[float, str | None]] = {}
_SVC_VERSION_CACHE_TTL = 300 # 5 minutes — versions only change on system update _SVC_VERSION_CACHE_TTL = 300 # 5 minutes — versions only change on system update
@@ -1550,7 +1556,7 @@ def _get_service_version(unit: str) -> str | None:
if m: if m:
ver = m.group(1).rstrip(".") ver = m.group(1).rstrip(".")
# Skip Nix environment/wrapper suffixes that are not real versions # Skip Nix environment/wrapper suffixes that are not real versions
if not re.search(r"-(?:env|wrapper|wrapped|script|hook|setup|compat)$", 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}"
except Exception: except Exception:
pass pass