DodoTech-Public/DodoSSH
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

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

Browse Source 
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:
jaap-jan
2026-07-31 20:30:05 +02:00
parent 1292084af9
commit d07b336868
163 changed files with 24491 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/DodoSSH.Client.Import.Tests/SshConfigParserTests.cs
+353
View File
@@ -0,0 +1,353 @@
using DodoSSH.Client.Import;
namespace DodoSSH.Client.Import.Tests;
/// <summary>
/// Reading real-world <c>ssh_config</c> shapes.
/// </summary>
/// <remarks>
/// Every case here is something a person's actual file contains. The value of an importer is entirely in
/// whether it agrees with <c>ssh</c> about what a file means — an importer that is nearly right produces
/// bookmarks that nearly connect, which is worse than one that refused.
/// </remarks>
public sealed class SshConfigParserTests
{
[Fact]
public void APlainBlock_ResolvesItsFields()
{
var import = Read("""
Host prod-db
HostName db.internal
User deploy
Port 2222
""");
var host = import.Hosts.ShouldHaveSingleItem();
host.Alias.ShouldBe("prod-db");
host.Hostname.ShouldBe("db.internal");
host.Username.ShouldBe("deploy");
host.Port.ShouldBe(2222);
host.Address.ShouldBe("deploy@db.internal:2222");
}
/// <remarks>
/// OpenSSH's own default, and the reason <c>Host db.internal</c> on its own works at all.
/// </remarks>
[Fact]
public void ABlockWithNoHostName_DialsItsAlias()
{
var host = Read("Host db.internal").Hosts.ShouldHaveSingleItem();
host.Hostname.ShouldBe("db.internal");
host.Port.ShouldBe(22);
host.Username.ShouldBeNull();
}
[Fact]
public void OneLineNamingSeveralHosts_YieldsOnePerName()
{
var import = Read("""
Host web1 web2 web3
User deploy
""");
import.Hosts.Select(host => host.Alias).ShouldBe(["web1", "web2", "web3"]);
import.Hosts.ShouldAllBe(host => host.Username == "deploy");
}
/// <remarks>
/// The rule that is not the intuitive one. A <c>Host *</c> block supplies what nothing earlier set and
/// cannot override what it did — get this backwards and every imported host takes the wildcard's
/// username.
/// </remarks>
[Fact]
public void AWildcardBlock_SuppliesDefaultsAndDoesNotOverride()
{
var import = Read("""
Host prod-db
HostName db.internal
User deploy
Host *
User root
Port 2200
""");
var host = import.Hosts.ShouldHaveSingleItem();
host.Username.ShouldBe("deploy", "the earlier block set it first");
host.Port.ShouldBe(2200, "nothing earlier set a port");
}
[Fact]
public void AWildcardBlock_IsNotItselfImported()
{
var import = Read("""
Host *.internal
User deploy
Host prod-db
HostName db.internal
""");
import.Hosts.ShouldHaveSingleItem().Alias.ShouldBe("prod-db");
import.SkippedPatterns.ShouldContain("*.internal", StringComparer.Ordinal);
import.Warnings.ShouldContain(warning => warning.Contains("*.internal", StringComparison.Ordinal));
}
[Fact]
public void AWildcardBlock_AppliesToTheHostsItMatches()
{
var import = Read("""
Host *.internal
User deploy
Host db.internal
Host web.example.com
""");
Alias(import, "db.internal").Username.ShouldBe("deploy");
Alias(import, "web.example.com").Username.ShouldBeNull();
}
[Theory]
[InlineData("Host prod-db\n Port=2222")]
[InlineData("Host prod-db\n Port = 2222")]
[InlineData("Host prod-db\n\tPort\t2222")]
public void TheFormsOpenSshAccepts_AllParse(string text)
{
Read(text).Hosts.ShouldHaveSingleItem().Port.ShouldBe(2222);
}
/// <remarks>
/// A whole-line <c>#</c> only, which is OpenSSH's rule: a <c>#</c> partway through a line is part of the
/// value, not the start of a comment. Treating it as one would silently truncate any value containing a
/// hash.
/// </remarks>
[Fact]
public void CommentsAndBlankLines_AreIgnored()
{
var import = Read("""
# my hosts
Host prod-db
HostName db.internal
#Host commented-out
# HostName nowhere
""");
import.Hosts.ShouldHaveSingleItem().Alias.ShouldBe("prod-db");
import.Hosts.ShouldNotContain(host => host.Alias == "commented-out");
}
[Fact]
public void AQuotedValue_KeepsItsSpaces()
{
var host = Read("""
Host prod-db
IdentityFile "C:\keys\my key"
""").Hosts.ShouldHaveSingleItem();
host.IdentityFiles.ShouldHaveSingleItem().ShouldBe(@"C:\keys\my key");
}
/// <remarks>
/// The keyword that legitimately repeats — <c>ssh</c> tries each in turn — so it accumulates rather than
/// being reported as a duplicate.
/// </remarks>
[Fact]
public void SeveralIdentityFiles_AreAllKept()
{
var host = Read("""
Host prod-db
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
""").Hosts.ShouldHaveSingleItem();
host.IdentityFiles.Count.ShouldBe(2);
host.Warnings.ShouldBeEmpty("repeating IdentityFile is not a mistake");
}
/// <remarks>
/// <c>HostOptions</c> is unique by name and cannot represent a repeat, which its own remarks call an M1
/// limitation the import path must surface rather than quietly resolve. This is that surfacing.
/// </remarks>
[Fact]
public void ARepeatedKeyword_KeepsTheFirstAndSaysSo()
{
var host = Read("""
Host prod-db
ServerAliveInterval 30
serveraliveinterval 60
""").Hosts.ShouldHaveSingleItem();
host.Options
.Single(option => string.Equals(option.Name, "ServerAliveInterval", StringComparison.Ordinal))
.Value.ShouldBe("30");
host.Warnings.ShouldContain(warning =>
warning.Contains("ServerAliveInterval", StringComparison.OrdinalIgnoreCase));
}
/// <remarks>
/// Whether a <c>Match</c> applies depends on what is being connected to, or on a command's output.
/// Neither is knowable from the file, so its directives are dropped — the failure to avoid is
/// attributing them to whichever block happened to come before, which is what a parser that only knows
/// about <c>Host</c> does.
/// </remarks>
[Fact]
public void AMatchBlock_IsIgnoredAndItsDirectivesDoNotLeak()
{
var import = Read("""
Host prod-db
HostName db.internal
Match host bastion
User root
Port 2200
""");
var host = import.Hosts.ShouldHaveSingleItem();
host.Username.ShouldBeNull("a Match block's directives belong to nobody");
host.Port.ShouldBe(22);
import.Warnings.ShouldContain(warning => warning.Contains("Match", StringComparison.Ordinal));
}
[Fact]
public void AnInclude_IsReadInPlace()
{
var import = SshConfigResolver.Resolve(SshConfigParser.Parse(
"""
Include conf.d/*.conf
Host *
User fallback
""",
_ =>
[
"""
Host prod-db
HostName db.internal
User deploy
""",
]));
var host = import.Hosts.ShouldHaveSingleItem();
host.Alias.ShouldBe("prod-db");
host.Username.ShouldBe("deploy", "the include comes before the wildcard block that follows it");
}
/// <remarks>
/// A file that includes itself would otherwise be read to the depth cap, importing the same hosts
/// sixteen times — which reads as a bug in the importer rather than in the config.
/// </remarks>
[Fact]
public void AnIncludeCycle_StopsAndSaysSo()
{
var import = SshConfigResolver.Resolve(SshConfigParser.Parse(
"Include loop.conf",
_ =>
[
"""
Include loop.conf
Host prod-db
""",
]));
import.Hosts.ShouldHaveSingleItem().Alias.ShouldBe("prod-db");
import.Warnings.ShouldContain(warning => warning.Contains("already being read", StringComparison.Ordinal));
}
[Fact]
public void CrlfAndAByteOrderMark_ParseTheSameAsPlainText()
{
var import = Read("\ufeffHost prod-db\r\n HostName db.internal\r\n Port 2222\r\n");
var host = import.Hosts.ShouldHaveSingleItem();
host.Alias.ShouldBe("prod-db");
host.Hostname.ShouldBe("db.internal");
host.Port.ShouldBe(2222);
}
[Fact]
public void AnUnusablePort_FallsBackToTwentyTwoAndSaysSo()
{
var host = Read("""
Host prod-db
Port not-a-number
""").Hosts.ShouldHaveSingleItem();
host.Port.ShouldBe(22);
host.Warnings.ShouldContain(warning => warning.Contains("not-a-number", StringComparison.Ordinal));
}
/// <remarks>
/// Recorded, and explicitly not honoured: the SSH layer has no jump hosts. A bastion topology that
/// imported and quietly did not route would be the worst of the three options.
/// </remarks>
[Fact]
public void ProxyJump_IsRecordedAsIntentAndFlagged()
{
var host = Read("""
Host prod-db
HostName db.internal
ProxyJump bastion
""").Hosts.ShouldHaveSingleItem();
host.ProxyJump.ShouldBe("bastion");
var secret = host.ToSecret();
secret.Options.ShouldContain(option => option.Name == "ProxyJump" && option.Value == "bastion");
secret.Notes.ShouldNotBeNull().ShouldContain("does not route");
}
[Fact]
public void ProxyCommand_IsDroppedRatherThanStoredAsIfItWorked()
{
var host = Read("""
Host prod-db
ProxyCommand nc %h %p
""").Hosts.ShouldHaveSingleItem();
host.Options.ShouldNotContain(option => option.Name == "ProxyCommand");
host.Warnings.ShouldContain(warning => warning.Contains("ProxyCommand", StringComparison.Ordinal));
}
/// <remarks>
/// A directive that maps onto a first-class field must not <em>also</em> land in Options, or a host has
/// two places recording its port and one of them will be forgotten on the next edit.
/// </remarks>
[Fact]
public void FirstClassFields_DoNotAlsoAppearAsDirectives()
{
var secret = Read("""
Host prod-db
HostName db.internal
User deploy
Port 2222
ServerAliveInterval 30
""").Hosts.ShouldHaveSingleItem().ToSecret();
secret.Options.Select(option => option.Name).ShouldBe(["ServerAliveInterval"]);
}
[Fact]
public void AnEmptyConfiguration_YieldsNothingAndDoesNotThrow()
{
var import = Read(" \n\n# only a comment\n");
import.Hosts.ShouldBeEmpty();
import.SkippedPatterns.ShouldBeEmpty();
}
private static SshConfigImport Read(string text) =>
SshConfigResolver.Resolve(SshConfigParser.Parse(text));
private static ImportedHost Alias(SshConfigImport import, string alias) =>
import.Hosts.Single(host => string.Equals(host.Alias, alias, StringComparison.Ordinal));
}