Free the terminal from the Hosts screen, and fill the room it left

The WebView sat inside the Hosts grid, so navigating to Files or the keychain
hid every open terminal and the strip that named them. A connection you had
opened was invisible from four of the five screens. The window now has two
surfaces rather than one: a nav rail that says which page you are on, and a
terminal strip that is always there and switches the whole content area to a
shell. Screen keeps meaning "which page" and never becomes a sixth kind of
page, which is why this is two properties instead of one enum with a terminal
member in it.

Every screen lives inside one wrapper panel that collapses when a terminal is
showing. That is not tidiness — the WebView hosts a Win32 child window that
composites above everything Avalonia draws, so a screen left visible over its
rectangle is a screen sliced in half, and this window has shipped that defect
once already. One decision point, IsTerminalShowing, and a nested panel rather
than five compound bindings nobody would remember to extend.

The focus choreography is the part no test in this repo can see. Every reveal
path now focuses in the same turn the WebView appeared, so all three of them
post at DispatcherPriority.Loaded and let the native control re-push its bounds
first. Going the other way had a real bug: the screen-changed branch called a
bare Focus() where it had to release the keyboard from the native child, so
switching from a terminal to Files silently ate the first keystrokes. Rare
before this commit and the primary gesture after it.

The tab strip grew a cross inside each tab, a plus that opens the quick-connect
palette, and middle-click close. Nested buttons are correct here: Avalonia
handles a left press on the cross and deliberately does not handle other
buttons, which is exactly what lets middle-click bubble up from the cross as
well as the tab. The test is PointerUpdateKind rather than
IsMiddleButtonPressed, because the latter reports button state and is also true
for a left press made while the middle button happens to be held. The handler
is on the tab and not the strip, so the background closes nothing by
construction. Plus opens the palette rather than a flyout, since a menu
dropping into the WebView's rectangle may or may not composite above a child
HWND and this repo does not make rendering claims it has not photographed.

Everything a user reads now says keychain. The wire, the database and the
cryptographic spec still say vault, deliberately: renaming those is a migration
and a protocol change for a word. That split is written down rather than left
to be rediscovered as an inconsistency.

Four things that were squeezed into the keychain's category rail, or into
nothing at all, now have screens. Pinned host keys get one, with fingerprints
never truncated and a filter that matches them, because comparing what you have
against what the operator published is the whole workflow; the approved date is
read out of the item's UUIDv7 rather than added as a column, and says so, since
it means first approval and not last use. Keys can be generated in the client,
which needed the openssh-key-v1 container written by hand — there is no BCL or
NSec helper, and the PKCS#8 route is unverified in the SSH library this uses.
The armour carries no passphrase: encrypting it needs bcrypt_pbkdf, which is
Blowfish with a swizzle, in a project whose crypto is otherwise entirely
libsodium, for a protection the key's own remarks argue is redundant inside a
vault. Generation fills the existing editor and stops, so SAVE stays the one
thing that writes. ~/.ssh/config can be imported behind a preview that is
ticked per row and writes nothing until the button; IdentityFile records the
path and imports the key material only on an explicit opt-in, because reading
somebody's private key into a vault is precisely the act this product exists to
make deliberate. Match blocks and ProxyJump are reported rather than obeyed —
one cannot be evaluated statically and the other has nothing behind it to route
with, and a preview that implied otherwise would be worse than one that admits
it.

Files can be dragged in all four directions that are honestly available. Remote
to Explorer does not ship and is not pretended to: the shell wants the bytes
during the drop, which needs a virtual file and a native COM data object,
outside what Avalonia offers. Note for the next person that Avalonia 12
replaced the drag model outright — DataObject and DataFormats are no-op stubs
and IDataObject is not in the reference assembly, so every tutorial written for
11 does not compile here.

Hosts can be grouped, flat and never nested. A parent id merged as a scalar
lets two offline clients each re-parent A under B and B under A, producing a
cycle inside an encrypted payload that no server can police and every reader
would have to detect for ever. Membership lives in that payload rather than in
the one plaintext concession ADR 0001 allows, whose test is that the relay
cannot function without it — nothing on the server reads a group, so what
plaintext would hand over is a clustering of the estate for nothing. The
plaintext column reserved for it is dropped, provably always null, and the
server now refuses a client that sends one; it was never populated, was copied
on apply, and was not cleared on delete, so a group id would have outlived the
host it described.

Snippets insert through xterm rather than through the pump, because xterm is
the only thing that knows whether the remote has bracketed paste on, and that
is what makes a shell treat embedded newlines as text instead of as execute.
The host process moves opaque bytes and never parses output, so it would have
to guess, and guessing wrong runs every line. Running is off by default and the
copy says the text goes into whatever is there — the terminal has no notion of
being at a prompt, and may be in vi or at a password prompt with echo off, so
the Enter the user presses themselves is the entire safety property.

Connections and keychain changes are recorded as synced encrypted items, which
is what makes them auditable by a team later and costs the server knowledge of
connection rate and timing from row counts alone. ADR 0001 already concedes it
cannot hide that class of metadata; the trade is now written into it rather
than left implicit. A connection entry is written once, at close, which is what
makes a synced log tractable: nothing to merge, one outbox row, no chance of
colliding with itself. Live sessions come from memory, not from the log. The
write is void by contract and posts to a bounded channel, because putting an
encrypt-and-write on the teardown path of every session is how closing the
application comes to take four seconds. A ticket opened before a lock still
closes afterwards, since a shell outlives the vault. The activity log hooks the
one generic repository every kind writes through, so it cannot miss a caller —
which is also why the log kinds themselves declare they are not audited, or the
first entry would write an entry about writing an entry. It records the names
of the fields that changed and never their values; a log with an old password
in it would be a plaintext credential store with no vault around it. Retention
is 90 days or 5,000 entries, whichever bites first, pruned on the sync loop
rather than on a second timer.

That log traffic then broke the status line, which is worth recording because
the fix is a shape and not a patch: background sync counted its own log rows as
pushed items, so the quiet rule stopped being quiet and every action's message
was overwritten a second later by a sync report. The report now separates log
rows from user items and the rule reads the latter.

S3 buckets appear as a remote in the file browser, behind the same interface an
SFTP session implements, so the queue and both panes did not have to learn what
they are talking to. Uploads go through a pipe, because the queue wants to
write and the SDK wants to read; memory is then bounded by the part size
instead of buffering a file to disk twice.

Finally, the Windows device key store moved out of the session project, which
was the one thing keeping it from being portable — everything else in it is
platform-neutral, and a Windows CNG dependency in the middle of the vault code
meant a second head could not reference it without dragging Windows along. The
seam that made the move free was already there. docs/android-port.md is the
audit behind that: what ports, what does not, in order of cost, the four
decisions taken, and an inventory of every screen and state the interface has
to carry, written so a design can be made from it directly.

dotnet build, dotnet test and dotnet format --verify-no-changes are all clean:
1240 tests at zero warnings, including the end-to-end suite against real
containers. The manual checks that headless Avalonia cannot make — the drag
from Explorer, a generated key against a real host, twelve tabs at the minimum
window width — are listed in docs/manual-checks.md and are still outstanding.
This commit is contained in:
2026-07-31 20:30:05 +02:00
parent 1292084af9
commit d07b336868
163 changed files with 24491 additions and 647 deletions
@@ -10,6 +10,9 @@ internal static class HostFactory
/// <summary>A vault SSH key id, for the hosts that bind one.</summary>
internal static Guid DeployKey { get; } = Guid.Parse("0192f0c8-3333-7c3d-8e4f-5a6b7c8d9e03");
/// <summary>A group id, for the hosts that are filed under one.</summary>
internal static Guid Production { get; } = Guid.Parse("0192f0c8-4444-7c3d-8e4f-5a6b7c8d9e04");
internal static HostSecret Host(
string label = "prod-db",
string hostname = "db.internal",
@@ -20,7 +23,8 @@ internal static class HostFactory
(string Name, string Value)[]? options = null,
bool relayEnabled = false,
Guid? sshKeyId = null,
Guid? credentialId = null) =>
Guid? credentialId = null,
Guid? groupId = null) =>
new()
{
Label = label,
@@ -35,5 +39,6 @@ internal static class HostFactory
RelayEnabled = relayEnabled,
SshKeyId = sshKeyId,
CredentialId = credentialId,
GroupId = groupId,
};
}
@@ -0,0 +1,101 @@
using System.Text;
namespace DodoSSH.Client.Domain.Tests;
/// <summary>
/// A group: one name, and the reasons it is only that.
/// </summary>
/// <remarks>
/// There is very little behaviour here to test, which is itself the design — every field that was considered
/// and left out (a parent, a member list) was left out because of what it would do to the merge. What these
/// tests pin is that the envelope round-trips, that a nameless group cannot be stored, and that renaming the
/// same group on two machines is reported rather than silently resolved.
/// </remarks>
public sealed class HostGroupSecretTests
{
[Fact]
public void AGroup_RoundTrips()
{
var group = new HostGroupSecret { Label = "production" };
HostGroupSecretCodec.TryDecode(HostGroupSecretCodec.Encode(group), out var document)
.ShouldBeTrue();
document.ShouldNotBeNull();
document.Group.ShouldBe(group);
document.SchemaVersion.ShouldBe(HostGroupSecretCodec.CurrentSchemaVersion);
document.IsReadOnly.ShouldBeFalse();
}
[Theory]
[InlineData("")]
[InlineData(" ")]
public void AGroupWithNoName_IsRefused(string label)
{
new HostGroupSecret { Label = label }.TryValidate(out var reason).ShouldBeFalse();
reason.ShouldNotBeNull();
}
[Fact]
public void AGroupWrittenByANewerClient_IsReadableButNotWritableHere()
{
var payload = Encoding.UTF8.GetBytes(
"""
{"schemaVersion":99,"label":"production","colour":"a field this build has never heard of"}
""");
HostGroupSecretCodec.TryDecode(payload, out var document).ShouldBeTrue();
document.ShouldNotBeNull();
document.Group.Label.ShouldBe("production");
document.IsReadOnly.ShouldBeTrue();
}
[Fact]
public void AnUnnamedPayload_FailsToDecodeRatherThanProducingABlankGroup()
{
// Failing closed, as every codec in this folder does: a group with no name is indistinguishable in
// the sidebar from the ungrouped heading it would sit beside.
var payload = Encoding.UTF8.GetBytes("""{"schemaVersion":1}""");
HostGroupSecretCodec.TryDecode(payload, out var document).ShouldBeFalse();
document.ShouldBeNull();
}
[Fact]
public void TwoDifferentRenames_AreReportedWithBothNames()
{
var ancestor = new HostGroupSecret { Label = "production" };
var result = HostGroupSecretMerge.Merge(
ancestor,
ancestor with { Label = "prod" },
ancestor with { Label = "live" });
result.Merged.Label.ShouldBe("live");
var conflict = result.Conflicts.ShouldHaveSingleItem();
conflict.Field.ShouldBe(nameof(HostGroupSecret.Label));
conflict.Kept.ShouldBe("live");
conflict.Discarded.ShouldBe("prod");
}
/// <remarks>
/// The case that would collide if membership were held on the group instead of on each host: two people
/// filing two different machines into one group at the same time. It cannot reach the merge at all,
/// because neither of those actions writes to this item.
/// </remarks>
[Fact]
public void FilingHostsIntoAGroup_DoesNotTouchTheGroup()
{
var ancestor = new HostGroupSecret { Label = "production" };
var result = HostGroupSecretMerge.Merge(ancestor, ancestor, ancestor);
result.HasConflicts.ShouldBeFalse();
result.Merged.ShouldBe(ancestor);
}
}
@@ -15,10 +15,10 @@ namespace DodoSSH.Client.Domain.Tests;
public sealed class HostSecretCodecTests
{
/// <remarks>
/// "Full" cannot mean every field any more: the two bindings are mutually exclusive, so a host may carry
/// a key or a credential and never both. This one carries the credential because that is the newer of
/// the two and therefore the highest schema version a valid host can reach; the key-bound case has its
/// own version test below.
/// "Full" cannot mean every field: the two authentication bindings are mutually exclusive, so a host may
/// carry a key or a credential and never both. This one carries the credential, because that is the newer
/// of the two, plus a group — which is orthogonal to both and is what makes this host reach the highest
/// schema version a valid host can.
/// </remarks>
[Fact]
public void AFullHost_RoundTrips()
@@ -34,7 +34,8 @@ public sealed class HostSecretCodecTests
jumps: [Bastion, Relay],
options: [("ServerAliveInterval", "30"), ("Compression", "yes")],
relayEnabled: true,
credentialId: credentialId);
credentialId: credentialId,
groupId: Production);
HostSecretCodec.TryDecode(HostSecretCodec.Encode(host), out var document).ShouldBeTrue();
@@ -91,7 +92,7 @@ public sealed class HostSecretCodecTests
[Fact]
public void AKeyBoundHost_IsNotDraggedOntoTheCredentialVersion()
{
// The point of the ladder. Adding credentials must not make every key-bound host in every vault
// The point of the rule. Adding credentials must not make every key-bound host in every vault
// read-only on a client that understands keys perfectly well.
HostSecretCodec
.TryDecode(HostSecretCodec.Encode(Host(sshKeyId: DeployKey)), out var document)
@@ -103,6 +104,48 @@ public sealed class HostSecretCodecTests
version.ShouldBeLessThan(HostSecretCodec.CredentialIdSchemaVersion);
}
[Fact]
public void AGroupedHost_IsWrittenAtTheVersionThatIntroducedGroups()
{
HostSecretCodec
.TryDecode(HostSecretCodec.Encode(Host(groupId: Production)), out var document)
.ShouldBeTrue();
document.ShouldNotBeNull();
document.SchemaVersion.ShouldBe(HostSecretCodec.GroupIdSchemaVersion);
document.Host.GroupId.ShouldBe(Production);
}
/// <remarks>
/// <para>
/// The case that turned the version rule from a ladder into a maximum, and the one that would have shipped
/// a real defect. A group is orthogonal to the two authentication bindings — a host may carry a credential
/// and a group at once — so a <c>switch</c> returning the first match would have answered 3 for this host:
/// a version that has no concept of the group the same write just stored.
/// </para>
/// <para>
/// What that produces is worse than a wrong number. An older client reads schema 3, concludes the payload
/// holds nothing it does not understand, offers to edit the host, and drops the group on save — silently,
/// on every machine that has not been upgraded. Asserted for both bindings, because the ladder's order
/// meant only one of the two would have been caught by a single case.
/// </para>
/// </remarks>
[Theory]
[InlineData(true)]
[InlineData(false)]
public void AHostThatIsBothBoundAndGrouped_IsWrittenAtTheHigherOfTheTwo(bool byCredential)
{
var host = byCredential
? Host(credentialId: Guid.CreateVersion7(), groupId: Production)
: Host(sshKeyId: DeployKey, groupId: Production);
HostSecretCodec.TryDecode(HostSecretCodec.Encode(host), out var document).ShouldBeTrue();
document.ShouldNotBeNull();
document.SchemaVersion.ShouldBe(HostSecretCodec.GroupIdSchemaVersion);
document.Host.ShouldBe(host);
}
[Fact]
public void AddingTheKeyField_DidNotChangeTheBytesOfAHostWithoutOne()
{
@@ -0,0 +1,175 @@
using System.Text;
namespace DodoSSH.Client.Domain.Tests;
/// <summary>
/// A saved command: what it stores, and what it refuses to change about it.
/// </summary>
/// <remarks>
/// Two things carry weight. That the text survives a round trip untouched, because a shell is not forgiving
/// about whitespace it did not expect. And that <see cref="SnippetSecret.RunsOnInsert"/> only ever becomes
/// true because somebody set it — never because a decode defaulted it, and never because a merge picked a
/// side.
/// </remarks>
public sealed class SnippetSecretTests
{
[Fact]
public void ASnippet_RoundTrips()
{
var snippet = new SnippetSecret
{
Label = "restart the api",
Command = "sudo systemctl restart dodossh-api",
Notes = "check the on-call rota first",
RunsOnInsert = true,
};
SnippetSecretCodec.TryDecode(SnippetSecretCodec.Encode(snippet), out var document)
.ShouldBeTrue();
document.ShouldNotBeNull();
document.Snippet.ShouldBe(snippet);
document.SchemaVersion.ShouldBe(SnippetSecretCodec.CurrentSchemaVersion);
document.IsReadOnly.ShouldBeFalse();
}
/// <remarks>
/// The property the whole type is built around. A heredoc's terminator has to arrive on a line of its
/// own with nothing after it; trim the trailing newline and the shell waits for one that never comes,
/// which looks to the user like the snippet hanging the terminal.
/// </remarks>
[Theory]
[InlineData(" indented\n")]
[InlineData("cat <<'EOF'\nline one\nEOF\n")]
[InlineData("first\r\nsecond\r\n")]
[InlineData("trailing space ")]
[InlineData("")]
public void TheCommandSurvivesAsItWasWritten(string command)
{
var snippet = new SnippetSecret { Label = "verbatim", Command = command };
SnippetSecretCodec.TryDecode(SnippetSecretCodec.Encode(snippet), out var document)
.ShouldBeTrue();
document.ShouldNotBeNull().Snippet.Command.ShouldBe(command);
}
[Fact]
public void ARunFlagThatIsMissingFromThePayload_ReadsAsOff()
{
// The safe direction, and the one a truncated or hand-written payload has to fall in: a snippet
// whose flag could not be read must not be one that runs on its own.
var payload = Encoding.UTF8.GetBytes(
"""
{"schemaVersion":1,"label":"restart","command":"sudo reboot"}
""");
SnippetSecretCodec.TryDecode(payload, out var document).ShouldBeTrue();
document.ShouldNotBeNull().Snippet.RunsOnInsert.ShouldBeFalse();
}
[Theory]
[InlineData("", "echo hi")]
[InlineData(" ", "echo hi")]
[InlineData("named", "")]
public void AnUnusableSnippet_IsRefused(string label, string command)
{
new SnippetSecret { Label = label, Command = command }
.TryValidate(out var reason)
.ShouldBeFalse();
reason.ShouldNotBeNull();
}
/// <remarks>
/// Whitespace is a legitimate command — a bare space at a prompt, an indented continuation line — so the
/// blank check on the text is deliberately <c>IsNullOrEmpty</c> rather than the whitespace-aware one used
/// on the label.
/// </remarks>
[Fact]
public void ACommandThatIsNothingButWhitespace_IsAllowed()
{
new SnippetSecret { Label = "a space", Command = " " }.TryValidate(out _).ShouldBeTrue();
}
// ---- The merge ----
[Fact]
public void AnUncontestedEdit_IsTakenFromWhicheverSideMadeIt()
{
var ancestor = Snippet();
var local = ancestor with { Notes = "now with a note" };
var result = SnippetSecretMerge.Merge(ancestor, local, ancestor);
result.HasConflicts.ShouldBeFalse();
result.Merged.Notes.ShouldBe("now with a note");
}
/// <remarks>
/// <para>
/// The property that matters about this field, stated over every combination there is: a merge never
/// produces a snippet that runs on its own unless one of the two sides asked for one. It holds for a
/// structural reason rather than a defensive one — a three-way clash needs both sides to differ from the
/// ancestor and from each other, which two values cannot do — and that is exactly why it is worth a test.
/// The reasoning is easy to lose, and the field is the whole safety story.
/// </para>
/// <para>
/// An earlier draft of the merge special-cased a clash here to resolve to <see langword="false"/>. This
/// test is what showed the branch was unreachable.
/// </para>
/// </remarks>
[Theory]
[InlineData(false, false, false, false)]
[InlineData(false, true, false, true)]
[InlineData(false, false, true, true)]
[InlineData(false, true, true, true)]
[InlineData(true, false, true, false)]
[InlineData(true, true, false, false)]
[InlineData(true, true, true, true)]
public void TheRunFlag_OnlyEverBecomesTrueBecauseASideAskedForIt(
bool ancestor,
bool local,
bool remote,
bool expected)
{
var start = Snippet() with { RunsOnInsert = ancestor };
var result = SnippetSecretMerge.Merge(
start,
start with { RunsOnInsert = local },
start with { RunsOnInsert = remote });
result.Merged.RunsOnInsert.ShouldBe(expected);
result.Conflicts.ShouldNotContain(
conflict => conflict.Field == nameof(SnippetSecret.RunsOnInsert),
"a two-valued field cannot produce a three-way conflict");
}
[Fact]
public void TwoDifferentEditsToTheCommand_AreReportedWithBothTexts()
{
// Nothing is redacted here, unlike a credential: a snippet is text somebody wrote on purpose, and a
// notice that hid the discarded version would leave them unable to tell which one survived.
var ancestor = Snippet();
var result = SnippetSecretMerge.Merge(
ancestor,
ancestor with { Command = "systemctl restart api" },
ancestor with { Command = "systemctl reload api" });
var conflict = result.Conflicts.ShouldHaveSingleItem();
conflict.Field.ShouldBe(nameof(SnippetSecret.Command));
conflict.Kept.ShouldBe("systemctl reload api");
conflict.Discarded.ShouldBe("systemctl restart api");
}
private static SnippetSecret Snippet() => new()
{
Label = "restart the api",
Command = "sudo systemctl restart dodossh-api",
};
}
@@ -0,0 +1,54 @@
using DodoSSH.Client.Domain;
namespace DodoSSH.Client.Domain.Tests;
/// <summary>
/// Reading a creation time back out of an identifier this client minted.
/// </summary>
/// <remarks>
/// The whole value of this helper is that it is the only creation time any vault item has, so the two cases
/// that matter are that a real id gives a plausible answer and that anything else gives none. A version 4
/// id answering with a date would be worse than answering nothing: it would be a plausible wrong date on a
/// screen somebody is using to decide whether a pin is stale.
/// </remarks>
public sealed class Uuid7TimestampTests
{
[Fact]
public void AFreshlyMintedId_CarriesTheMomentItWasMade()
{
// TimeProvider, because DateTimeOffset.UtcNow is banned repo-wide — see BannedSymbols.txt. The real
// clock rather than a fake one is the point here: what is being checked is that the id Guid mints
// for itself, from a clock nothing in this test controls, reads back as the moment it happened.
var before = TimeProvider.System.GetUtcNow().AddSeconds(-5);
var id = Guid.CreateVersion7();
var after = TimeProvider.System.GetUtcNow().AddSeconds(5);
var stamped = Uuid7Timestamp.Of(id).ShouldNotBeNull();
stamped.ShouldBeGreaterThanOrEqualTo(before);
stamped.ShouldBeLessThanOrEqualTo(after);
}
/// <remarks>
/// The one that catches a little-endian read. Guid stores its first three fields in host order, so
/// taking the bytes the obvious way scrambles precisely the six this reads — and produces dates tens of
/// thousands of years out rather than throwing, which is why an ordering assertion is worth having on
/// top of the range check above.
/// </remarks>
[Fact]
public void TwoIdsMintedInOrder_ReadBackInThatOrder()
{
var first = Guid.CreateVersion7(DateTimeOffset.FromUnixTimeMilliseconds(1_500_000_000_000));
var second = Guid.CreateVersion7(DateTimeOffset.FromUnixTimeMilliseconds(1_700_000_000_000));
Uuid7Timestamp.Of(first).ShouldBe(DateTimeOffset.FromUnixTimeMilliseconds(1_500_000_000_000));
Uuid7Timestamp.Of(second).ShouldBe(DateTimeOffset.FromUnixTimeMilliseconds(1_700_000_000_000));
}
[Fact]
public void AnIdThatIsNotVersionSeven_HasNoTimeToRead()
{
Uuid7Timestamp.Of(Guid.Parse("f81d4fae-7dec-41d0-a765-00a0c91e6bf6")).ShouldBeNull();
Uuid7Timestamp.Of(Guid.Empty).ShouldBeNull();
}
}