mirror of
https://github.com/ArchiveBox/ArchiveBox.git
synced 2026-06-21 19:10:45 -04:00
Nick Sweeting
6ce2555dfd
Renames (no functional change, just consistency with the rest of the codebase): - cli/cli_utils.py → cli/cli_util.py - core/host_utils.py → core/host_util.py - core/tag_utils.py → core/tag_util.py - crawls/schedule_utils.py → crawls/schedule_util.py - machine/env_utils.py → machine/env_util.py Functional fixes: - archivebox add --index-only now materializes Snapshot rows synchronously via crawl.create_snapshots_from_urls() instead of just queueing the Crawl and leaving the index empty. The previous behavior broke every test that expected --index-only to populate the index, since the runner is never started in index-only mode. - config/collection.py: add _coerce_from_str_dict as the inverse of _coerce_to_str_dict so JSON-encoded INI values are decoded back to native dict/list types when mirrored into Machine.config (a JSONField). Without this, downstream consumers like MachineEvent / abx-dl get raw JSON strings where they expect dicts. Plus matching admin / middleware / model touch-ups, the registration password_change_form template, and assorted small cleanups the user worked through while validating the deploy path. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
50 lines
1.4 KiB
Python
50 lines
1.4 KiB
Python
__package__ = "archivebox.machine"
|
|
|
|
import json
|
|
import re
|
|
import shlex
|
|
from typing import Any
|
|
|
|
|
|
SENSITIVE_ENV_KEY_PARTS = ("KEY", "TOKEN", "SECRET")
|
|
SHELL_ENV_KEY_RE = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
|
|
|
|
|
|
def stringify_env_value(value: Any) -> str:
|
|
if value is None:
|
|
return ""
|
|
if isinstance(value, str):
|
|
return value
|
|
if isinstance(value, bool):
|
|
return "True" if value else "False"
|
|
return json.dumps(value, separators=(",", ":"))
|
|
|
|
|
|
def is_redacted_env_key(key: str) -> bool:
|
|
upper_key = str(key or "").upper()
|
|
return any(part in upper_key for part in SENSITIVE_ENV_KEY_PARTS)
|
|
|
|
|
|
def redact_env(env: dict[str, Any] | None) -> dict[str, Any]:
|
|
if not isinstance(env, dict):
|
|
return {}
|
|
return {str(key): value for key, value in env.items() if key is not None and not is_redacted_env_key(str(key))}
|
|
|
|
|
|
def env_to_dotenv_text(env: dict[str, Any] | None) -> str:
|
|
redacted_env = redact_env(env)
|
|
return "\n".join(
|
|
f"{key}={shlex.quote(stringify_env_value(value))}"
|
|
for key, value in sorted(redacted_env.items())
|
|
if value is not None and SHELL_ENV_KEY_RE.fullmatch(str(key))
|
|
)
|
|
|
|
|
|
def env_to_shell_exports(env: dict[str, Any] | None) -> str:
|
|
redacted_env = redact_env(env)
|
|
return " ".join(
|
|
f"{key}={shlex.quote(stringify_env_value(value))}"
|
|
for key, value in sorted(redacted_env.items())
|
|
if value is not None and SHELL_ENV_KEY_RE.fullmatch(str(key))
|
|
)
|