Public Access
Wire the Avalonia shell to the vault
The host list now comes from the vault instead of from a form. A fresh machine takes a server URL, signs in through the browser, enrolls, and from then on opens with the passphrase alone. DodoSSH.Client.Session is the composition layer: where a profile lives, how it unlocks, and how a machine gets one. ClientPaths picks a non-roaming per-OS directory — %LOCALAPPDATA% and never %APPDATA%, because a SQLite cache that roams between two machines is a corrupt one, and each machine's outbox is its own. SessionOpener needs no transport at all and could not reach one if it wanted to; that is the offline unlock, asserted rather than asserted about. A wrong passphrase, a stale KDF and a grant revoked by a rekey are three different answers, because the remedies are three different things and telling someone to retype a passphrase that was never the problem is worse than saying nothing. The shell's states are the onboarding story. The recovery code gets its own state that cannot be clicked past: it exists for one moment, losing it with the passphrase loses the vault, and there is no server-side reset by design. It is dropped from memory on confirmation rather than merely hidden. Sign-in is a delegate over IVaultServer, so the whole state machine runs in a test against an in-memory server — no browser, no identity provider, no toolkit. The view models are plain observable objects, which is what makes that possible. What it does not cover is whether the XAML binds to the right names; that needs a rendered tree and Avalonia.Headless, and is its own piece of work. Three things found by doing it rather than by reading it: - Pooled SQLite connections keep the database file open after the last context is disposed. On Windows that means locked, so the application could never replace its own cache — and a test could not clean up after itself, which is how it surfaced. Dispose now clears the pool. - EF's SQLite provider puts the database in WAL mode, so the cache is three files. A comment in ClientCacheFactory claimed the opposite; reading PRAGMA journal_mode off a real launch settled it. WAL is the right mode here — a sync pass writes while the interface reads — so the comment was wrong on the merits as well as on the fact. - Enrolling a device key with nowhere to keep the private half would put a wrap on the server nobody can open and make the device list claim this machine can unlock without a passphrase. Device binding is now optional and the shell declines it until the OS keystore is wired. Verified on Windows: the client created %LOCALAPPDATA%\DodoSSH\cache.db and migrated it on first launch, and msedgewebview2 held an established connection to the data plane while the unlock overlay covered it — which is the point of covering the WebView rather than collapsing it, since a NativeWebView that is never laid out is never realised. 630 tests, up from 593. The recovery-code gate and the offline unlock were each verified by breaking them and watching the right test fail. Still to do for M1's actual definition of done: the manual run against the real API and a real Keycloak. Credentials are not a synced entity type yet, so a connection still asks for a password, and the interface says so rather than implying otherwise.
This commit is contained in:
@@ -4,7 +4,10 @@ using Avalonia.Markup.Xaml;
|
||||
using DodoSSH.Client.App.Terminal;
|
||||
using DodoSSH.Client.App.ViewModels;
|
||||
using DodoSSH.Client.App.Views;
|
||||
using DodoSSH.Client.Auth;
|
||||
using DodoSSH.Client.Session;
|
||||
using DodoSSH.Client.Ssh;
|
||||
using DodoSSH.Client.Storage;
|
||||
using DodoSSH.Client.Terminal;
|
||||
|
||||
namespace DodoSSH.Client.App;
|
||||
@@ -34,16 +37,24 @@ internal sealed partial class DodoSshApp : Application
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// Composed by hand rather than through a container. The graph is four objects deep, and an
|
||||
/// indirection to read through would buy nothing at this size.
|
||||
/// <para>
|
||||
/// The workspace is a local captured by the closures below rather than a field, so this type does
|
||||
/// not own a disposable it has no good place to dispose — an Avalonia <c>Application</c> has no
|
||||
/// disposal hook of its own.
|
||||
/// Composed by hand rather than through a container. The graph is a handful of objects deep and an
|
||||
/// indirection to read through would buy nothing at this size.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// Everything disposable is a local captured by the closures below rather than a field, because an
|
||||
/// Avalonia <c>Application</c> has no disposal hook of its own and a type that owned them would have
|
||||
/// nowhere honest to release them.
|
||||
/// </para>
|
||||
/// </remarks>
|
||||
private static void Compose(IClassicDesktopStyleApplicationLifetime desktop)
|
||||
{
|
||||
var paths = ClientPaths.Default;
|
||||
var caches = ClientCacheFactory.ForFile(paths.CacheFile);
|
||||
|
||||
// Known hosts are still in memory. The plan puts them in the vault as a synced entity so trust
|
||||
// follows the user to every device, and SyncEntityType.KnownHostKey is reserved for it — but that
|
||||
// entity type is not synced yet, so trust currently lasts one session.
|
||||
var knownHosts = new InMemoryKnownHostStore();
|
||||
|
||||
var workspace = new TerminalWorkspace(
|
||||
@@ -53,16 +64,30 @@ internal sealed partial class DodoSshApp : Application
|
||||
|
||||
workspace.Start();
|
||||
|
||||
desktop.MainWindow = new MainWindow
|
||||
{
|
||||
DataContext = new MainWindowViewModel(workspace, knownHosts),
|
||||
};
|
||||
var browser = new SystemBrowserLauncher();
|
||||
|
||||
var viewModel = new MainWindowViewModel(
|
||||
paths,
|
||||
caches,
|
||||
workspace,
|
||||
knownHosts,
|
||||
async (url, cancellationToken) => await ServerConnection
|
||||
.SignInAsync(url, browser, TimeProvider.System, cancellationToken)
|
||||
.ConfigureAwait(false),
|
||||
TimeProvider.System);
|
||||
|
||||
desktop.MainWindow = new MainWindow { DataContext = viewModel };
|
||||
|
||||
// Started rather than awaited: the framework's initialisation must not block on a schema
|
||||
// migration. The view model shows its own progress and handles its own failures, which is why
|
||||
// discarding the task here is safe rather than merely convenient.
|
||||
_ = viewModel.StartAsync(CancellationToken.None);
|
||||
|
||||
var shuttingDown = false;
|
||||
|
||||
// Shutdown is deferred rather than blocked on. Sessions hold SSH connections and a listening
|
||||
// socket, and blocking the UI thread on their disposal is how an application comes to take
|
||||
// several seconds to close — or deadlocks, if any of that disposal needs the UI thread.
|
||||
// socket, and blocking the UI thread on their disposal is how an application comes to take several
|
||||
// seconds to close — or deadlocks, if any of that disposal needs the UI thread.
|
||||
desktop.ShutdownRequested += async (_, e) =>
|
||||
{
|
||||
if (shuttingDown)
|
||||
@@ -73,8 +98,13 @@ internal sealed partial class DodoSshApp : Application
|
||||
shuttingDown = true;
|
||||
e.Cancel = true;
|
||||
|
||||
// The view model first: it holds the vault session, and disposing that is what zeroes the
|
||||
// identity keys, the vault keys and the cache key.
|
||||
await viewModel.DisposeAsync().ConfigureAwait(true);
|
||||
await workspace.DisposeAsync().ConfigureAwait(true);
|
||||
|
||||
caches.Dispose();
|
||||
|
||||
desktop.Shutdown();
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user