sliftutils 1.7.128 → 1.7.129

package/security/authorizedKeys/dist/unrevoke.ts.cache

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
-//exports.main = exports.revokedKeysInRepo = exports.readRemoteRevocations = void 0;
+//exports.main = exports.revokedKeysInRepo = exports.readRemoteRevocations = exports.revocationIP = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const runPromise_1 = require("socket-function/src/runPromise");
 const authorizedKeys_1 = require("./authorizedKeys");
 const revokeSource_1 = require("./revokeSource");
+const sources_1 = require("./sources");
 const signFiles_1 = require("../signedFiles/signFiles");
 const authorizedKeys_2 = require("./authorizedKeys");
 const paths_1 = require("../helpers/paths");
@@ -26,17 +27,31 @@ passes. It signs the result, and with ${GIT_KEYWORD} it commits and pushes it to
 
 Keys that were revoked should normally be deleted from the repo instead. Unrevoking only matters
 for a key you still want.`;
-/** Every revocation the revoke repo lists. Cloned read only into a temp directory, with whatever
-    credentials this machine already has - the derived deploy key is for servers, and a person
-    running this has their own access to the repo. */
+/** Older revocation files carry the address under attempt only. */
+function revocationIP(revocation) {
+    var _a;
+    return revocation.ip || ((_a = revocation.attempt) === null || _a === void 0 ? void 0 : _a.ip) || "";
+}
+exports.revocationIP = revocationIP;
+/** Every revocation the revoke repo lists. Cloned read only into a temp directory.
+
+    A person running this has their own access to the repo, so their credentials are what is used.
+    On a machine that is already a portsecure host there may be no such credentials, but the source
+    deploy key is right there, and the key derived from it is one that repo definitely accepts. */
 async function readRemoteRevocations(config) {
     let { sourceURL } = config;
     let temporaryDirectory = await promises_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), "unrevoke-"));
     let repoPath = path_1.default.join(temporaryDirectory, "repo");
-    let clone = await (0, spawn_1.spawnPromise)({
-        command: "git",
-        args: ["clone", "--depth", "1", (0, revokeSource_1.revokeRepoURL)(sourceURL), repoPath],
-    });
+    let cloneArgs = ["clone", "--depth", "1", (0, revokeSource_1.revokeRepoURL)(sourceURL), repoPath];
+    let sourceKey = await (0, sources_1.findSourceKey)(sourceURL);
+    if (sourceKey) {
+        let derived = (0, revokeSource_1.deriveRevokeKey)(await promises_1.default.readFile(sourceKey, "utf8"));
+        let derivedKeyPath = path_1.default.join(temporaryDirectory, "key");
+        await promises_1.default.writeFile(derivedKeyPath, derived.privateKeyFile, { mode: 0o600 });
+        let sshCommand = `ssh -i ${derivedKeyPath} -o IdentitiesOnly=yes -o BatchMode=yes -o StrictHostKeyChecking=accept-new`;
+        cloneArgs = ["-c", `core.sshCommand=${sshCommand}`, ...cloneArgs];
+    }
+    let clone = await (0, spawn_1.spawnPromise)({ command: "git", args: cloneArgs });
     if (clone.status !== 0) {
         await promises_1.default.rm(temporaryDirectory, { recursive: true, force: true });
         throw new Error(`Expected to be able to read ${(0, revokeSource_1.revokeRepoURL)(sourceURL)}.\n`
@@ -71,6 +86,10 @@ async function revokedKeysInRepo(config) {
                 continue;
             }
             let parsed = JSON.parse(await promises_1.default.readFile(path_1.default.join(directory, name), "utf8"));
+            for (let allowed of parsed.allowed || []) {
+                unrevoked.add(`${allowed.fingerprint} ${allowed.ip}`);
+            }
+            // Named ids, for the unrevokes written before this was about pairs.
             for (let revocationId of parsed.revocationIds || []) {
                 unrevoked.add(revocationId);
             }
@@ -79,13 +98,47 @@ async function revokedKeysInRepo(config) {
     catch (e) {
         // Nothing has been unrevoked.
     }
-    let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId));
+    let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId)
+        && !unrevoked.has(`${revocation.fingerprint} ${revocationIP(revocation)}`));
     let keys = (0, authorizedKeys_1.normalizeKeys)(await promises_1.default.readFile(path_1.default.join(repoPath, "authorized_keys"), "utf8").catch(() => ""));
     return stillRevoked
         .filter(revocation => keys.some(key => (0, authorizedKeys_1.keyFingerprint)(key) === revocation.fingerprint))
         .map(revocation => ({ revocation, key: keys.find(key => (0, authorizedKeys_1.keyFingerprint)(key) === revocation.fingerprint) || "" }));
 }
 exports.revokedKeysInRepo = revokedKeysInRepo;
+/** Writes the addresses into the from= list of each key in the repo's authorized_keys, and says
+    which ones were actually new. Only the lines being changed are touched, so comments, ordering
+    and any key not involved come out of this byte for byte the same. */
+async function allowAddressesInRepo(config) {
+    let { repoPath, addressesByFingerprint } = config;
+    let added = new Map();
+    let filePath = path_1.default.join(repoPath, "authorized_keys");
+    let contents;
+    try {
+        contents = await promises_1.default.readFile(filePath, "utf8");
+    }
+    catch (e) {
+        // A repo holding its keys as separate .pub files. Nothing to edit in one place, so the
+        // caller's listing is all whoever ran this gets.
+        console.log(`No authorized_keys in ${repoPath}, so the addresses were not added to any key.`);
+        return added;
+    }
+    let lines = contents.split("\n");
+    for (let index = 0; index < lines.length; index++) {
+        let fingerprint = (0, authorizedKeys_1.keyFingerprint)(lines[index]);
+        let addresses = fingerprint && addressesByFingerprint.get(fingerprint);
+        if (!addresses || !addresses.length) {
+            continue;
+        }
+        let result = (0, authorizedKeys_1.allowAddresses)(lines[index], addresses);
+        lines[index] = result.keyLine;
+        added.set(fingerprint, [...(added.get(fingerprint) || []), ...result.added]);
+    }
+    if ([...added.values()].some(list => list.length)) {
+        await promises_1.default.writeFile(filePath, lines.join("\n"));
+    }
+    return added;
+}
 /** The repo named, or the one we are standing in. Checked the same way securessh checks it: a git
     repo that actually holds keys and has an origin to clone from. */
 async function resolveKeysRepo(named) {
@@ -112,7 +165,6 @@ async function resolveKeysRepo(named) {
     return { repoPath, originURL };
 }
 async function main() {
-    var _a;
     let argv = process.argv.slice(2);
     let pushToGit = argv.includes(GIT_KEYWORD);
     let positional = argv.filter(arg => arg !== GIT_KEYWORD);
@@ -132,21 +184,65 @@ async function main() {
     await promises_1.default.writeFile(path_1.default.join(directory, `${unrevokeId}.json`), JSON.stringify({
         unrevokeId,
         createdAt: new Date().toISOString(),
-        // Named one by one rather than as a blanket "allow everything again", so this file only
-        // ever undoes the revocations that existed when it was written.
-        revocationIds: revocations.map(revocation => revocation.revocationId),
+        // What this file says: each of these keys is allowed from this address. Pairs, not keys,
+        // and not a blanket "allow everything again" - a key forgiven here for one address is
+        // still revoked the moment it is used from another.
+        allowed: revocations.map(revocation => ({
+            fingerprint: revocation.fingerprint,
+            ip: revocationIP(revocation),
+        })),
         revocations: revocations.map(revocation => ({
             revocationId: revocation.revocationId,
             fingerprint: revocation.fingerprint,
+            ip: revocationIP(revocation),
             revokedAt: revocation.revokedAt,
             revokedBy: revocation.revokedBy,
             attempt: revocation.attempt,
         })),
     }, undefined, 4) + "\n");
-    console.log(`Wrote ${UNREVOKES_DIR}/${unrevokeId}.json covering ${revocations.length} revocation(s):`);
+    // Named the way the notifications name them. A fingerprint is not in authorized_keys and
+    // cannot be worked out by eye, so on its own it tells whoever is reading this nothing about
+    // which of their keys is being talked about.
+    let keysByFingerprint = new Map();
+    for (let key of await (0, authorizedKeys_2.readRepoKeys)(repoPath).catch(() => [])) {
+        keysByFingerprint.set((0, authorizedKeys_1.keyFingerprint)(key), key);
+    }
+    let describeKey = (revocation) => {
+        let key = keysByFingerprint.get(revocation.fingerprint) || revocation.key || "";
+        return key && (0, authorizedKeys_1.summarizeKey)(key) || `a key no longer in this repo (${revocation.fingerprint})`;
+    };
+    let addressesByFingerprint = new Map();
     for (let revocation of revocations) {
-        console.log(`  ${revocation.fingerprint} revoked by ${revocation.revokedBy || "?"} from ${((_a = revocation.attempt) === null || _a === void 0 ? void 0 : _a.ip) || "?"}`);
+        let ip = revocationIP(revocation);
+        let existing = addressesByFingerprint.get(revocation.fingerprint) || [];
+        if (ip && !existing.includes(ip)) {
+            existing.push(ip);
+        }
+        addressesByFingerprint.set(revocation.fingerprint, existing);
+    }
+    // Cancelling the revocation on its own would leave sshd refusing that address and the machines
+    // revoking the key all over again, so the addresses go into the key's from= here. We are in
+    // the repo that owns authorized_keys, so there is nothing to hand back to whoever ran this.
+    let added = await allowAddressesInRepo({ repoPath, addressesByFingerprint });
+    console.log("");
+    for (let [fingerprint, addresses] of addressesByFingerprint) {
+        let revocation = revocations.find(entry => entry.fingerprint === fingerprint);
+        console.log(`Unfreezing ${describeKey(revocation)}`);
+        console.log(`Allowing IP ${addresses.join(", ") || "(no address recorded)"}`);
+        let addedHere = added.get(fingerprint) || [];
+        if (addedHere.length) {
+            console.log(`  added to that key's from= list in authorized_keys: ${addedHere.join(", ")}`);
+        }
+        else {
+            console.log(`  that key's from= list already allowed ${addresses.join(", ") ? "them" : "everything"}`);
+        }
+        for (let entry of revocations.filter(entry => entry.fingerprint === fingerprint)) {
+            console.log(`  frozen by ${entry.revokedBy || "?"} ${entry.revokedAt || "at an unrecorded time"}`);
+        }
+        console.log("");
     }
+    console.log(`Every other address stays frozen, and one of these keys used from anywhere else`);
+    console.log(`is frozen again.`);
     // Signed here rather than left as a step to remember. An unrevoke nobody signed does nothing at
     // all, and the repo would sit there looking done while every machine ignored it.
     await (0, signFiles_1.signRepo)({ repoPath });
@@ -163,5 +259,5 @@ async function main() {
     console.log(`keys work again.`);
 }
 exports.main = main;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"unrevoke.js","sourceRoot":"","sources":["unrevoke.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs/promises\";\nimport os from \"os\";\nimport path from \"path\";\nimport { runPromise } from \"socket-function/src/runPromise\";\nimport { keyFingerprint, normalizeKeys } from \"./authorizedKeys\";\nimport { revokeRepoURL } from \"./revokeSource\";\nimport { signRepo } from \"../signedFiles/signFiles\";\nimport { readRepoKeys } from \"./authorizedKeys\";\nimport { expandHome } from \"../helpers/paths\";\nimport { spawnPromise } from \"../helpers/spawn\";\n\nconst UNREVOKES_DIR = \"unrevoked\";\nconst REVOCATIONS_DIR = \"revocations\";\nconst GIT_KEYWORD = \"git\";\nconst COMMIT_MESSAGE = \"unrevoke keys\";\nconst USAGE = `Usage: yarn unrevoke [keys-repo] [${GIT_KEYWORD}]\n\nRun this in a keys repo, or name one. It reads that repo's revoke repo and writes one unrevoke file\nnaming every revocation in it, so the keys are accepted again once each machine's hour long wait\npasses. It signs the result, and with ${GIT_KEYWORD} it commits and pushes it too.\n\nKeys that were revoked should normally be deleted from the repo instead. Unrevoking only matters\nfor a key you still want.`;\n\nexport type Revocation = {\n    revocationId: string;\n    fingerprint: string;\n    key?: string;\n    revokedAt?: string;\n    revokedBy?: string;\n    attempt?: { ip?: string; user?: string; required?: string };\n};\n\n/** Every revocation the revoke repo lists. Cloned read only into a temp directory, with whatever\n    credentials this machine already has - the derived deploy key is for servers, and a person\n    running this has their own access to the repo. */\nexport async function readRemoteRevocations(config: { sourceURL: string }) {\n    let { sourceURL } = config;\n    let temporaryDirectory = await fs.mkdtemp(path.join(os.tmpdir(), \"unrevoke-\"));\n    let repoPath = path.join(temporaryDirectory, \"repo\");\n    let clone = await spawnPromise({\n        command: \"git\",\n        args: [\"clone\", \"--depth\", \"1\", revokeRepoURL(sourceURL), repoPath],\n    });\n    if (clone.status !== 0) {\n        await fs.rm(temporaryDirectory, { recursive: true, force: true });\n        throw new Error(\n            `Expected to be able to read ${revokeRepoURL(sourceURL)}.\\n`\n            + `${(clone.stdout + clone.stderr).trim()}`\n        );\n    }\n    let revocations: Revocation[] = [];\n    let directory = path.join(repoPath, REVOCATIONS_DIR);\n    try {\n        for (let name of (await fs.readdir(directory)).sort()) {\n            if (name.endsWith(\".json\")) {\n                revocations.push(JSON.parse(await fs.readFile(path.join(directory, name), \"utf8\")));\n            }\n        }\n    } catch (e) {\n        // No revocations directory at all just means nothing has ever been revoked.\n    }\n    await fs.rm(temporaryDirectory, { recursive: true, force: true });\n    return revocations;\n}\n\n/** Which keys in a repo are revoked. What signfiles and securessh refuse over. */\nexport async function revokedKeysInRepo(config: { repoPath: string; sourceURL: string }) {\n    let { repoPath, sourceURL } = config;\n    let revocations = await readRemoteRevocations({ sourceURL });\n    let revokedFingerprints = new Set(revocations.map(revocation => revocation.fingerprint));\n    let unrevoked = new Set<string>();\n    try {\n        let directory = path.join(repoPath, UNREVOKES_DIR);\n        for (let name of await fs.readdir(directory)) {\n            if (!name.endsWith(\".json\")) {\n                continue;\n            }\n            let parsed = JSON.parse(await fs.readFile(path.join(directory, name), \"utf8\"));\n            for (let revocationId of parsed.revocationIds || []) {\n                unrevoked.add(revocationId);\n            }\n        }\n    } catch (e) {\n        // Nothing has been unrevoked.\n    }\n    let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId));\n    let keys = normalizeKeys(await fs.readFile(path.join(repoPath, \"authorized_keys\"), \"utf8\").catch(() => \"\"));\n    return stillRevoked\n        .filter(revocation => keys.some(key => keyFingerprint(key) === revocation.fingerprint))\n        .map(revocation => ({ revocation, key: keys.find(key => keyFingerprint(key) === revocation.fingerprint) || \"\" }));\n}\n\n/** The repo named, or the one we are standing in. Checked the same way securessh checks it: a git\n    repo that actually holds keys and has an origin to clone from. */\nasync function resolveKeysRepo(named: string | undefined) {\n    let cwd = named && expandHome(named) || undefined;\n    // spawnPromise rather than runPromise, because these two are read for their value. runPromise\n    // returns stdout and stderr joined, so one git warning ends up glued to the front of the path.\n    let topLevel = await spawnPromise({ command: \"git\", args: [\"rev-parse\", \"--show-toplevel\"], cwd });\n    let repoPath = topLevel.stdout.trim();\n    if (topLevel.status !== 0 || !repoPath) {\n        throw new Error(\n            `Expected ${named || \"the current directory\"} to be inside a git repo, it is not.\\n`\n            + `${(topLevel.stdout + topLevel.stderr).trim()}\\n${USAGE}`\n        );\n    }\n    try {\n        await readRepoKeys(repoPath);\n    } catch (e) {\n        throw new Error(`Expected ${repoPath} to be a keys repo, it holds no keys.\\n${e}\\n${USAGE}`);\n    }\n    let origin = await spawnPromise({ command: \"git\", args: [\"remote\", \"get-url\", \"origin\"], cwd: repoPath });\n    let originURL = origin.stdout.trim();\n    if (origin.status !== 0 || !originURL) {\n        throw new Error(`Expected ${repoPath} to have an origin remote, it has none.\\n${USAGE}`);\n    }\n    return { repoPath, originURL };\n}\n\nexport async function main() {\n    let argv = process.argv.slice(2);\n    let pushToGit = argv.includes(GIT_KEYWORD);\n    let positional = argv.filter(arg => arg !== GIT_KEYWORD);\n    if (positional.length > 1) {\n        throw new Error(`Expected at most a keys repo, was ${positional.length} argument(s)\\n${USAGE}`);\n    }\n    let { repoPath, originURL } = await resolveKeysRepo(positional[0]);\n\n    let revocations = await readRemoteRevocations({ sourceURL: originURL });\n    if (!revocations.length) {\n        console.log(`${revokeRepoURL(originURL)} lists no revocations, so there is nothing to undo.`);\n        return;\n    }\n\n    let directory = path.join(repoPath, UNREVOKES_DIR);\n    await fs.mkdir(directory, { recursive: true });\n    let stamp = new Date().toISOString().replace(/[:.]/g, \"-\");\n    let unrevokeId = `${stamp}-unrevoke`;\n    await fs.writeFile(path.join(directory, `${unrevokeId}.json`), JSON.stringify({\n        unrevokeId,\n        createdAt: new Date().toISOString(),\n        // Named one by one rather than as a blanket \"allow everything again\", so this file only\n        // ever undoes the revocations that existed when it was written.\n        revocationIds: revocations.map(revocation => revocation.revocationId),\n        revocations: revocations.map(revocation => ({\n            revocationId: revocation.revocationId,\n            fingerprint: revocation.fingerprint,\n            revokedAt: revocation.revokedAt,\n            revokedBy: revocation.revokedBy,\n            attempt: revocation.attempt,\n        })),\n    }, undefined, 4) + \"\\n\");\n\n    console.log(`Wrote ${UNREVOKES_DIR}/${unrevokeId}.json covering ${revocations.length} revocation(s):`);\n    for (let revocation of revocations) {\n        console.log(`  ${revocation.fingerprint} revoked by ${revocation.revokedBy || \"?\"} from ${revocation.attempt?.ip || \"?\"}`);\n    }\n\n    // Signed here rather than left as a step to remember. An unrevoke nobody signed does nothing at\n    // all, and the repo would sit there looking done while every machine ignored it.\n    await signRepo({ repoPath });\n\n    if (!pushToGit) {\n        console.log(`\\nCommit and push it, and each machine will wait an hour after seeing it before`);\n        console.log(`those keys work again:`);\n        console.log(`\\`\\`\\`\\ngit add -A\\ngit commit -m \"${COMMIT_MESSAGE}\"\\ngit push\\n\\`\\`\\``);\n        return;\n    }\n    await runPromise(`git add -A`, { cwd: repoPath });\n    await runPromise(`git commit -m \"${COMMIT_MESSAGE}\"`, { cwd: repoPath });\n    await runPromise(`git push`, { cwd: repoPath });\n    console.log(`\\nCommitted and pushed. Each machine waits an hour after seeing it before those`);\n    console.log(`keys work again.`);\n}\n"]}
- /* _JS_SOURCE_HASH = "0fcca51775122c0bd892f4c8b9872f06ef62cdb278ee8668702a7ce402c07867"; */
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"unrevoke.js","sourceRoot":"","sources":["unrevoke.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs/promises\";\nimport os from \"os\";\nimport path from \"path\";\nimport { runPromise } from \"socket-function/src/runPromise\";\nimport { allowAddresses, keyFingerprint, normalizeKeys, summarizeKey } from \"./authorizedKeys\";\nimport { deriveRevokeKey, revokeRepoURL } from \"./revokeSource\";\nimport { findSourceKey } from \"./sources\";\nimport { signRepo } from \"../signedFiles/signFiles\";\nimport { readRepoKeys } from \"./authorizedKeys\";\nimport { expandHome } from \"../helpers/paths\";\nimport { spawnPromise } from \"../helpers/spawn\";\n\nconst UNREVOKES_DIR = \"unrevoked\";\nconst REVOCATIONS_DIR = \"revocations\";\nconst GIT_KEYWORD = \"git\";\nconst COMMIT_MESSAGE = \"unrevoke keys\";\nconst USAGE = `Usage: yarn unrevoke [keys-repo] [${GIT_KEYWORD}]\n\nRun this in a keys repo, or name one. It reads that repo's revoke repo and writes one unrevoke file\nnaming every revocation in it, so the keys are accepted again once each machine's hour long wait\npasses. It signs the result, and with ${GIT_KEYWORD} it commits and pushes it too.\n\nKeys that were revoked should normally be deleted from the repo instead. Unrevoking only matters\nfor a key you still want.`;\n\nexport type Revocation = {\n    revocationId: string;\n    fingerprint: string;\n    // The address the key was used from. A revocation is about this pair, and an unrevoke undoes\n    // it by allowing that same pair - which is why unrevoking never makes a key unrevokable: used\n    // from some other address, it is revoked again.\n    ip?: string;\n    key?: string;\n    revokedAt?: string;\n    revokedBy?: string;\n    attempt?: { ip?: string; user?: string; required?: string };\n};\n\n/** Older revocation files carry the address under attempt only. */\nexport function revocationIP(revocation: Revocation) {\n    return revocation.ip || revocation.attempt?.ip || \"\";\n}\n\n/** Every revocation the revoke repo lists. Cloned read only into a temp directory.\n\n    A person running this has their own access to the repo, so their credentials are what is used.\n    On a machine that is already a portsecure host there may be no such credentials, but the source\n    deploy key is right there, and the key derived from it is one that repo definitely accepts. */\nexport async function readRemoteRevocations(config: { sourceURL: string }) {\n    let { sourceURL } = config;\n    let temporaryDirectory = await fs.mkdtemp(path.join(os.tmpdir(), \"unrevoke-\"));\n    let repoPath = path.join(temporaryDirectory, \"repo\");\n    let cloneArgs = [\"clone\", \"--depth\", \"1\", revokeRepoURL(sourceURL), repoPath];\n    let sourceKey = await findSourceKey(sourceURL);\n    if (sourceKey) {\n        let derived = deriveRevokeKey(await fs.readFile(sourceKey, \"utf8\"));\n        let derivedKeyPath = path.join(temporaryDirectory, \"key\");\n        await fs.writeFile(derivedKeyPath, derived.privateKeyFile, { mode: 0o600 });\n        let sshCommand = `ssh -i ${derivedKeyPath} -o IdentitiesOnly=yes -o BatchMode=yes -o StrictHostKeyChecking=accept-new`;\n        cloneArgs = [\"-c\", `core.sshCommand=${sshCommand}`, ...cloneArgs];\n    }\n    let clone = await spawnPromise({ command: \"git\", args: cloneArgs });\n    if (clone.status !== 0) {\n        await fs.rm(temporaryDirectory, { recursive: true, force: true });\n        throw new Error(\n            `Expected to be able to read ${revokeRepoURL(sourceURL)}.\\n`\n            + `${(clone.stdout + clone.stderr).trim()}`\n        );\n    }\n    let revocations: Revocation[] = [];\n    let directory = path.join(repoPath, REVOCATIONS_DIR);\n    try {\n        for (let name of (await fs.readdir(directory)).sort()) {\n            if (name.endsWith(\".json\")) {\n                revocations.push(JSON.parse(await fs.readFile(path.join(directory, name), \"utf8\")));\n            }\n        }\n    } catch (e) {\n        // No revocations directory at all just means nothing has ever been revoked.\n    }\n    await fs.rm(temporaryDirectory, { recursive: true, force: true });\n    return revocations;\n}\n\n/** Which keys in a repo are revoked. What signfiles and securessh refuse over. */\nexport async function revokedKeysInRepo(config: { repoPath: string; sourceURL: string }) {\n    let { repoPath, sourceURL } = config;\n    let revocations = await readRemoteRevocations({ sourceURL });\n    let revokedFingerprints = new Set(revocations.map(revocation => revocation.fingerprint));\n    let unrevoked = new Set<string>();\n    try {\n        let directory = path.join(repoPath, UNREVOKES_DIR);\n        for (let name of await fs.readdir(directory)) {\n            if (!name.endsWith(\".json\")) {\n                continue;\n            }\n            let parsed = JSON.parse(await fs.readFile(path.join(directory, name), \"utf8\"));\n            for (let allowed of parsed.allowed || []) {\n                unrevoked.add(`${allowed.fingerprint} ${allowed.ip}`);\n            }\n            // Named ids, for the unrevokes written before this was about pairs.\n            for (let revocationId of parsed.revocationIds || []) {\n                unrevoked.add(revocationId);\n            }\n        }\n    } catch (e) {\n        // Nothing has been unrevoked.\n    }\n    let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId)\n        && !unrevoked.has(`${revocation.fingerprint} ${revocationIP(revocation)}`));\n    let keys = normalizeKeys(await fs.readFile(path.join(repoPath, \"authorized_keys\"), \"utf8\").catch(() => \"\"));\n    return stillRevoked\n        .filter(revocation => keys.some(key => keyFingerprint(key) === revocation.fingerprint))\n        .map(revocation => ({ revocation, key: keys.find(key => keyFingerprint(key) === revocation.fingerprint) || \"\" }));\n}\n\n/** Writes the addresses into the from= list of each key in the repo's authorized_keys, and says\n    which ones were actually new. Only the lines being changed are touched, so comments, ordering\n    and any key not involved come out of this byte for byte the same. */\nasync function allowAddressesInRepo(config: {\n    repoPath: string;\n    addressesByFingerprint: Map<string, string[]>;\n}) {\n    let { repoPath, addressesByFingerprint } = config;\n    let added = new Map<string, string[]>();\n    let filePath = path.join(repoPath, \"authorized_keys\");\n    let contents;\n    try {\n        contents = await fs.readFile(filePath, \"utf8\");\n    } catch (e) {\n        // A repo holding its keys as separate .pub files. Nothing to edit in one place, so the\n        // caller's listing is all whoever ran this gets.\n        console.log(`No authorized_keys in ${repoPath}, so the addresses were not added to any key.`);\n        return added;\n    }\n    let lines = contents.split(\"\\n\");\n    for (let index = 0; index < lines.length; index++) {\n        let fingerprint = keyFingerprint(lines[index]);\n        let addresses = fingerprint && addressesByFingerprint.get(fingerprint);\n        if (!addresses || !addresses.length) {\n            continue;\n        }\n        let result = allowAddresses(lines[index], addresses);\n        lines[index] = result.keyLine;\n        added.set(fingerprint, [...(added.get(fingerprint) || []), ...result.added]);\n    }\n    if ([...added.values()].some(list => list.length)) {\n        await fs.writeFile(filePath, lines.join(\"\\n\"));\n    }\n    return added;\n}\n\n/** The repo named, or the one we are standing in. Checked the same way securessh checks it: a git\n    repo that actually holds keys and has an origin to clone from. */\nasync function resolveKeysRepo(named: string | undefined) {\n    let cwd = named && expandHome(named) || undefined;\n    // spawnPromise rather than runPromise, because these two are read for their value. runPromise\n    // returns stdout and stderr joined, so one git warning ends up glued to the front of the path.\n    let topLevel = await spawnPromise({ command: \"git\", args: [\"rev-parse\", \"--show-toplevel\"], cwd });\n    let repoPath = topLevel.stdout.trim();\n    if (topLevel.status !== 0 || !repoPath) {\n        throw new Error(\n            `Expected ${named || \"the current directory\"} to be inside a git repo, it is not.\\n`\n            + `${(topLevel.stdout + topLevel.stderr).trim()}\\n${USAGE}`\n        );\n    }\n    try {\n        await readRepoKeys(repoPath);\n    } catch (e) {\n        throw new Error(`Expected ${repoPath} to be a keys repo, it holds no keys.\\n${e}\\n${USAGE}`);\n    }\n    let origin = await spawnPromise({ command: \"git\", args: [\"remote\", \"get-url\", \"origin\"], cwd: repoPath });\n    let originURL = origin.stdout.trim();\n    if (origin.status !== 0 || !originURL) {\n        throw new Error(`Expected ${repoPath} to have an origin remote, it has none.\\n${USAGE}`);\n    }\n    return { repoPath, originURL };\n}\n\nexport async function main() {\n    let argv = process.argv.slice(2);\n    let pushToGit = argv.includes(GIT_KEYWORD);\n    let positional = argv.filter(arg => arg !== GIT_KEYWORD);\n    if (positional.length > 1) {\n        throw new Error(`Expected at most a keys repo, was ${positional.length} argument(s)\\n${USAGE}`);\n    }\n    let { repoPath, originURL } = await resolveKeysRepo(positional[0]);\n\n    let revocations = await readRemoteRevocations({ sourceURL: originURL });\n    if (!revocations.length) {\n        console.log(`${revokeRepoURL(originURL)} lists no revocations, so there is nothing to undo.`);\n        return;\n    }\n\n    let directory = path.join(repoPath, UNREVOKES_DIR);\n    await fs.mkdir(directory, { recursive: true });\n    let stamp = new Date().toISOString().replace(/[:.]/g, \"-\");\n    let unrevokeId = `${stamp}-unrevoke`;\n    await fs.writeFile(path.join(directory, `${unrevokeId}.json`), JSON.stringify({\n        unrevokeId,\n        createdAt: new Date().toISOString(),\n        // What this file says: each of these keys is allowed from this address. Pairs, not keys,\n        // and not a blanket \"allow everything again\" - a key forgiven here for one address is\n        // still revoked the moment it is used from another.\n        allowed: revocations.map(revocation => ({\n            fingerprint: revocation.fingerprint,\n            ip: revocationIP(revocation),\n        })),\n        revocations: revocations.map(revocation => ({\n            revocationId: revocation.revocationId,\n            fingerprint: revocation.fingerprint,\n            ip: revocationIP(revocation),\n            revokedAt: revocation.revokedAt,\n            revokedBy: revocation.revokedBy,\n            attempt: revocation.attempt,\n        })),\n    }, undefined, 4) + \"\\n\");\n\n    // Named the way the notifications name them. A fingerprint is not in authorized_keys and\n    // cannot be worked out by eye, so on its own it tells whoever is reading this nothing about\n    // which of their keys is being talked about.\n    let keysByFingerprint = new Map<string, string>();\n    for (let key of await readRepoKeys(repoPath).catch(() => [] as string[])) {\n        keysByFingerprint.set(keyFingerprint(key), key);\n    }\n    let describeKey = (revocation: Revocation) => {\n        let key = keysByFingerprint.get(revocation.fingerprint) || revocation.key || \"\";\n        return key && summarizeKey(key) || `a key no longer in this repo (${revocation.fingerprint})`;\n    };\n\n    let addressesByFingerprint = new Map<string, string[]>();\n    for (let revocation of revocations) {\n        let ip = revocationIP(revocation);\n        let existing = addressesByFingerprint.get(revocation.fingerprint) || [];\n        if (ip && !existing.includes(ip)) {\n            existing.push(ip);\n        }\n        addressesByFingerprint.set(revocation.fingerprint, existing);\n    }\n\n    // Cancelling the revocation on its own would leave sshd refusing that address and the machines\n    // revoking the key all over again, so the addresses go into the key's from= here. We are in\n    // the repo that owns authorized_keys, so there is nothing to hand back to whoever ran this.\n    let added = await allowAddressesInRepo({ repoPath, addressesByFingerprint });\n\n    console.log(\"\");\n    for (let [fingerprint, addresses] of addressesByFingerprint) {\n        let revocation = revocations.find(entry => entry.fingerprint === fingerprint)!;\n        console.log(`Unfreezing ${describeKey(revocation)}`);\n        console.log(`Allowing IP ${addresses.join(\", \") || \"(no address recorded)\"}`);\n        let addedHere = added.get(fingerprint) || [];\n        if (addedHere.length) {\n            console.log(`  added to that key's from= list in authorized_keys: ${addedHere.join(\", \")}`);\n        } else {\n            console.log(`  that key's from= list already allowed ${addresses.join(\", \") ? \"them\" : \"everything\"}`);\n        }\n        for (let entry of revocations.filter(entry => entry.fingerprint === fingerprint)) {\n            console.log(\n                `  frozen by ${entry.revokedBy || \"?\"} ${entry.revokedAt || \"at an unrecorded time\"}`\n            );\n        }\n        console.log(\"\");\n    }\n    console.log(`Every other address stays frozen, and one of these keys used from anywhere else`);\n    console.log(`is frozen again.`);\n\n    // Signed here rather than left as a step to remember. An unrevoke nobody signed does nothing at\n    // all, and the repo would sit there looking done while every machine ignored it.\n    await signRepo({ repoPath });\n\n    if (!pushToGit) {\n        console.log(`\\nCommit and push it, and each machine will wait an hour after seeing it before`);\n        console.log(`those keys work again:`);\n        console.log(`\\`\\`\\`\\ngit add -A\\ngit commit -m \"${COMMIT_MESSAGE}\"\\ngit push\\n\\`\\`\\``);\n        return;\n    }\n    await runPromise(`git add -A`, { cwd: repoPath });\n    await runPromise(`git commit -m \"${COMMIT_MESSAGE}\"`, { cwd: repoPath });\n    await runPromise(`git push`, { cwd: repoPath });\n    console.log(`\\nCommitted and pushed. Each machine waits an hour after seeing it before those`);\n    console.log(`keys work again.`);\n}\n"]}
+ /* _JS_SOURCE_HASH = "9b90ba359ba9cd1b6be2a54ba85a896c0ebcf4bac2b38be51f7d4886cdc1820e"; */

package/security/authorizedKeys/secureSSH.ts

@@ -449,6 +449,31 @@ async function addSource(config: { host: string; keyPath: string; repoURL: strin
         console.log(`${describeHost(host)} already has ${repoURL}, refreshing its key and the daemon.`);
     }
 
+    // Copied into place before anything else needs it. The checks below look this source's key up
+    // where the machine keeps it, not at the path it was handed on the command line, so a key that
+    // is still only sitting in the caller's directory reads as no key at all.
+    //
+    // Into the home of whoever the daemon runs as, which is where it looks. Asked of the host
+    // rather than worked out here: this may be running on a machine with no such user, and with a
+    // home directory in an entirely different shape.
+    let hostKeysDirectory = await daemonKeysDir(host);
+    await writeRemoteFile({
+        host,
+        filePath: `${hostKeysDirectory}/${sourceName(repoURL)}`,
+        contents: await fs.readFile(keyPath, "utf8"),
+        fileMode: "600",
+        directoryMode: "700",
+    });
+    // The public half too, so the deploy key that a repo was given can be looked up on the machine
+    // using it, rather than only in whatever github shows.
+    await writeRemoteFile({
+        host,
+        filePath: `${hostKeysDirectory}/${sourceName(repoURL)}.pub`,
+        contents: await publicKeyOf(keyPath),
+        fileMode: "644",
+        directoryMode: "700",
+    });
+
     // The merged result is what root ends up with, so our own key has to be somewhere in it. On
     // this machine there is no ssh session to preserve, so there is nothing to check.
     let ourFingerprint = "";
@@ -490,27 +515,6 @@ async function addSource(config: { host: string; keyPath: string; repoURL: strin
     let webhookURL = await requireRemoteWebhook(host);
     console.log(`${describeHost(host)} notifies ${webhookURL}`);
 
-    // Into the home of whoever the daemon runs as, which is where it looks. Asked of the host
-    // rather than worked out here: this may be running on a machine with no such user, and with a
-    // home directory in an entirely different shape.
-    let hostKeysDirectory = await daemonKeysDir(host);
-    await writeRemoteFile({
-        host,
-        filePath: `${hostKeysDirectory}/${sourceName(repoURL)}`,
-        contents: await fs.readFile(keyPath, "utf8"),
-        fileMode: "600",
-        directoryMode: "700",
-    });
-    // The public half too, so the deploy key that a repo was given can be looked up on the machine
-    // using it, rather than only in whatever github shows.
-    await writeRemoteFile({
-        host,
-        filePath: `${hostKeysDirectory}/${sourceName(repoURL)}.pub`,
-        contents: await publicKeyOf(keyPath),
-        fileMode: "644",
-        directoryMode: "700",
-    });
-
     let repoSources = remoteConfig.repoSources.filter(source => source !== repoURL);
     repoSources.push(repoURL);
     await installDaemon({ host, hostLabel: remoteConfig.hostLabel, repoSources });
@@ -637,7 +641,21 @@ function parseArgs(argv: string[]) {
     return { verb, host, rest: positional };
 }
 
+/** Everything here is root's: root's authorized_keys, root's keys directory, the sshd config, the
+    systemd unit. Run as anyone else it reads a different home and writes files the daemon will
+    never see, and it gets there several steps in rather than failing at the start. */
+function requireRoot() {
+    let uid = process.getuid?.();
+    if (uid !== 0) {
+        throw new Error(
+            `Expected to be running as root, is uid ${uid ?? "unknown"}.\n`
+            + `Rerun this with sudo.`
+        );
+    }
+}
+
 export async function main() {
+    requireRoot();
     let { verb, host, rest } = parseArgs(process.argv.slice(2));
 
     if (verb === "list") {

package/security/authorizedKeys/unrevoke.ts

@@ -2,13 +2,14 @@ import fs from "fs/promises";
 import os from "os";
 import path from "path";
 import { runPromise } from "socket-function/src/runPromise";
-import { keyFingerprint, normalizeKeys } from "./authorizedKeys";
+import { allowAddresses, keyFingerprint, normalizeKeys, summarizeKey } from "./authorizedKeys";
 import { deriveRevokeKey, revokeRepoURL } from "./revokeSource";
 import { findSourceKey } from "./sources";
 import { signRepo } from "../signedFiles/signFiles";
 import { readRepoKeys } from "./authorizedKeys";
 import { expandHome } from "../helpers/paths";
 import { spawnPromise } from "../helpers/spawn";
+import { machineState } from "../machines/machines";
 
 const UNREVOKES_DIR = "unrevoked";
 const REVOCATIONS_DIR = "revocations";
@@ -23,15 +24,35 @@ passes. It signs the result, and with ${GIT_KEYWORD} it commits and pushes it to
 Keys that were revoked should normally be deleted from the repo instead. Unrevoking only matters
 for a key you still want.`;
 
+/** One revocation event. Either an ssh key used from an address it is not allowed from, or a
+    machine that talked to us from one. Both are the same shape - an identity and an address - and
+    an unrevoke undoes either by allowing that same pair.
+
+    Which is why unrevoking never makes anything unrevokable: used from some other address, it is
+    revoked again, under a new id no existing unrevoke names. */
 export type Revocation = {
     revocationId: string;
-    fingerprint: string;
+    // Exactly one of these. A key revocation names a fingerprint, a machine revocation a machineId.
+    fingerprint?: string;
+    machineId?: string;
+    ip?: string;
     key?: string;
     revokedAt?: string;
     revokedBy?: string;
+    reason?: string;
     attempt?: { ip?: string; user?: string; required?: string };
 };
 
+/** Older revocation files carry the address under attempt only. */
+export function revocationIP(revocation: Revocation) {
+    return revocation.ip || revocation.attempt?.ip || "";
+}
+
+/** What the revocation is about, which is what an unrevoke has to name to undo it. */
+export function revocationIdentity(revocation: Revocation) {
+    return revocation.fingerprint || revocation.machineId || "";
+}
+
 /** Every revocation the revoke repo lists. Cloned read only into a temp directory.
 
     A person running this has their own access to the repo, so their credentials are what is used.
@@ -86,6 +107,10 @@ export async function revokedKeysInRepo(config: { repoPath: string; sourceURL: s
                 continue;
             }
             let parsed = JSON.parse(await fs.readFile(path.join(directory, name), "utf8"));
+            for (let allowed of parsed.allowed || []) {
+                unrevoked.add(`${allowed.fingerprint || allowed.machineId} ${allowed.ip}`);
+            }
+            // Named ids, for the unrevokes written before this was about pairs.
             for (let revocationId of parsed.revocationIds || []) {
                 unrevoked.add(revocationId);
             }
@@ -93,13 +118,84 @@ export async function revokedKeysInRepo(config: { repoPath: string; sourceURL: s
     } catch (e) {
         // Nothing has been unrevoked.
     }
-    let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId));
+    let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId)
+        && !unrevoked.has(`${revocation.fingerprint} ${revocationIP(revocation)}`));
     let keys = normalizeKeys(await fs.readFile(path.join(repoPath, "authorized_keys"), "utf8").catch(() => ""));
     return stillRevoked
         .filter(revocation => keys.some(key => keyFingerprint(key) === revocation.fingerprint))
         .map(revocation => ({ revocation, key: keys.find(key => keyFingerprint(key) === revocation.fingerprint) || "" }));
 }
 
+/** Writes the addresses into the from= list of each key in the repo's authorized_keys, and says
+    which ones were actually new. Only the lines being changed are touched, so comments, ordering
+    and any key not involved come out of this byte for byte the same. */
+async function allowAddressesInRepo(config: {
+    repoPath: string;
+    addressesByFingerprint: Map<string, string[]>;
+}) {
+    let { repoPath, addressesByFingerprint } = config;
+    let added = new Map<string, string[]>();
+    let filePath = path.join(repoPath, "authorized_keys");
+    let contents;
+    try {
+        contents = await fs.readFile(filePath, "utf8");
+    } catch (e) {
+        // A repo holding its keys as separate .pub files. Nothing to edit in one place, so the
+        // caller's listing is all whoever ran this gets.
+        console.log(`No authorized_keys in ${repoPath}, so the addresses were not added to any key.`);
+        return added;
+    }
+    let lines = contents.split("\n");
+    for (let index = 0; index < lines.length; index++) {
+        let fingerprint = keyFingerprint(lines[index]);
+        let addresses = fingerprint && addressesByFingerprint.get(fingerprint);
+        if (!addresses || !addresses.length) {
+            continue;
+        }
+        let result = allowAddresses(lines[index], addresses);
+        lines[index] = result.keyLine;
+        added.set(fingerprint, [...(added.get(fingerprint) || []), ...result.added]);
+    }
+    if ([...added.values()].some(list => list.length)) {
+        await fs.writeFile(filePath, lines.join("\n"));
+    }
+    return added;
+}
+
+/** Puts each machine's addresses back into its own file, which is the machine equivalent of adding
+    an address to a key's from= list: without it the machine is allowed again in principle and
+    still rejected on sight, which revokes it once more. */
+async function allowAddressesForMachines(config: { repoPath: string; revocations: Revocation[] }) {
+    let { repoPath, revocations } = config;
+    let added = new Map<string, string[]>();
+    // Read the whole list, change what these revocations are about, write it back. Setting is by
+    // the whole set, so writing one machine at a time would delete every other machine.
+    let machines = await machineState({ repoPath });
+    for (let revocation of revocations) {
+        let machineId = revocation.machineId;
+        let ip = revocationIP(revocation);
+        if (!machineId || !ip) {
+            continue;
+        }
+        let existing = machines.find(machine => machine.machineId === machineId);
+        if (!existing) {
+            // Removed from the repo since it was revoked, so there is nothing to allow. Deleting a
+            // machine is the stronger statement and it stands.
+            console.log(`machines/${machineId}.json is not in this repo, so ${ip} was not added to it`);
+            continue;
+        }
+        if (existing.ips.includes(ip)) {
+            continue;
+        }
+        existing.ips = [...existing.ips, ip];
+        added.set(machineId, [...(added.get(machineId) || []), ip]);
+    }
+    if (added.size) {
+        await machineState({ repoPath, machines });
+    }
+    return added;
+}
+
 /** The repo named, or the one we are standing in. Checked the same way securessh checks it: a git
     repo that actually holds keys and has an origin to clone from. */
 async function resolveKeysRepo(named: string | undefined) {
@@ -149,22 +245,77 @@ export async function main() {
     await fs.writeFile(path.join(directory, `${unrevokeId}.json`), JSON.stringify({
         unrevokeId,
         createdAt: new Date().toISOString(),
-        // Named one by one rather than as a blanket "allow everything again", so this file only
-        // ever undoes the revocations that existed when it was written.
-        revocationIds: revocations.map(revocation => revocation.revocationId),
+        // What this file says: each of these keys is allowed from this address. Pairs, not keys,
+        // and not a blanket "allow everything again" - a key forgiven here for one address is
+        // still revoked the moment it is used from another.
+        allowed: revocations.map(revocation => ({
+            fingerprint: revocation.fingerprint,
+            machineId: revocation.machineId,
+            ip: revocationIP(revocation),
+        })),
         revocations: revocations.map(revocation => ({
             revocationId: revocation.revocationId,
             fingerprint: revocation.fingerprint,
+            machineId: revocation.machineId,
+            ip: revocationIP(revocation),
             revokedAt: revocation.revokedAt,
             revokedBy: revocation.revokedBy,
             attempt: revocation.attempt,
         })),
     }, undefined, 4) + "\n");
 
-    console.log(`Wrote ${UNREVOKES_DIR}/${unrevokeId}.json covering ${revocations.length} revocation(s):`);
+    // Named the way the notifications name them. A fingerprint is not in authorized_keys and
+    // cannot be worked out by eye, so on its own it tells whoever is reading this nothing about
+    // which of their keys is being talked about.
+    let keysByFingerprint = new Map<string, string>();
+    for (let key of await readRepoKeys(repoPath).catch(() => [] as string[])) {
+        keysByFingerprint.set(keyFingerprint(key), key);
+    }
+    let describeKey = (revocation: Revocation) => {
+        let key = keysByFingerprint.get(revocation.fingerprint || "") || revocation.key || "";
+        return key && summarizeKey(key) || `a key no longer in this repo (${revocation.fingerprint})`;
+    };
+
+    let addressesByIdentity = new Map<string, string[]>();
     for (let revocation of revocations) {
-        console.log(`  ${revocation.fingerprint} revoked by ${revocation.revokedBy || "?"} from ${revocation.attempt?.ip || "?"}`);
+        let ip = revocationIP(revocation);
+        let identity = revocationIdentity(revocation);
+        let existing = addressesByIdentity.get(identity) || [];
+        if (ip && !existing.includes(ip)) {
+            existing.push(ip);
+        }
+        addressesByIdentity.set(identity, existing);
+    }
+
+    // Cancelling the revocation on its own would leave sshd refusing that address, and the machines
+    // revoking all over again, so the addresses go into the key's from= list and into the machine's
+    // own file here. We are in the repo that owns both, so there is nothing to hand back to whoever
+    // ran this.
+    let added = await allowAddressesInRepo({ repoPath, addressesByFingerprint: addressesByIdentity });
+    let addedForMachines = await allowAddressesForMachines({ repoPath, revocations });
+
+    console.log("");
+    for (let [identity, addresses] of addressesByIdentity) {
+        let entries = revocations.filter(entry => revocationIdentity(entry) === identity);
+        let machineId = entries[0].machineId;
+        console.log(`Unfreezing ${machineId && `machine ${machineId}` || describeKey(entries[0])}`);
+        console.log(`Allowing IP ${addresses.join(", ") || "(no address recorded)"}`);
+        let addedHere = machineId && addedForMachines.get(machineId) || added.get(identity) || [];
+        if (addedHere.length) {
+            let where = machineId && `machines/${machineId}.json` || `that key's from= list in authorized_keys`;
+            console.log(`  added to ${where}: ${addedHere.join(", ")}`);
+        } else {
+            console.log(`  already allowed from ${addresses.join(", ") || "everywhere"}`);
+        }
+        for (let entry of entries) {
+            console.log(
+                `  frozen by ${entry.revokedBy || "?"} ${entry.revokedAt || "at an unrecorded time"}`
+            );
+        }
+        console.log("");
     }
+    console.log(`Every other address stays frozen, and any of these used from anywhere else is`);
+    console.log(`frozen again.`);
 
     // Signed here rather than left as a step to remember. An unrevoke nobody signed does nothing at
     // all, and the repo would sit there looking done while every machine ignored it.