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.
293 lines
11 KiB
C#
293 lines
11 KiB
C#
using Avalonia;
|
|
using Avalonia.Controls;
|
|
using Avalonia.Headless;
|
|
using Avalonia.Input;
|
|
using Avalonia.VisualTree;
|
|
using DodoSSH.Client.App.ViewModels;
|
|
using DodoSSH.Client.App.Views;
|
|
using DodoSSH.Client.Session;
|
|
using DodoSSH.Client.Ssh;
|
|
using DodoSSH.Client.Storage;
|
|
using DodoSSH.Client.Terminal;
|
|
using NSubstitute;
|
|
|
|
namespace DodoSSH.Client.App.Layout.Tests;
|
|
|
|
/// <summary>
|
|
/// How the tab strip answers a pointer.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// The strip spans every screen now, so it is chrome a user is in contact with all day rather than one
|
|
/// column of the hosts screen. What that earns it is the gestures every other tabbed application has — a
|
|
/// middle click that closes, a cross inside the tab rather than beside it, a button that opens another — and
|
|
/// what those need is a suite, because all three are pointer behaviour and none of it is expressible as a
|
|
/// binding.
|
|
/// </para>
|
|
/// <para>
|
|
/// A <c>UserControl</c> in a bare window, for the reason the palette's suite is one:
|
|
/// <see cref="LayoutHarnessTests.WhyTheWindowItselfIsNeverShown"/>. No vault and no session — the strip
|
|
/// binds only to the shell's tab list, and tabs are shell state that outlives the vault that opened them, so
|
|
/// they can be put there directly. Closing one asks the workspace to end a session it has never heard of,
|
|
/// which the workspace answers by returning: that is the same path a real close takes, minus a shell.
|
|
/// </para>
|
|
/// </remarks>
|
|
public sealed class TerminalTabsTests : IAsyncLifetime
|
|
{
|
|
private ClientCacheFactory caches = null!;
|
|
private TerminalWorkspace workspace = null!;
|
|
private MainWindowViewModel shell = null!;
|
|
|
|
private static CancellationToken Token => TestContext.Current.CancellationToken;
|
|
|
|
/// <inheritdoc />
|
|
public ValueTask InitializeAsync()
|
|
{
|
|
caches = ClientCacheFactory.ForMemory($"tabs-{Guid.CreateVersion7():N}");
|
|
|
|
workspace = new TerminalWorkspace(
|
|
new InMemoryTerminalAssetProvider(new Dictionary<string, TerminalAsset>(StringComparer.Ordinal)),
|
|
Substitute.For<ISshConnectionFactory>(),
|
|
TimeProvider.System);
|
|
|
|
shell = new MainWindowViewModel(
|
|
ClientPaths.Default,
|
|
caches,
|
|
workspace,
|
|
new VaultKnownHostStore(),
|
|
Substitute.For<IDeviceKeyStore>(),
|
|
(_, _) => throw new NotSupportedException("nothing here signs in"),
|
|
TimeProvider.System,
|
|
Substitute.For<ISftpSessionFactory>())
|
|
{
|
|
// The only state the strip is ever interactive in. Assigned rather than reached through an
|
|
// enrollment, which would be an Argon2 pass for no extra coverage — nothing here reads the vault.
|
|
State = ShellState.Unlocked,
|
|
};
|
|
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
await shell.DisposeAsync();
|
|
await workspace.DisposeAsync();
|
|
caches.Dispose();
|
|
}
|
|
|
|
/// <remarks>
|
|
/// The gesture this rework is for. Middle-clicking a tab is how every browser and every terminal closes
|
|
/// one, and the strip answered nothing but a left click before.
|
|
/// </remarks>
|
|
[Fact]
|
|
public async Task AMiddleClickOnATabClosesThatTab()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
var doomed = shell.Tabs[0];
|
|
var survivor = shell.Tabs[1];
|
|
|
|
window.MouseDown(Centre(TabButton(strip, doomed), window), MouseButton.Middle);
|
|
|
|
shell.Tabs.ShouldHaveSingleItem().ShouldBe(survivor);
|
|
});
|
|
}
|
|
|
|
/// <remarks>
|
|
/// The other half of the rule, and the reason the handler is on the tab's own template root rather than
|
|
/// on the strip: a middle click on the chrome between the last tab and the edge of the window must not
|
|
/// close anything. Wiring it on the strip and testing what was underneath the pointer would have been
|
|
/// the same feature with a way to get it wrong.
|
|
/// </remarks>
|
|
[Fact]
|
|
public async Task AMiddleClickOnTheStripBackgroundClosesNothing()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
// Well right of two short tabs and the button after them, and inside the strip's own height.
|
|
window.MouseDown(new Point(700, 17), MouseButton.Middle);
|
|
|
|
shell.Tabs.Count.ShouldBe(2);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public async Task AMiddleClickOnTheButtonThatOpensAConnectionClosesNothing()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
window.MouseDown(Centre(PlusButton(strip), window), MouseButton.Middle);
|
|
|
|
shell.Tabs.Count.ShouldBe(2);
|
|
shell.IsSearching.ShouldBeFalse("a middle click is not how the palette opens either");
|
|
});
|
|
}
|
|
|
|
/// <remarks>
|
|
/// The cross is inside the tab, so a middle click on it bubbles out to the tab's handler as well. One
|
|
/// close, not two: the second would take the neighbour, which is the tab the user was aiming to keep.
|
|
/// </remarks>
|
|
[Fact]
|
|
public async Task AMiddleClickOnTheCrossClosesExactlyOneTab()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
var survivor = shell.Tabs[1];
|
|
|
|
window.MouseDown(Centre(CloseButton(strip, shell.Tabs[0]), window), MouseButton.Middle);
|
|
|
|
shell.Tabs.ShouldHaveSingleItem().ShouldBe(survivor);
|
|
});
|
|
}
|
|
|
|
/// <remarks>
|
|
/// The one assumption the nested-button template makes, stated as a test. Avalonia's
|
|
/// <c>Button.OnPointerPressed</c> takes the capture and marks a left press handled, so the cross does
|
|
/// not also reach the tab underneath it — which would select a tab on its way out and leave the
|
|
/// terminal switching to something that is about to disappear.
|
|
/// </remarks>
|
|
[Fact]
|
|
public async Task ALeftClickOnTheCrossClosesTheTabAndDoesNotSelectIt()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
var doomed = shell.Tabs[0];
|
|
var survivor = shell.Tabs[1];
|
|
|
|
shell.SelectTabCommand.Execute(survivor);
|
|
|
|
var cross = CloseButton(strip, doomed);
|
|
window.MouseDown(Centre(cross, window), MouseButton.Left);
|
|
window.MouseUp(Centre(cross, window), MouseButton.Left);
|
|
|
|
shell.Tabs.ShouldHaveSingleItem().ShouldBe(survivor);
|
|
shell.SelectedTab.ShouldBe(survivor);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ALeftClickOnATabSelectsItAndShowsTheTerminal()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
var wanted = shell.Tabs[1];
|
|
|
|
shell.ShowScreenCommand.Execute(ShellScreen.Preferences);
|
|
shell.IsTerminalShowing.ShouldBeFalse();
|
|
|
|
var button = TabButton(strip, wanted);
|
|
window.MouseDown(Centre(button, window), MouseButton.Left);
|
|
window.MouseUp(Centre(button, window), MouseButton.Left);
|
|
|
|
shell.Tabs.Count.ShouldBe(2, "selecting is not closing");
|
|
shell.SelectedTab.ShouldBe(wanted);
|
|
shell.IsTerminalShowing.ShouldBeTrue();
|
|
});
|
|
}
|
|
|
|
/// <remarks>
|
|
/// It opens the palette rather than a menu, so that the strip and Ctrl+K are one way of doing one thing.
|
|
/// See the note in <c>TerminalTabs.axaml</c> for why a flyout over the terminal's rectangle is not a
|
|
/// claim this project is willing to make without a screenshot.
|
|
/// </remarks>
|
|
[Fact]
|
|
public async Task TheButtonThatOpensAConnectionOpensThePalette()
|
|
{
|
|
await OnTheStripAsync((strip, window) =>
|
|
{
|
|
var plus = PlusButton(strip);
|
|
window.MouseDown(Centre(plus, window), MouseButton.Left);
|
|
window.MouseUp(Centre(plus, window), MouseButton.Left);
|
|
|
|
shell.IsSearching.ShouldBeTrue();
|
|
});
|
|
}
|
|
|
|
/// <remarks>
|
|
/// The strip is the one row of chrome every screen pays for, so its height is part of the layout budget
|
|
/// and this is what stops the budget drifting from the markup. See
|
|
/// <see cref="LayoutHarness.TerminalTabsHeight"/>.
|
|
/// </remarks>
|
|
[Fact]
|
|
public async Task TheStripIsTheHeightTheBudgetAssumes_AndDoesNotGrowWithTabs()
|
|
{
|
|
await LayoutHarness.OnTheUiThreadAsync(
|
|
() =>
|
|
{
|
|
for (var i = 0; i < 12; i++)
|
|
{
|
|
shell.Tabs.Add(new TerminalTabViewModel((uint)i, $"host-{i}", $"deploy@host-{i}:22"));
|
|
}
|
|
|
|
var strip = new TerminalTabs { DataContext = shell };
|
|
var window = LayoutHarness.HostAtMinimumSize(
|
|
strip, LayoutHarness.MinimumWidth, LayoutHarness.MinimumHeight);
|
|
|
|
try
|
|
{
|
|
// What it asks for, not what this host window gave it. Hosting it at 34 and then
|
|
// asserting it is 34 would pass on a strip that wanted 300 and got clipped, which is
|
|
// exactly the regression the budget needs catching.
|
|
strip.DesiredSize.Height.ShouldBe(LayoutHarness.TerminalTabsHeight);
|
|
|
|
LayoutHarness.Unreachable(window).ShouldBeEmpty();
|
|
}
|
|
finally
|
|
{
|
|
window.Close();
|
|
}
|
|
},
|
|
Token);
|
|
}
|
|
|
|
// ---- Helpers ----
|
|
|
|
/// <summary>Two open tabs, laid out in a window the width the application's is.</summary>
|
|
private Task OnTheStripAsync(Action<TerminalTabs, Window> body) =>
|
|
LayoutHarness.OnTheUiThreadAsync(
|
|
() =>
|
|
{
|
|
shell.Tabs.Add(new TerminalTabViewModel(1, "prod-db", "deploy@db.internal:22"));
|
|
shell.Tabs.Add(new TerminalTabViewModel(2, "web-01", "deploy@web-01.internal:22"));
|
|
|
|
var strip = new TerminalTabs { DataContext = shell };
|
|
var window = new Window { Content = strip };
|
|
LayoutHarness.Settle(window, 900, 600);
|
|
|
|
try
|
|
{
|
|
body(strip, window);
|
|
}
|
|
finally
|
|
{
|
|
window.Close();
|
|
}
|
|
},
|
|
Token);
|
|
|
|
/// <remarks>
|
|
/// Found by the class the style system already keys on, rather than by position in the visual tree: the
|
|
/// template puts the cross inside the tab, so both buttons carry the same data context and only the
|
|
/// classes tell them apart.
|
|
/// </remarks>
|
|
private static Button TabButton(Visual strip, TerminalTabViewModel tab) =>
|
|
strip.GetVisualDescendants()
|
|
.OfType<Button>()
|
|
.First(button => ReferenceEquals(button.DataContext, tab) && button.Classes.Contains("tab"));
|
|
|
|
/// <inheritdoc cref="TabButton" />
|
|
private static Button CloseButton(Visual strip, TerminalTabViewModel tab) =>
|
|
strip.GetVisualDescendants()
|
|
.OfType<Button>()
|
|
.First(button => ReferenceEquals(button.DataContext, tab) && button.Classes.Contains("close"));
|
|
|
|
/// <inheritdoc cref="TabButton" />
|
|
private static Button PlusButton(Visual strip) =>
|
|
strip.GetVisualDescendants().OfType<Button>().First(button => button.Classes.Contains("plus"));
|
|
|
|
private static Point Centre(Visual control, Visual window) =>
|
|
control.TranslatePoint(new Point(control.Bounds.Width / 2, control.Bounds.Height / 2), window)
|
|
?? throw new InvalidOperationException("the control is not in this window's tree");
|
|
}
|