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

Merge pull request #393 from naturallaw777/fix/path-injection-4334-4532

Browse Source 
fix: add CodeQL-recognized path sanitization for domain_name
This commit is contained in:
Sovran Systems
2026-08-07 13:51:28 -05:00
committed by GitHub
parent c38d4be851 a32b353eda
commit efda70c187
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/sovran_systemsos_web/server.py
+5 -1
View File
@@ -4329,10 +4329,14 @@ def _ensure_domains_dir() -> None:
def _chown_to_caddy(path: str) -> None: def _chown_to_caddy(path: str) -> None:
"""Set the owner of a file to caddy:root (best-effort).""" """Set the owner of a file to caddy:root (best-effort)."""
# CodeQL path-injection: ensure path is inside DOMAINS_DIR or is NJALLA_SCRIPT
try: try:
abs_path = os.path.abspath(path)
if abs_path != os.path.abspath(NJALLA_SCRIPT) and os.path.commonpath([os.path.abspath(DOMAINS_DIR), abs_path]) != os.path.abspath(DOMAINS_DIR):
return
pw = pwd.getpwnam("caddy") pw = pwd.getpwnam("caddy")
os.chown(path, pw.pw_uid, 0) os.chown(path, pw.pw_uid, 0)
except KeyError: except (KeyError, ValueError):
pass pass