From dc1ebf6afadac77e7aa88e60a0fd5ad94fd02beb Mon Sep 17 00:00:00 2001 From: Jaap-Jan de Wit | DodoTech Date: Wed, 5 Aug 2026 18:14:34 +0200 Subject: [PATCH] Let the recovery code be copied, and give the phone a clipboard to copy to MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both screens had made the code selectable and both said why: a person who cannot get it out of the box photographs the screen, and a screenshot is a worse home for it than a clipboard. This finishes that argument. Selecting 64 characters of letter-spaced monospace with a thumb is the version of "possible" people give up on halfway — and on the phone the screen blocks screenshots, so the honest remaining options were retyping it or losing it. It is the one secret this application deliberately offers to a clipboard, and the contrast with the keychain's copy is the whole argument rather than an inconsistency. There, copying the private half is refused outright, because installing a key means pasting the public one and the private one has no business leaving the vault. Here there is no better route: the code exists for one screen, is stored nowhere, and has to reach a password manager. The clipboard is the intended destination rather than a way round the design. The sentence afterwards matters as much as the copy, and is asserted: a clipboard is a staging post, this screen is the only place the code exists, and the next thing copied replaces it. Somebody who copies and does nothing has not saved it. The phone had no clipboard delegate at all — the desktop passed one and this head passed null — so COPY PUBLIC KEY on the keychain answered "this machine has no clipboard" on a device that plainly has one. Nothing about that was platform shaped: Android has a clipboard and Avalonia surfaces it through the same TopLevel. Wiring it fixes that copy too. The test fixture built its shell without a clipboard, which modelled the bug rather than the product, so it has one now and the public-key test asserts what lands there instead of the refusal. The refusal keeps its own test, on a shell built without one, because the view model reads the delegate's absence rather than an empty result — and because a button that silently does nothing on this screen is worse than one that refuses. --- README.md | 5 +- docs/manual-checks.md | 22 ++++- src/DodoSSH.Client.Android/App.axaml.cs | 49 ++++++++++- .../Views/RecoveryCodeScreen.axaml | 20 +++++ src/DodoSSH.Client.App/Views/MainWindow.axaml | 20 ++++- .../ViewModels/MainWindowViewModel.cs | 46 ++++++++++ .../ShellFlowTests.cs | 86 +++++++++++++++++-- 7 files changed, 234 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1109369..c1a7897 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,10 @@ dotnet run --project src/DodoSSH.Client.App In the app, enter `http://localhost:5233` as the server. Your browser opens for sign-in — the realm ships `alice` / `alice` — then choose a vault passphrase and **write down the recovery code**, which cannot be -skipped and cannot be recovered from the server. You can then add a host and open a shell on it — double-click +skipped and cannot be recovered from the server. **COPY CODE** puts it on the clipboard so it can go +straight into a password manager: it is the one secret this application deliberately offers to a clipboard, +because there is nowhere better for it to go and the alternative people actually reach for is a photograph +of the screen. You can then add a host and open a shell on it — double-click its card, or select it and press **CONNECT** in the drawer that opens beside the grid, which is the same command with the password box above it. Keycloak's admin console is at `http://localhost:18080` (`admin` / `admin`). diff --git a/docs/manual-checks.md b/docs/manual-checks.md index 9672a93..4720de2 100644 --- a/docs/manual-checks.md +++ b/docs/manual-checks.md @@ -1188,7 +1188,23 @@ directly instead of `Classes="... secret"`. `PasswordChar` is what the screen dr what the keyboard is told, and only the second one keeps a passphrase out of the IME's learning dictionary. A box showing dots with a suggestion strip over it is the worst case, not a cosmetic one. -### 10.2 The keyboard does not cover the box being typed into +### 10.2 COPY CODE actually copies, on both heads + +Enrol a fresh profile. On the recovery-code screen, press **COPY CODE**, then paste somewhere — another +app on the phone, a text editor on the desktop. + +**Pass:** the whole code arrives, and the line under the button says to put it in a password manager now. + +**Failure means:** if the phone says *this machine has no clipboard*, the delegate is not being passed to +`MainWindowViewModel` again — the phone shipped for a while with none, so every copy on that head said +exactly that on a device that plainly has one. If nothing is said at all, the button silently no-opped, +which on this screen is worse than refusing: somebody who believes the code is on their clipboard will not +write it down, and it is shown once. + +Worth pasting somewhere you can see all of it. The code is the only thing standing between a forgotten +passphrase and an unrecoverable vault, and a truncated copy fails silently months later. + +### 10.3 The keyboard does not cover the box being typed into The same box: with the keyboard up, the passphrase box and the UNLOCK button under it are both visible. Repeat on each of the five boxes that take a secret — lock screen, both enrollment boxes, the connect @@ -1201,7 +1217,7 @@ password on HOSTS, and the connect password on FILES. `WindowSoftInputMode` has been dropped from the activity and the platform is panning the window instead of resizing it — which, for a window whose whole content is one native view, pans by nothing useful. -### 10.3 Nothing is stranded when the keyboard closes +### 10.4 Nothing is stranded when the keyboard closes Dismiss the keyboard with back or the down-chevron from each of those screens. @@ -1211,7 +1227,7 @@ bottom and no scroll position left part way down. **Failure means:** the inset is being applied but not cleared — the closed state is not being read from the event, or the margin is only ever added to. -### 10.4 Rotating with the keyboard up +### 10.5 Rotating with the keyboard up Focus a passphrase box, then turn the phone sideways. diff --git a/src/DodoSSH.Client.Android/App.axaml.cs b/src/DodoSSH.Client.Android/App.axaml.cs index 10be61d..6f49eed 100644 --- a/src/DodoSSH.Client.Android/App.axaml.cs +++ b/src/DodoSSH.Client.Android/App.axaml.cs @@ -1,5 +1,7 @@ using Avalonia; +using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Input.Platform; using Avalonia.Markup.Xaml; using DodoSSH.Client.Android.Platform; @@ -79,7 +81,14 @@ public sealed partial class DodoSshApp : Avalonia.Application // RESUME has something to read — and whatever a process death interrupted. See DocumentStaging. DocumentStaging.Sweep(); - var viewModel = ComposeShell(paths, caches, workspace, knownHosts, connections); + // Built before the view model, because the clipboard is reached through it — see ClipboardWriter, + // which takes the surface and looks the TopLevel up on each call rather than now. + var shell = new PhoneShell(); + + var viewModel = ComposeShell( + paths, caches, workspace, knownHosts, connections, ClipboardWriter(shell)); + + shell.DataContext = viewModel; // Difference 2: the foreground service, which is what makes TerminalWorkspace's promise — that a // shell outlives a vault lock — true on a platform that stops backgrounded processes. @@ -104,9 +113,40 @@ public sealed partial class DodoSshApp : Avalonia.Application keepAlive.Refresh(); - return new PhoneShell { DataContext = viewModel }; + return shell; } + /// + /// Writing to this phone's clipboard. + /// + /// + /// + /// ◆ This head had none, and every control that wanted one said so out loud. COPY PUBLIC KEY on + /// the keychain answered "This machine has no clipboard" on a device that plainly has one, because the + /// delegate was simply never wired here — the desktop passed one and the phone passed null. Android has + /// a clipboard and Avalonia surfaces it through the same TopLevel the desktop reaches, so there + /// was nothing platform-shaped about the gap. + /// + /// + /// Looked up per call rather than captured, exactly as the desktop's is: at composition there is no + /// TopLevel yet, because this is the method building the view it will be attached to. A machine + /// that somehow has none falls through silently and the view model decides what to say, which is what + /// keeps "no clipboard here" and "copied" different answers. + /// + /// + /// A delegate rather than an IClipboard, so nothing in the view models needs a visual and every + /// test that drives them stays window-free. + /// + /// + private static Func ClipboardWriter(Visual surface) => + async text => + { + if (TopLevel.GetTopLevel(surface) is { Clipboard: { } clipboard }) + { + await clipboard.SetTextAsync(text).ConfigureAwait(false); + } + }; + /// /// Split from only for length. The division is a real one though: above this is /// the platform graph, and below it is the shell every head shares. @@ -116,7 +156,8 @@ public sealed partial class DodoSshApp : Avalonia.Application ClientCacheFactory caches, TerminalWorkspace workspace, VaultKnownHostStore knownHosts, - SshNetConnectionFactory connections) + SshNetConnectionFactory connections, + Func copyToClipboard) { // Difference 3: the Android keystore, with a fingerprint or the device credential releasing the // key. A straight implementation of the interface the session layer has always taken. @@ -165,6 +206,8 @@ public sealed partial class DodoSshApp : Avalonia.Application // would name the same machine. See PhoneEnvironment.DeviceName. deviceName: PhoneEnvironment.DeviceName, + copyToClipboard: copyToClipboard, + updates: updates); // Started rather than awaited: framework initialisation must not block on a schema migration. The diff --git a/src/DodoSSH.Client.Android/Views/RecoveryCodeScreen.axaml b/src/DodoSSH.Client.Android/Views/RecoveryCodeScreen.axaml index 95af9c4..7abd847 100644 --- a/src/DodoSSH.Client.Android/Views/RecoveryCodeScreen.axaml +++ b/src/DodoSSH.Client.Android/Views/RecoveryCodeScreen.axaml @@ -44,6 +44,26 @@ LetterSpacing="1.5" LineHeight="26" TextWrapping="Wrap" /> + +