Commit `76cfe39723`

76cfe39723372c717d18ea3c730c28e66c0798a3

parent: f302d0123a

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-30 02:15 UTC

Typed-name confirmation for SSH key removal and repository rename

Key removal asks for the fingerprint's first eight characters after
SHA256:, as the web does; rename asks for owner/name, as the web's
transfer and delete do. The live suite types both.

Layout: unified · split

gitbay/Account/AccountViewModel.swift +5

         /// A name for the key (v1.21.0); omitted when none is set.
         let label: String?
         var id: String { fingerprint }
+        /// What removal asks to be typed, as the web does: the first
+        /// eight characters of the fingerprint after `SHA256:`.
+        var confirmation: String {
+            String(fingerprint.replacingOccurrences(of: "SHA256:", with: "").prefix(8))
+        }
     }
     nonisolated struct PGPKey: Decodable, Sendable, Hashable, Identifiable {

gitbay/Views/Account/AccountView.swift +15 −8

     @State private var verifyCode = ""
     @State private var removingEmail: AccountViewModel.EmailAddress?
     @State private var removingSSH: AccountViewModel.SSHKey?
+    @State private var sshConfirmText = ""
     @State private var labellingSSH: AccountViewModel.SSHKey?
     @State private var sshLabelText = ""
     @State private var removingPGP: AccountViewModel.PGPKey?
         } message: { _ in
             Text("An empty label clears it.")
         }
-        .confirmationDialog(
+        .alert(
-            "Remove this SSH key? Anything authenticating with it loses access.",
+            "Remove this SSH key?",
             isPresented: Binding(
                 get: { removingSSH != nil },
                 set: { if !$0 { removingSSH = nil } }
-            )
+            ),
-        ) {
+            presenting: removingSSH
+        ) { key in
+            TextField("type \(key.confirmation) to confirm", text: $sshConfirmText)
+                .autocorrectionDisabled()
+                .textInputAutocapitalization(.never)
             Button("Remove", role: .destructive) {
-                if let key = removingSSH {
+                Task { await model.removeSSHKey(key) }
-                    Task { await model.removeSSHKey(key) }
-                }
                 removingSSH = nil
             }
-            Button("Cancel", role: .cancel) {}
+            .disabled(sshConfirmText != key.confirmation)
+            Button("Cancel", role: .cancel) { removingSSH = nil }
+        } message: { key in
+            Text("Anything authenticating with it loses access. Type \(key.confirmation) to confirm.")
         }
         .confirmationDialog(
             "Remove this PGP key? Commits it signed become unverifiable.",
                 }
                 .swipeActions {
                     Button("Remove", role: .destructive) {
+                        sshConfirmText = ""
                         removingSSH = key
                     }
                     Button("Label") {

gitbay/Views/Repos/RepoSettingsView.swift +8 −2

     @State private var newTagGlob = ""
     @State private var renaming = false
     @State private var newName = ""
+    @State private var renameConfirm = ""
     /// Set once a rename succeeds: this screen's repository is gone and
     /// the renamed one is a value push away.
     @State private var renamedTo: String?
             TextField("New name", text: $newName)
                 .autocorrectionDisabled()
                 .textInputAutocapitalization(.never)
+            TextField("type \(model.repoPath) to confirm", text: $renameConfirm)
+                .autocorrectionDisabled()
+                .textInputAutocapitalization(.never)
             Button("Rename") {
                 Task {
                     if let path = await model.rename(to: newName) {
                     }
                 }
             }
-            .disabled(newName.trimmingCharacters(in: .whitespaces).isEmpty)
+            .disabled(newName.trimmingCharacters(in: .whitespaces).isEmpty
+                || renameConfirm != model.repoPath)
             Button("Cancel", role: .cancel) {}
         } message: {
-            Text("Clone URLs change.")
+            Text("Clone URLs change. The old path stops resolving. Type \(model.repoPath) to confirm.")
         }
         .confirmationDialog(
             "Remove topic \(removingTopic ?? "")?",
         Section {
             Button {
                 newName = String(model.repoPath.split(separator: "/").last ?? "")
+                renameConfirm = ""
                 renaming = true
             } label: {
                 Label("Rename repository", systemImage: "pencil")

gitbayTests/AccountTests.swift +8

	@@ -179,6 +179,14 @@ struct AccountViewModelTests {
179	#expect(try #require(model.state.value).sshKeys.first?.label == "cmc@mac")	179	#expect(try #require(model.state.value).sshKeys.first?.label == "cmc@mac")
180	}	180	}
181		181
		182	/// The web's typed confirmation for removing a key: the first eight
		183	/// characters of the fingerprint after `SHA256:`.
		184	@Test func sshKeyConfirmationIsTheFingerprintPrefix() async throws {
		185	let (model, _) = try await loadedModel()
		186	let key = try #require(model.state.value?.sshKeys.first)
		187	#expect(key.confirmation == "15jrWGl3")
		188	}
		189
182	@Test func sshKeyAddPassesALabelOnlyWhenGiven() async throws {	190	@Test func sshKeyAddPassesALabelOnlyWhenGiven() async throws {
183	let (model, stub) = try await loadedModel()	191	let (model, stub) = try await loadedModel()
184	for _ in 0..<2 {	192	for _ in 0..<2 {

gitbayUITests/LiveSmokeUITests.swift +26 −1

         // Each rename pushes the renamed repository; the round-trip ends
         // on the scratch repo again, several screens deep.
         var firstRename = true
+        var currentPath = Self.scratchRepo
         let rename: (String, String) -> Void = { newName, expectedPath in
             if firstRename {
                 firstRename = false // already on the settings screen
             field.tap()
             // Prefilled with the current name; clear it before typing.
             field.typeText(String(repeating: XCUIKeyboardKey.delete.rawValue, count: 12) + newName)
-            self.app.buttons["Rename"].firstMatch.tap()
+            // Rename stays disabled until the current path is typed.
+            let renameAction = self.app.alerts.buttons["Rename"].firstMatch
+            XCTAssertFalse(renameAction.isEnabled, "rename enabled before the path was typed")
+            let confirm = self.app.textFields["type \(currentPath) to confirm"].firstMatch
+            XCTAssertTrue(confirm.exists, "rename confirmation field missing")
+            confirm.tap()
+            confirm.typeText(currentPath)
+            renameAction.tap()
             // The settings screen offers the renamed repository at the
             // top; the list is scrolled to its end, so go back up first.
             let renamedLink = self.app.descendants(matching: .any)
             // splits the path into the owner link and the rest.
             XCTAssertTrue(self.app.navigationBars.staticTexts[newName].firstMatch
                 .waitForExistence(timeout: 15), "renamed repo did not open as \(expectedPath)")
+            currentPath = expectedPath
         }
         rename("ui-smoke-2", Self.scratchRepo + "-2")
         rename("ui-smoke", Self.scratchRepo)
             XCTAssertTrue(app.staticTexts[original].firstMatch.waitForExistence(timeout: 10),
                           "original label not back")
         }
+        // Removal asks for the fingerprint's first eight characters and
+        // stays disabled until they are typed. Cancelled: the key stays.
+        fingerprint.swipeLeft()
+        let remove = app.buttons["Remove"].firstMatch
+        XCTAssertTrue(remove.waitForExistence(timeout: 5), "Remove swipe action missing")
+        remove.tap()
+        let confirm = app.alerts.textFields.firstMatch
+        XCTAssertTrue(confirm.waitForExistence(timeout: 5), "remove alert missing")
+        let removeAction = app.alerts.buttons["Remove"].firstMatch
+        XCTAssertFalse(removeAction.isEnabled, "remove enabled before confirmation")
+        confirm.tap()
+        confirm.typeText(String(fp.dropFirst("SHA256:".count).prefix(8)))
+        XCTAssertTrue(removeAction.isEnabled, "remove not enabled by the typed confirmation")
+        app.alerts.buttons["Cancel"].firstMatch.tap()
+        XCTAssertTrue(fingerprint.waitForExistence(timeout: 5), "key gone after cancel")
     }
     /// Org labels and milestones from the org screen: a label is created

Commit 76cfe39723

Commit `76cfe39723`