menzeljandClaude Opus 5
51d1998307
StackPilot now manages exactly one Docker host: the one it runs on. The
stackpilot-agent sidecar and everything that proxied to it are gone — 4721
lines deleted against 657 added.
Deleted outright: agent/ (image, compose, env), agent_app.py, models/agent.py,
routers/agents.py (1200 lines), services/agent_service.py, the agent API client,
RemoteStackDetail, the host components and AgentStacksSection. That removes 57
API routes and the three /ws/agent-* proxies.
Threaded out everywhere else, which was the bulk of the work. Every API module
carried an optional agentId that switched the base path; every page that listed
Docker objects rendered one section per host behind a HostHeader; Files had a
host switcher; the New Stack editor and the template dialog had host selectors;
schedules, auto-update policies and stack summaries carried agent_id. All of it
is gone, and the typechecker drove the sweep — 85 files touched, tsc and the
build clean.
Two things the removal exposed as dead weight rather than merely unused:
compose_service kept an in-process busy set purely because the agent needed a
lock and has no database. With the agent gone that was a second source of truth
next to the real DB lock, so it is deleted; compute_status now reports only what
the containers say and the two callers that want "updating" overlay the lock.
StacksTable's linkBase prop only ever existed to point at /hosts/{id}/stacks.
The dashboard's "Hosts 1/1 online" KPI can no longer say anything else, so the
tile and the KPIs behind it are gone and the row is five wide.
Upgrading matters here. An existing install still has an agent table holding
each remote host's URL and bearer token — full Docker control of that host,
sitting in the database with nothing left to use it. _drop_removed_schema drops
it on first start, and drops the agent_id columns where the SQLite build
supports DROP COLUMN. Each statement runs in its own transaction on purpose: a
failed DDL poisons the transaction it is in, so sharing one would let an
unsupported column drop take the table drop down with it. test_agent_removal
covers both branches plus the fresh-install and idempotent cases, and an
end-to-end run against a seeded pre-0.48 database confirms the table is gone and
every /api/agents route answers 404.
Docstrings that justified a design by "shared with the agent, which has no
database" were rewritten rather than left lying: update_service's persistence
callback and image_status_store are still the right split (registry logic stays
testable without a database), but for that reason now, not the old one. The
README's multi-host sections are removed and an upgrade note explains what to do
with running agent containers; ROADMAP keeps its history behind a note saying
the feature it describes no longer exists.
CI no longer builds or pushes stackpilot-agent.
735 tests pass, ruff and tsc clean.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Dk43rmEeRfYi5wsLDbmfyG
77 lines
2.6 KiB
Python
77 lines
2.6 KiB
Python
"""Symmetric encryption for secrets that have to live in the database.
|
|
|
|
Most of StackPilot's secrets are files on disk (``.env``, ``.secrets/*``) where
|
|
filesystem permissions are the right control. A few can't be: backup
|
|
destination credentials are needed by background jobs, so they sit in
|
|
``stackpilot.db``. This module encrypts those at rest.
|
|
|
|
The key is derived from ``SECRET_KEY`` rather than being a second thing to
|
|
configure — which is exactly why ``SECRET_KEY`` is now persisted (see
|
|
``config._ensure_secret``): a key that changed on every restart would take the
|
|
ciphertext with it.
|
|
|
|
Ciphertext is stored with an ``enc:v1:`` prefix so plaintext rows written by
|
|
older versions stay recognisable and can be migrated in place.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import base64
|
|
import hashlib
|
|
import logging
|
|
from typing import Optional
|
|
|
|
from cryptography.fernet import Fernet, InvalidToken
|
|
|
|
from config import settings
|
|
|
|
logger = logging.getLogger("stackpilot.crypto")
|
|
|
|
PREFIX = "enc:v1:"
|
|
_INFO = b"stackpilot-db-field-encryption-v1"
|
|
|
|
|
|
class DecryptError(Exception):
|
|
"""Ciphertext could not be decrypted (usually: SECRET_KEY changed)."""
|
|
|
|
|
|
def _fernet() -> Fernet:
|
|
"""Fernet built from a 32-byte key derived from SECRET_KEY.
|
|
|
|
Not cached: SECRET_KEY is fixed for the process lifetime, and building a
|
|
Fernet is a hash plus a base64 encode — cheap enough not to bother.
|
|
"""
|
|
digest = hashlib.blake2b(
|
|
settings.SECRET_KEY.encode("utf-8"), key=_INFO, digest_size=32
|
|
).digest()
|
|
return Fernet(base64.urlsafe_b64encode(digest))
|
|
|
|
|
|
def is_encrypted(value: Optional[str]) -> bool:
|
|
return bool(value) and value.startswith(PREFIX)
|
|
|
|
|
|
def encrypt(plaintext: str) -> str:
|
|
"""Encrypt a string. Already-encrypted input is returned unchanged."""
|
|
if is_encrypted(plaintext):
|
|
return plaintext
|
|
token = _fernet().encrypt((plaintext or "").encode("utf-8"))
|
|
return PREFIX + token.decode("ascii")
|
|
|
|
|
|
def decrypt(value: str) -> str:
|
|
"""Decrypt a value written by :func:`encrypt`.
|
|
|
|
Plaintext (no prefix) is passed straight through, so rows written before
|
|
encryption existed keep working until the startup migration rewrites them.
|
|
"""
|
|
if not is_encrypted(value):
|
|
return value or ""
|
|
try:
|
|
return _fernet().decrypt(value[len(PREFIX):].encode("ascii")).decode("utf-8")
|
|
except (InvalidToken, ValueError) as exc:
|
|
raise DecryptError(
|
|
"Could not decrypt a stored secret. This normally means SECRET_KEY "
|
|
"changed since it was saved — restore the old key, or re-enter the "
|
|
"affected credentials."
|
|
) from exc
|