root
a9308a3e89
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.
62 lines
2.4 KiB
Go
62 lines
2.4 KiB
Go
package client
|
|
|
|
import "testing"
|
|
|
|
func TestDecideTable(t *testing.T) {
|
|
// A database this client has synced at version 2, digest "a".
|
|
base := situation{LocalExists: true, LocalSHA: "a", SyncedSHA: "a", SyncedVersion: 2,
|
|
RemoteSHA: "a", RemoteVersion: 2, CanWrite: true, Strategy: "server-wins"}
|
|
|
|
with := func(f func(*situation)) situation {
|
|
s := base
|
|
f(&s)
|
|
return s
|
|
}
|
|
|
|
for _, tc := range []struct {
|
|
name string
|
|
s situation
|
|
want action
|
|
}{
|
|
{"settled", base, actNothing},
|
|
{"local save", with(func(s *situation) { s.LocalSHA = "b" }), actPush},
|
|
{"remote update", with(func(s *situation) { s.RemoteSHA, s.RemoteVersion = "c", 3 }), actPull},
|
|
{"missing local file", with(func(s *situation) { s.LocalExists = false }), actPull},
|
|
{"missing local file, empty database", situation{RemoteVersion: 0}, actNothing},
|
|
{"adopt a local file into an empty database",
|
|
situation{LocalExists: true, LocalSHA: "a", CanWrite: true, Strategy: "server-wins"}, actPush},
|
|
{"both changed, server wins", with(func(s *situation) {
|
|
s.LocalSHA, s.RemoteSHA, s.RemoteVersion = "b", "c", 3
|
|
}), actServerWins},
|
|
{"both changed, client wins", with(func(s *situation) {
|
|
s.LocalSHA, s.RemoteSHA, s.RemoteVersion, s.Strategy = "b", "c", 3, "client-wins"
|
|
}), actForcePush},
|
|
{"both changed, merge", with(func(s *situation) {
|
|
s.LocalSHA, s.RemoteSHA, s.RemoteVersion, s.Strategy = "b", "c", 3, "merge"
|
|
}), actPushForMerge},
|
|
{"local save on a merge vault with no remote change", with(func(s *situation) {
|
|
s.LocalSHA, s.Strategy = "b", "merge"
|
|
}), actPush},
|
|
{"both changed, manual", with(func(s *situation) {
|
|
s.LocalSHA, s.RemoteSHA, s.RemoteVersion, s.Strategy = "b", "c", 3, "manual"
|
|
}), actManual},
|
|
{"manual conflict already reported", with(func(s *situation) {
|
|
s.LocalSHA, s.RemoteSHA, s.RemoteVersion, s.Strategy = "b", "c", 3, "manual"
|
|
s.ConflictSeen = true
|
|
}), actNothing},
|
|
{"local save without write access", with(func(s *situation) {
|
|
s.LocalSHA, s.CanWrite = "b", false
|
|
}), actRestore},
|
|
{"both changed without write access", with(func(s *situation) {
|
|
s.LocalSHA, s.RemoteSHA, s.RemoteVersion, s.CanWrite = "b", "c", 3, false
|
|
}), actRestore},
|
|
{"version moved but content identical", with(func(s *situation) {
|
|
s.RemoteVersion = 3
|
|
}), actPull},
|
|
} {
|
|
if got := decide(tc.s); got != tc.want {
|
|
t.Errorf("%s: decide = %s, want %s", tc.name, got, tc.want)
|
|
}
|
|
}
|
|
}
|