Take the master key from KEEPORG_MASTER_KEY_FILE
Why: the usual way to hand a secret to a container is to mount it as a file and name the path in the environment. Compose, swarm and Kubernetes all do it that way, and it keeps the key out of the process environment and off any disk the container can write. What: the master key is now looked for in KEEPORG_MASTER_KEY, then KEEPORG_MASTER_KEY_FILE, then the configured master_key_file. A secret file may hold base64, with or without padding or a trailing newline, or exactly 32 raw bytes, because secret stores produce both. Only the configured path is ever created, which is what keeps a plain package install working with no setup. The two environment variables name a key something else owns, so a missing one is reported and vault creation refused. Minting a replacement there would be worse than failing: it opens none of the existing vaults, and the mistake would otherwise surface one failed merge at a time. The compose example now provisions the key as a real secret rather than an environment variable, and the Dockerfile and README show the same. Neither names a version any more, so they stop drifting as the server is bumped. Proved: unit tests for every source and precedence, all four accepted encodings, and that a missing secret writes nothing anywhere. In real containers: a podman secret carrying base64 survives a stop and start with "1 vault keys available for merging" and merges a stale push afterwards; a secret holding 32 raw bytes creates a vault; and a secret that failed to mount is named in the startup log, with vault creation answering with the three places a key may come from.
This commit is contained in:
@@ -1,3 +1,16 @@
|
||||
keeporgd (0.4.0) unstable; urgency=medium
|
||||
|
||||
* Read the master key from the file named by KEEPORG_MASTER_KEY_FILE, the
|
||||
convention compose, swarm and Kubernetes use for a provisioned secret.
|
||||
The file may hold base64 or exactly 32 raw bytes.
|
||||
* Neither master-key environment variable is ever created by the server:
|
||||
a secret that failed to mount is reported at startup and vault creation
|
||||
is refused, rather than replaced with a new key that would open none of
|
||||
the existing vaults. Only the configured master_key_file is created on
|
||||
first run.
|
||||
|
||||
-- tiredsysadmin <rcmd@garage.rcmd.space> Fri, 30 Oct 2026 09:42:50 +0100
|
||||
|
||||
keeporgd (0.3.0) unstable; urgency=medium
|
||||
|
||||
* Container image: a scratch-based image of about 9 MB holding the static
|
||||
|
||||
Reference in New Issue
Block a user