Public Access
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.
230 lines
9.1 KiB
C#
230 lines
9.1 KiB
C#
using System.Security.Cryptography;
|
|
using DotNet.Testcontainers.Builders;
|
|
using DotNet.Testcontainers.Containers;
|
|
using Xunit;
|
|
|
|
namespace DodoSSH.Client.Ssh.Tests;
|
|
|
|
/// <summary>
|
|
/// A real OpenSSH server in a container, with password and public-key auth both enabled.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// One container per assembly. Everything the SSH layer needs to be right about — PTY
|
|
/// allocation, window-change requests, host key encoding, key formats — is behaviour of a real
|
|
/// sshd, and none of it can be established against a mock.
|
|
/// </para>
|
|
/// <para>
|
|
/// The image is Alpine-based, so <c>stty</c> comes from busybox. Its <c>stty size</c> prints
|
|
/// "rows cols", which is what the resize assertions read.
|
|
/// </para>
|
|
/// </remarks>
|
|
public sealed class SshServerFixture : IAsyncLifetime
|
|
{
|
|
/// <summary>The account tests authenticate as.</summary>
|
|
public const string Username = "dodo";
|
|
|
|
/// <summary>Password for password authentication.</summary>
|
|
public const string Password = "correct-horse-battery-staple";
|
|
|
|
private const int SshPort = 2222;
|
|
|
|
private readonly SemaphoreSlim sftpGate = new(1, 1);
|
|
|
|
private IContainer? container;
|
|
private ISftpSession? sftp;
|
|
|
|
/// <summary>Host port the container's sshd is published on.</summary>
|
|
public ushort Port => container!.GetMappedPublicPort(SshPort);
|
|
|
|
/// <summary>Host the container is reachable at.</summary>
|
|
public string Host => container!.Hostname;
|
|
|
|
/// <summary>An RSA key pair whose public half is authorized on the server.</summary>
|
|
public RSA ClientKey { get; } = RSA.Create(3072);
|
|
|
|
/// <inheritdoc />
|
|
public async ValueTask InitializeAsync()
|
|
{
|
|
container = new ContainerBuilder("linuxserver/openssh-server:latest")
|
|
.WithEnvironment("PUID", "1000")
|
|
.WithEnvironment("PGID", "1000")
|
|
.WithEnvironment("USER_NAME", Username)
|
|
.WithEnvironment("USER_PASSWORD", Password)
|
|
.WithEnvironment("PASSWORD_ACCESS", "true")
|
|
.WithEnvironment("SUDO_ACCESS", "false")
|
|
.WithEnvironment("PUBLIC_KEY", ExportOpenSshPublicKey(ClientKey))
|
|
.WithPortBinding(SshPort, assignRandomHostPort: true)
|
|
|
|
// The entrypoint generates host keys, rewrites sshd_config and installs the authorized
|
|
// key before sshd is usable, so a published port is not readiness. Both conditions are
|
|
// needed: the log line proves the authorized key was installed (a connection accepted
|
|
// before that fails public-key auth), and the port check proves sshd is actually
|
|
// accepting. The message is this image's own wording — "Server listening on" is
|
|
// OpenSSH's and never appears here, which is a wait that hangs rather than fails.
|
|
.WithWaitStrategy(Wait.ForUnixContainer()
|
|
.UntilMessageIsLogged("Public key from env variable added")
|
|
.UntilCommandIsCompleted("sh", "-c", $"netstat -ltn | grep -q ':{SshPort}'"))
|
|
|
|
.Build();
|
|
|
|
await container.StartAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds one <c>authorized_keys</c> line to the account tests authenticate as.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// The fixture's own key arrives through the image's <c>PUBLIC_KEY</c> variable, which takes one. This
|
|
/// is for the case that needs a second: proving a key <em>this client generated</em> authenticates
|
|
/// against a real sshd, which is the only test that can establish the hand-written
|
|
/// <c>openssh-key-v1</c> encoding is right. A parser accepting the file is weaker — SSH.NET could be
|
|
/// forgiving about something OpenSSH is not.
|
|
/// </para>
|
|
/// <para>
|
|
/// sshd re-reads <c>authorized_keys</c> on each authentication attempt, so nothing has to be restarted.
|
|
/// </para>
|
|
/// </remarks>
|
|
public async ValueTask AuthorizeAsync(string publicKeyLine, CancellationToken cancellationToken)
|
|
{
|
|
ArgumentException.ThrowIfNullOrWhiteSpace(publicKeyLine);
|
|
|
|
// Single-quoted in the shell and the line is base64 plus an algorithm name and a comment, so there
|
|
// is nothing in it a quote could end. Asserted rather than assumed all the same: a silent failure
|
|
// here would show up as an authentication error in a test whose subject is the key encoding, which
|
|
// is the most misleading way for this to break.
|
|
var result = await container!.ExecAsync(
|
|
["sh", "-c", $"echo '{publicKeyLine.Trim()}' >> /config/.ssh/authorized_keys"],
|
|
cancellationToken);
|
|
|
|
if (result.ExitCode != 0)
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"Could not install the public key in the container: {result.Stderr}");
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// One file-transfer session, opened on first use and shared by every test that wants one.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// Shared rather than opened per test, and that is a limit of the server rather than an optimisation.
|
|
/// sshd's <c>MaxStartups</c> drops connections at random once enough are part-way through a handshake,
|
|
/// and this client's first contact with an unknown host is a connection deliberately <em>refused</em> at
|
|
/// the host key — so a suite that opened its own session per test made two handshakes per test and
|
|
/// pushed the whole assembly over the threshold. What that looks like is unrelated tests failing with
|
|
/// "the connection was closed by the remote host", a different few each run.
|
|
/// </para>
|
|
/// <para>
|
|
/// Safe to share because an SFTP session holds no per-test state: every test here works in a directory
|
|
/// named after itself. See <c>ISftpSession</c>, which is one channel and is used by one caller at a
|
|
/// time.
|
|
/// </para>
|
|
/// </remarks>
|
|
public async ValueTask<ISftpSession> SftpAsync(CancellationToken cancellationToken)
|
|
{
|
|
await sftpGate.WaitAsync(cancellationToken);
|
|
|
|
try
|
|
{
|
|
if (sftp is not null)
|
|
{
|
|
return sftp;
|
|
}
|
|
|
|
var knownHosts = new InMemoryKnownHostStore();
|
|
var factory = new SshNetConnectionFactory(knownHosts);
|
|
|
|
var request = new SshConnectionRequest(
|
|
Host, Port, Username, new SshPasswordCredential(Password));
|
|
|
|
try
|
|
{
|
|
// Learned by being refused, which is the only way this client learns a host key.
|
|
return sftp = await factory.OpenSftpAsync(request, cancellationToken);
|
|
}
|
|
catch (SshHostKeyUnknownException unknown)
|
|
{
|
|
await knownHosts.TrustAsync(unknown.Presentation, cancellationToken);
|
|
}
|
|
|
|
return sftp = await factory.OpenSftpAsync(request, cancellationToken);
|
|
}
|
|
finally
|
|
{
|
|
sftpGate.Release();
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
if (sftp is not null)
|
|
{
|
|
await sftp.DisposeAsync();
|
|
}
|
|
|
|
sftpGate.Dispose();
|
|
|
|
if (container is not null)
|
|
{
|
|
await container.DisposeAsync();
|
|
}
|
|
|
|
ClientKey.Dispose();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Renders an RSA public key in the single-line <c>authorized_keys</c> format.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Hand-encoded because there is no BCL helper. The SSH wire format is a sequence of
|
|
/// length-prefixed strings: the algorithm name, then the exponent, then the modulus — both
|
|
/// as signed big-endian integers, which is why a leading zero byte is prepended when the
|
|
/// high bit is set. Getting that wrong yields a key sshd silently ignores.
|
|
/// </remarks>
|
|
private static string ExportOpenSshPublicKey(RSA rsa)
|
|
{
|
|
var parameters = rsa.ExportParameters(includePrivateParameters: false);
|
|
|
|
using var blob = new MemoryStream();
|
|
WriteSshString(blob, "ssh-rsa"u8.ToArray());
|
|
WriteSshMpint(blob, parameters.Exponent!);
|
|
WriteSshMpint(blob, parameters.Modulus!);
|
|
|
|
return $"ssh-rsa {Convert.ToBase64String(blob.ToArray())} dodossh-test";
|
|
}
|
|
|
|
private static void WriteSshString(Stream destination, byte[] value)
|
|
{
|
|
Span<byte> length = stackalloc byte[4];
|
|
System.Buffers.Binary.BinaryPrimitives.WriteUInt32BigEndian(length, (uint)value.Length);
|
|
destination.Write(length);
|
|
destination.Write(value);
|
|
}
|
|
|
|
private static void WriteSshMpint(Stream destination, byte[] value)
|
|
{
|
|
// Signed big-endian: a high bit set would otherwise read as negative.
|
|
if (value.Length > 0 && (value[0] & 0x80) != 0)
|
|
{
|
|
var padded = new byte[value.Length + 1];
|
|
value.CopyTo(padded, 1);
|
|
WriteSshString(destination, padded);
|
|
return;
|
|
}
|
|
|
|
WriteSshString(destination, value);
|
|
}
|
|
}
|
|
|
|
/// <summary>Shares one SSH server across every test class in the assembly.</summary>
|
|
[CollectionDefinition(Name)]
|
|
public sealed class SshCollection : ICollectionFixture<SshServerFixture>
|
|
{
|
|
/// <summary>Collection name.</summary>
|
|
public const string Name = "ssh";
|
|
}
|