Files
keeporg/internal/secret/keyring.go
T
ReactorcoremeltdownandClaude Opus 5.5 4ffc434b1b Keep server data in an encrypted database, and harden every part
Storage. The server keeps its data in SQLite (a file in the data
directory, the default) or PostgreSQL (database, KEEPORG_DATABASE_URL or
-database). Every row, the KDBX versions included, is sealed with
AES-256-GCM under a key derived from the master key and named by an HMAC.
The master key is required to start and a different one is refused. A data
directory from 0.10 or earlier is imported on first start. Several servers
may share one PostgreSQL database. Go goes to 1.26 for the pure-Go
drivers (modernc.org/sqlite, jackc/pgx).

Hardening, after an audit of the server, both clients and the deployment:
- Single sign-on approves a device only after an explicit Approve in the
  browser that started it, bound by a cookie and PKCE; identities are never
  linked by username, by verified email only when allowed, never to admins.
- Sign-in attempts are limited per address and per account, passwords are
  checked outside the store lock with uniform timing, one-time codes work
  once, and starting two-factor needs the password.
- Merge vaults bound KDF parameters, payload size and XML shape, check
  pushes before storing them, and run at most two merges at once. A version
  is written in the same transaction as its metadata.
- Tokens in URLs only on the event stream, which ends on revocation; CSP,
  frame-ancestors, no-store and HSTS; sign-in CSRF; 404 for databases
  without access; new trusted_proxies.
- Clients open only the server's approval page, keep case-variant and
  retired file names apart, never overwrite a save made during a pull,
  require https except locally, send the stream token in a header, bound
  their reads and escape notifications and terminal output.
- The .deb creates the master key, systemd is sandboxed further, nginx sets
  modern TLS and HSTS, and CI deploys from main only.

Server 0.12.0, desktop 0.6.0, Android 0.4.0 (versionCode 4).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 15:38:32 +01:00

216 lines
7.1 KiB
Go

package secret
import (
"crypto/aes"
"crypto/cipher"
"crypto/hmac"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"errors"
"fmt"
"os"
"path/filepath"
"strings"
)
// Keyring wraps the per-vault secrets the server must keep in order to merge
// a vault: it can decrypt a vault, so it holds that vault's key.
//
// The wrapped secrets live in the server's state document; the key that
// unwraps them does not. It comes from the environment, from a secret file
// an orchestrator provisioned, or from a file outside the data directory,
// so a copy of the data directory alone yields ciphertext. Whoever holds
// both holds the vaults.
type Keyring struct {
aead cipher.AEAD
key []byte
}
// Environment variables that supply the master key. Both are read before
// any configured path.
const (
// MasterKeyEnv holds the base64 key itself.
MasterKeyEnv = "KEEPORG_MASTER_KEY"
// MasterKeyFileEnv holds the path to a file containing it, which is how
// a container runtime or an orchestrator hands over a provisioned
// secret without putting it in the process environment.
MasterKeyFileEnv = "KEEPORG_MASTER_KEY_FILE"
)
// keySize is the master key length in bytes.
const keySize = 32
// LoadKeyring finds the master key, in this order:
//
// 1. $KEEPORG_MASTER_KEY, the base64 key itself.
// 2. $KEEPORG_MASTER_KEY_FILE, a path to a provisioned secret. It must
// already exist: something else owns that file, so a missing one is a
// misconfiguration to report, not a reason to mint a new key that would
// fail to open any existing vault.
// 3. path, from -master-key-file or master_key_file in the configuration.
// This one is created on first run if it is absent, which is what makes
// a plain package install work with no setup.
//
// A file may hold the key as base64 text, with or without a trailing
// newline, or as exactly 32 raw bytes, because secret stores produce both.
func LoadKeyring(path string) (*Keyring, error) {
if v := strings.TrimSpace(os.Getenv(MasterKeyEnv)); v != "" {
key, err := decodeKey([]byte(v))
if err != nil {
return nil, fmt.Errorf("secret: $%s: %w", MasterKeyEnv, err)
}
return NewKeyring(key)
}
if p := strings.TrimSpace(os.Getenv(MasterKeyFileEnv)); p != "" {
b, err := os.ReadFile(p)
if err != nil {
return nil, fmt.Errorf("secret: $%s points at %s: %w",
MasterKeyFileEnv, p, err)
}
key, err := decodeKey(b)
if err != nil {
return nil, fmt.Errorf("secret: $%s file %s: %w", MasterKeyFileEnv, p, err)
}
return NewKeyring(key)
}
if path == "" {
return nil, errors.New("secret: no master key: set $" + MasterKeyEnv +
", $" + MasterKeyFileEnv + ", or configure master_key_file")
}
b, err := os.ReadFile(path)
switch {
case err == nil:
key, derr := decodeKey(b)
if derr != nil {
return nil, fmt.Errorf("secret: master key file %s: %w", path, derr)
}
return NewKeyring(key)
case !os.IsNotExist(err):
return nil, err
}
// First run: mint one. It is written with owner-only permissions and is
// the one file an operator must back up separately from the data.
key := randBytes(keySize)
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
return nil, err
}
enc := base64.StdEncoding.EncodeToString(key)
if err := os.WriteFile(path, []byte(enc+"\n"), 0o600); err != nil {
return nil, fmt.Errorf("secret: write master key %s: %w", path, err)
}
return NewKeyring(key)
}
// decodeKey accepts the shapes a provisioned secret arrives in: exactly 32
// raw bytes, or base64 text with or without padding and trailing newline.
func decodeKey(b []byte) ([]byte, error) {
if len(b) == keySize {
return b, nil
}
text := strings.TrimSpace(string(b))
if key, err := base64.StdEncoding.DecodeString(text); err == nil {
return key, nil
}
if key, err := base64.RawStdEncoding.DecodeString(text); err == nil {
return key, nil
}
return nil, fmt.Errorf("expected %d raw bytes or a base64 key, got %d bytes "+
"that are neither", keySize, len(b))
}
// NewKeyring builds a keyring from a 32-byte key.
func NewKeyring(key []byte) (*Keyring, error) {
if len(key) != keySize {
return nil, fmt.Errorf("secret: master key must be %d bytes, got %d",
keySize, len(key))
}
block, err := aes.NewCipher(key)
if err != nil {
return nil, err
}
aead, err := cipher.NewGCM(block)
if err != nil {
return nil, err
}
return &Keyring{aead: aead, key: append([]byte(nil), key...)}, nil
}
// Derive returns a keyring for one purpose, keyed by HMAC-SHA256 of the
// master key and the purpose's name. Each use of the master key gets its own
// key this way: a ciphertext made for one purpose does not open under
// another, and no subkey reveals the master key.
func (k *Keyring) Derive(purpose string) *Keyring {
m := hmac.New(sha256.New, k.key)
m.Write([]byte("keeporg/" + purpose))
sub, err := NewKeyring(m.Sum(nil))
if err != nil {
panic("secret: derive: " + err.Error()) // a SHA-256 sum is always 32 bytes
}
return sub
}
// Seal encrypts data with AES-256-GCM under a fresh nonce, authenticating
// aad with it. The output is the nonce followed by the ciphertext.
func (k *Keyring) Seal(aad, data []byte) []byte {
nonce := randBytes(k.aead.NonceSize())
return k.aead.Seal(nonce, nonce, data, aad)
}
// ErrSealed means sealed data did not open: a different key, different
// associated data, or tampering.
var ErrSealed = errors.New("secret: sealed data does not open with this key")
// Open decrypts what Seal produced with the same aad.
func (k *Keyring) Open(aad, sealed []byte) ([]byte, error) {
n := k.aead.NonceSize()
if len(sealed) < n {
return nil, ErrSealed
}
plain, err := k.aead.Open(nil, sealed[:n], sealed[n:], aad)
if err != nil {
return nil, ErrSealed
}
return plain, nil
}
// MAC is a keyed, deterministic digest of value, in hex. It names a row by a
// value without storing the value: equal inputs give equal names, and the
// name says nothing about the input to anyone without the key.
func (k *Keyring) MAC(value string) string {
m := hmac.New(sha256.New, k.key)
m.Write([]byte(value))
return hex.EncodeToString(m.Sum(nil))
}
// Wrap encrypts a vault secret. The vault's own id is authenticated with it,
// so a wrapped secret moved to another vault's record fails to open rather
// than unlocking the wrong database.
func (k *Keyring) Wrap(vaultID, plaintext string) (string, error) {
if vaultID == "" {
return "", errors.New("secret: wrapping needs a vault id")
}
nonce := randBytes(k.aead.NonceSize())
out := k.aead.Seal(nonce, nonce, []byte(plaintext), []byte(vaultID))
return base64.StdEncoding.EncodeToString(out), nil
}
// Unwrap decrypts a vault secret wrapped for this vault.
func (k *Keyring) Unwrap(vaultID, wrapped string) (string, error) {
raw, err := base64.StdEncoding.DecodeString(wrapped)
if err != nil {
return "", fmt.Errorf("secret: wrapped value is not base64: %w", err)
}
n := k.aead.NonceSize()
if len(raw) < n {
return "", errors.New("secret: wrapped value is too short")
}
plain, err := k.aead.Open(nil, raw[:n], raw[n:], []byte(vaultID))
if err != nil {
return "", errors.New("secret: wrapped value does not open with this master key")
}
return string(plain), nil
}