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.
186 lines
6.2 KiB
Go
186 lines
6.2 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/url"
|
|
"time"
|
|
)
|
|
|
|
// Group is a node of the server's group tree as the client sees it.
|
|
type Group struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
ParentID string `json:"parent_id"`
|
|
Admin bool `json:"admin"`
|
|
Members int `json:"members"`
|
|
}
|
|
|
|
// Invite is a registration link.
|
|
type Invite struct {
|
|
Token string `json:"token"`
|
|
URL string `json:"url"`
|
|
GroupID string `json:"group_id"`
|
|
Role string `json:"role"`
|
|
Uses int `json:"uses"`
|
|
MaxUses int `json:"max_uses"`
|
|
ExpiresAt time.Time `json:"expires_at"`
|
|
}
|
|
|
|
// User is an account as an administrator sees it.
|
|
type User struct {
|
|
ID string `json:"id"`
|
|
Username string `json:"username"`
|
|
Email string `json:"email"`
|
|
ServerAdmin bool `json:"server_admin"`
|
|
TOTPEnabled bool `json:"totp_enabled"`
|
|
}
|
|
|
|
// Identity is the answer to "who am I and where do I belong".
|
|
type Identity struct {
|
|
User
|
|
Groups []struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
Role string `json:"role"`
|
|
} `json:"groups"`
|
|
}
|
|
|
|
func (a *API) Whoami(ctx context.Context) (*Identity, error) {
|
|
var out Identity
|
|
return &out, a.do(ctx, http.MethodGet, "/api/v1/auth/whoami", nil, &out)
|
|
}
|
|
|
|
func (a *API) Groups(ctx context.Context) ([]Group, error) {
|
|
var out struct {
|
|
Groups []Group `json:"groups"`
|
|
}
|
|
err := a.do(ctx, http.MethodGet, "/api/v1/groups", nil, &out)
|
|
return out.Groups, err
|
|
}
|
|
|
|
func (a *API) CreateGroup(ctx context.Context, name, parentID string) (*Group, error) {
|
|
var out Group
|
|
return &out, a.do(ctx, http.MethodPost, "/api/v1/groups",
|
|
map[string]string{"name": name, "parent_id": parentID}, &out)
|
|
}
|
|
|
|
func (a *API) DeleteGroup(ctx context.Context, id string) error {
|
|
return a.do(ctx, http.MethodDelete, "/api/v1/groups/"+url.PathEscape(id), nil, nil)
|
|
}
|
|
|
|
func (a *API) SetMember(ctx context.Context, groupID, username, role string) error {
|
|
return a.do(ctx, http.MethodPost,
|
|
"/api/v1/groups/"+url.PathEscape(groupID)+"/members",
|
|
map[string]string{"username": username, "role": role}, nil)
|
|
}
|
|
|
|
func (a *API) RemoveMember(ctx context.Context, groupID, user string) error {
|
|
return a.do(ctx, http.MethodDelete,
|
|
"/api/v1/groups/"+url.PathEscape(groupID)+"/members/"+url.PathEscape(user), nil, nil)
|
|
}
|
|
|
|
func (a *API) CreateDatabase(ctx context.Context, name, groupID, strategy string) (*Database, error) {
|
|
body := map[string]string{"name": name, "owner_group_id": groupID}
|
|
if strategy != "" {
|
|
body["merge_strategy"] = strategy
|
|
}
|
|
var out Database
|
|
return &out, a.do(ctx, http.MethodPost, "/api/v1/databases", body, &out)
|
|
}
|
|
|
|
// SetStrategy changes the merge strategy of a database. Only an
|
|
// administrator of the owning group may do this.
|
|
func (a *API) SetStrategy(ctx context.Context, dbID, strategy string) (*Database, error) {
|
|
var out Database
|
|
return &out, a.do(ctx, http.MethodPatch, "/api/v1/databases/"+url.PathEscape(dbID),
|
|
map[string]string{"merge_strategy": strategy}, &out)
|
|
}
|
|
|
|
func (a *API) RenameDatabase(ctx context.Context, dbID, name string) (*Database, error) {
|
|
var out Database
|
|
return &out, a.do(ctx, http.MethodPatch, "/api/v1/databases/"+url.PathEscape(dbID),
|
|
map[string]string{"name": name}, &out)
|
|
}
|
|
|
|
func (a *API) DeleteDatabase(ctx context.Context, dbID string) error {
|
|
return a.do(ctx, http.MethodDelete, "/api/v1/databases/"+url.PathEscape(dbID), nil, nil)
|
|
}
|
|
|
|
func (a *API) SetGrant(ctx context.Context, groupID, dbID, perm string) error {
|
|
return a.do(ctx, http.MethodPost, "/api/v1/grants",
|
|
map[string]string{"group_id": groupID, "database_id": dbID, "perm": perm}, nil)
|
|
}
|
|
|
|
func (a *API) DeleteGrant(ctx context.Context, groupID, dbID string) error {
|
|
q := url.Values{"group_id": {groupID}, "database_id": {dbID}}
|
|
return a.do(ctx, http.MethodDelete, "/api/v1/grants?"+q.Encode(), nil, nil)
|
|
}
|
|
|
|
func (a *API) CreateInvite(ctx context.Context, groupID, role string, ttlHours, maxUses int) (*Invite, error) {
|
|
var out Invite
|
|
return &out, a.do(ctx, http.MethodPost, "/api/v1/invites", map[string]any{
|
|
"group_id": groupID, "role": role, "ttl_hours": ttlHours, "max_uses": maxUses}, &out)
|
|
}
|
|
|
|
func (a *API) Invites(ctx context.Context) ([]Invite, error) {
|
|
var out struct {
|
|
Invites []Invite `json:"invites"`
|
|
}
|
|
err := a.do(ctx, http.MethodGet, "/api/v1/invites", nil, &out)
|
|
return out.Invites, err
|
|
}
|
|
|
|
func (a *API) Users(ctx context.Context) ([]User, error) {
|
|
var out struct {
|
|
Users []User `json:"users"`
|
|
}
|
|
err := a.do(ctx, http.MethodGet, "/api/v1/users", nil, &out)
|
|
return out.Users, err
|
|
}
|
|
|
|
// EnrollTOTP starts second-factor enrolment and returns the shared secret
|
|
// and its otpauth URI.
|
|
func (a *API) EnrollTOTP(ctx context.Context) (secret, uri string, err error) {
|
|
var out struct {
|
|
Secret string `json:"secret"`
|
|
URI string `json:"uri"`
|
|
}
|
|
err = a.do(ctx, http.MethodPost, "/api/v1/auth/totp/enroll", nil, &out)
|
|
return out.Secret, out.URI, err
|
|
}
|
|
|
|
// ConfirmTOTP completes enrolment by proving the secret was stored.
|
|
func (a *API) ConfirmTOTP(ctx context.Context, code string) error {
|
|
return a.do(ctx, http.MethodPost, "/api/v1/auth/totp/confirm",
|
|
map[string]string{"code": code}, nil)
|
|
}
|
|
|
|
// CreateVault asks the server to create a new, empty KDBX vault encrypted
|
|
// with this password. For the merge strategy the server keeps the password,
|
|
// wrapped under its master key, because merging means opening the file.
|
|
func (a *API) CreateVault(ctx context.Context, name, groupID, strategy, password string) (*Database, error) {
|
|
var out Database
|
|
return &out, a.do(ctx, http.MethodPost, "/api/v1/vaults", map[string]string{
|
|
"name": name, "owner_group_id": groupID,
|
|
"merge_strategy": strategy, "password": password,
|
|
}, &out)
|
|
}
|
|
|
|
// StoreVaultKey gives the server the password of an existing database, so it
|
|
// can merge it. The server verifies the password against the stored file
|
|
// before accepting it.
|
|
func (a *API) StoreVaultKey(ctx context.Context, dbID, password string) error {
|
|
return a.do(ctx, http.MethodPost,
|
|
"/api/v1/databases/"+url.PathEscape(dbID)+"/key",
|
|
map[string]any{"password": password}, nil)
|
|
}
|
|
|
|
// ForgetVaultKey removes the stored password, which also ends any ability to
|
|
// merge that database here.
|
|
func (a *API) ForgetVaultKey(ctx context.Context, dbID string) error {
|
|
return a.do(ctx, http.MethodPost,
|
|
"/api/v1/databases/"+url.PathEscape(dbID)+"/key",
|
|
map[string]any{"forget": true}, nil)
|
|
}
|