Files
keeporg/cmd/keeporgd/main.go
T
root a9308a3e89 Merge concurrent saves on the server, with vaults created from the web
Why: the point of a sync server is that two people can work at once. Picking
a winner was all this one could do while it could not read a vault.

What, end to end:
- A vault is created at /web or with `keeporg vault -create`: the server
  builds an empty KDBX 4 file, encrypts it with the password from the form,
  and stores it as version 1. An existing database can adopt a stored key
  with `keeporg db -id <id> -store-password`, which is verified against the
  stored file before it is accepted.
- A stale push to a `merge` vault is no longer refused. The server opens the
  stored version and the pushed one in memory, folds them together, and
  stores the re-encrypted result. Clients push as usual and pull what comes
  back. Any failure answers 409 merge_failed and the client keeps its copy
  aside, so a failed merge still loses nothing.
- At rest: vault contents stay KDBX-encrypted as always. A merge vault's
  password is kept AES-256-GCM-wrapped under a master key that lives outside
  the data directory, bound to the vault id, never returned by the API. A
  stolen data directory is ciphertext; a stolen data directory plus the
  master key is not. The server runs without a master key and simply refuses
  to create or merge vaults.

This moves the server inside the trust boundary for vaults it can merge,
which is inherent to merging and is stated plainly in the README, the
handover notes and the web form itself. Key-less strategies are unchanged and
remain the default for a database created without a password.

Proved: two clients editing the same version are merged rather than refused,
the newer edit of one entry wins, a merge failure leaves the stored vault
untouched, `merge` is refused without a stored key, the wrapped key never
appears in state.json or the API, and the web interface rejects a form
without its CSRF token, withholds its cookie over plain http, and only offers
groups the user administers. Checked by hand against the real thing: a vault
created in a browser, edited by keepassxc-cli on two sides from the same
version, merged by the server, and both entries read back out with
keepassxc-cli. make check, make test-race, android lint and both .deb builds
are clean.
2026-10-29 17:34:47 +01:00

231 lines
6.4 KiB
Go

// Command keeporgd is the KeepOrg synchronization server.
//
// It stores KDBX files as opaque, versioned blobs and arbitrates concurrent
// writes. It never sees a master password and cannot read a database.
package main
import (
"context"
"encoding/json"
"errors"
"flag"
"fmt"
"log"
"net/http"
"os"
"os/signal"
"path/filepath"
"syscall"
"time"
"cc.tiredsysadmin.keeporg/internal/kdbx"
"cc.tiredsysadmin.keeporg/internal/secret"
"cc.tiredsysadmin.keeporg/internal/server"
"cc.tiredsysadmin.keeporg/internal/store"
)
// Version is stamped at build time from versions.mk.
var Version = "dev"
// fileConfig is the on-disk shape of the configuration. It keeps durations as
// plain numbers so the file stays easy to edit by hand.
type fileConfig struct {
Addr string `json:"addr"`
DataDir string `json:"data_dir"`
ExternalURL string `json:"external_url"`
SessionTTLHours int `json:"session_ttl_hours"`
MaxDBSizeMB int64 `json:"max_db_size_mb"`
TLSCert string `json:"tls_cert"`
TLSKey string `json:"tls_key"`
MasterKeyFile string `json:"master_key_file"`
VaultKDF vaultKDF `json:"vault_kdf"`
OIDC server.OIDCConfig `json:"oidc"`
}
// vaultKDF is the work factor for vaults this server creates, in the plain
// units an operator wants to edit.
type vaultKDF struct {
MemoryMB uint32 `json:"memory_mb"`
Iterations uint32 `json:"iterations"`
Lanes uint8 `json:"lanes"`
}
func (f fileConfig) toConfig() server.Config {
c := server.Config{
Addr: f.Addr, DataDir: f.DataDir, ExternalURL: f.ExternalURL,
TLSCert: f.TLSCert, TLSKey: f.TLSKey, OIDC: f.OIDC,
MasterKeyFile: f.MasterKeyFile,
}
if f.VaultKDF.MemoryMB > 0 {
c.VaultKDF = kdbx.KDFParams{
MemoryKiB: f.VaultKDF.MemoryMB * 1024,
Iterations: f.VaultKDF.Iterations,
Lanes: f.VaultKDF.Lanes,
}
}
if f.SessionTTLHours > 0 {
c.SessionTTL = time.Duration(f.SessionTTLHours) * time.Hour
}
if f.MaxDBSizeMB > 0 {
c.MaxDBSize = f.MaxDBSizeMB << 20
}
return c
}
func main() {
log.SetFlags(log.LstdFlags | log.LUTC)
lg := log.New(os.Stderr, "keeporgd: ", log.LstdFlags|log.LUTC)
var (
configPath = flag.String("config", "", "path to a JSON configuration file")
addr = flag.String("addr", "", "listen address (overrides the config file)")
dataDir = flag.String("data", "", "data directory (overrides the config file)")
extURL = flag.String("url", "", "externally reachable base URL (overrides the config file)")
showVer = flag.Bool("version", false, "print the version and exit")
writeCfg = flag.String("write-config", "", "write a commented example config to this path and exit")
)
flag.Parse()
if *showVer {
fmt.Println("keeporgd", Version)
return
}
if *writeCfg != "" {
if err := writeExampleConfig(*writeCfg); err != nil {
lg.Fatal(err)
}
fmt.Println("wrote", *writeCfg)
return
}
var fc fileConfig
if *configPath != "" {
b, err := os.ReadFile(*configPath)
if err != nil {
lg.Fatalf("read config: %v", err)
}
if err := json.Unmarshal(b, &fc); err != nil {
lg.Fatalf("parse config: %v", err)
}
}
cfg := fc.toConfig()
if *addr != "" {
cfg.Addr = *addr
}
if *dataDir != "" {
cfg.DataDir = *dataDir
}
if *extURL != "" {
cfg.ExternalURL = *extURL
}
srv, err := server.New(cfg, lg)
if err != nil {
lg.Fatalf("start: %v", err)
}
if err := bootstrap(srv, lg); err != nil {
lg.Fatalf("bootstrap: %v", err)
}
done := make(chan struct{})
srv.StartHousekeeping(done)
hs := &http.Server{
Addr: srv.Config().Addr,
Handler: srv.Handler(),
ReadHeaderTimeout: 15 * time.Second,
// No write timeout: the event stream is long lived by design.
IdleTimeout: 120 * time.Second,
}
go func() {
eff := srv.Config()
lg.Printf("version %s listening on %s (external %s, data %s)",
Version, eff.Addr, eff.ExternalURL, eff.DataDir)
var err error
if eff.TLSCert != "" && eff.TLSKey != "" {
err = hs.ListenAndServeTLS(eff.TLSCert, eff.TLSKey)
} else {
err = hs.ListenAndServe()
}
if err != nil && !errors.Is(err, http.ErrServerClosed) {
lg.Fatalf("listen: %v", err)
}
}()
sig := make(chan os.Signal, 1)
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
<-sig
close(done)
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
if err := hs.Shutdown(ctx); err != nil {
lg.Printf("shutdown: %v", err)
}
lg.Print("stopped")
}
// bootstrap creates the first administrator and a root group on an empty
// server, so a fresh deployment is immediately usable. It is idempotent.
func bootstrap(srv *server.Server, lg *log.Logger) error {
password := os.Getenv("KEEPORG_ADMIN_PASSWORD")
generated := false
if password == "" {
password = secret.Token()[:20]
generated = true
}
var created bool
err := srv.Store().Update(func(st *store.State) error {
if len(st.Users) > 0 {
return nil
}
hash, err := secret.Hash(password)
if err != nil {
return err
}
u := &store.User{ID: secret.ID(), Username: "admin", PassHash: hash,
ServerAdmin: true, CreatedAt: time.Now()}
st.Users[u.ID] = u
g := &store.Group{ID: secret.ID(), Name: "everyone", CreatedAt: time.Now()}
st.Groups[g.ID] = g
st.Memberships = append(st.Memberships,
store.Membership{UserID: u.ID, GroupID: g.ID, Role: store.RoleAdmin})
created = true
return nil
})
if err != nil || !created {
return err
}
if generated {
lg.Printf("created the first administrator: username %q password %q "+
"(shown once, change it or enrol TOTP now)", "admin", password)
} else {
lg.Print(`created the first administrator: username "admin" with the password from KEEPORG_ADMIN_PASSWORD`)
}
return nil
}
func writeExampleConfig(path string) error {
ex := fileConfig{
Addr: ":8765",
DataDir: "/var/lib/keeporg",
ExternalURL: "https://keeporg.example.com",
SessionTTLHours: 24 * 90,
MaxDBSizeMB: 32,
MasterKeyFile: "/etc/keeporg/master.key",
VaultKDF: vaultKDF{MemoryMB: 32, Iterations: 2, Lanes: 2},
OIDC: server.OIDCConfig{
Issuer: "https://id.example.com/realms/main", ClientID: "keeporg",
ClientSecret: "change-me", Scopes: "openid profile email", AutoCreate: false,
},
}
b, err := json.MarshalIndent(ex, "", " ")
if err != nil {
return err
}
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
return err
}
return os.WriteFile(path, append(b, '\n'), 0o600)
}