sliftutils 1.7.129 → 1.7.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (78) hide show
  1. package/index.d.ts +4 -51
  2. package/misc/dist/ownIPs.ts.cache +29 -3
  3. package/misc/dist/strings.ts.cache +2 -2
  4. package/misc/https/dist/certs.ts.cache +2 -2
  5. package/misc/https/dist/persistentLocalStorage.ts.cache +2 -2
  6. package/misc/ownIPs.ts +29 -1
  7. package/package.json +1 -1
  8. package/security/authorizedKeys/authorizedKeys.d.ts +37 -0
  9. package/security/authorizedKeys/daemon/changes.d.ts +17 -0
  10. package/security/authorizedKeys/daemon/dist/changes.ts.cache +2 -2
  11. package/security/authorizedKeys/daemon/dist/git.ts.cache +2 -2
  12. package/security/authorizedKeys/daemon/dist/notify.ts.cache +2 -2
  13. package/security/authorizedKeys/daemon/dist/paths.ts.cache +4 -7
  14. package/security/authorizedKeys/daemon/dist/repoFiles.ts.cache +2 -2
  15. package/security/authorizedKeys/daemon/dist/revocation.ts.cache +0 -0
  16. package/security/authorizedKeys/daemon/dist/sessions.ts.cache +2 -2
  17. package/security/authorizedKeys/daemon/dist/state.ts.cache +6 -4
  18. package/security/authorizedKeys/daemon/dist/trust.ts.cache +2 -2
  19. package/security/authorizedKeys/daemon/git.d.ts +35 -0
  20. package/security/authorizedKeys/daemon/notify.d.ts +8 -0
  21. package/security/authorizedKeys/daemon/paths.d.ts +15 -0
  22. package/security/authorizedKeys/daemon/paths.ts +0 -3
  23. package/security/authorizedKeys/daemon/repoFiles.d.ts +25 -0
  24. package/security/authorizedKeys/daemon/revocation.d.ts +74 -0
  25. package/security/authorizedKeys/daemon/revocation.ts +0 -0
  26. package/security/authorizedKeys/daemon/sessions.d.ts +19 -0
  27. package/security/authorizedKeys/daemon/state.d.ts +67 -0
  28. package/security/authorizedKeys/daemon/state.ts +4 -8
  29. package/security/authorizedKeys/daemon/trust.d.ts +20 -0
  30. package/security/authorizedKeys/dist/authorizedKeys.ts.cache +2 -2
  31. package/security/authorizedKeys/dist/keysRepo.ts.cache +111 -0
  32. package/security/authorizedKeys/dist/revokeSource.ts.cache +2 -2
  33. package/security/authorizedKeys/dist/secureSSH.ts.cache +147 -71
  34. package/security/authorizedKeys/dist/sources.ts.cache +2 -2
  35. package/security/authorizedKeys/dist/unrevoke.ts.cache +70 -51
  36. package/security/authorizedKeys/keysRepo.d.ts +10 -0
  37. package/security/authorizedKeys/keysRepo.ts +111 -0
  38. package/security/authorizedKeys/revokeSource.d.ts +13 -0
  39. package/security/authorizedKeys/secureSSH.ts +28 -38
  40. package/security/authorizedKeys/sources.d.ts +17 -0
  41. package/security/authorizedKeys/unrevoke.ts +9 -36
  42. package/security/helpers/dist/paths.ts.cache +2 -2
  43. package/security/helpers/dist/spawn.ts.cache +2 -2
  44. package/security/helpers/paths.d.ts +4 -0
  45. package/security/helpers/spawn.d.ts +16 -0
  46. package/security/keys/deriveKey.d.ts +16 -0
  47. package/security/keys/dist/deriveKey.ts.cache +2 -2
  48. package/security/keys/dist/sshKeyFile.ts.cache +2 -2
  49. package/security/keys/sshKeyFile.d.ts +18 -0
  50. package/security/machines/addMachine.ts +80 -27
  51. package/security/machines/dist/addMachine.ts.cache +6 -5
  52. package/security/machines/dist/machines.ts.cache +110 -101
  53. package/security/machines/machines.d.ts +81 -0
  54. package/security/machines/machines.ts +123 -99
  55. package/security/machines/trustServer.ts +5 -3
  56. package/security/notifications/discord.d.ts +36 -0
  57. package/security/notifications/dist/discord.ts.cache +2 -2
  58. package/security/notifications/dist/remoteWebhook.ts.cache +78 -0
  59. package/security/notifications/dist/setupNotify.ts.cache +39 -0
  60. package/security/signedFiles/dist/manifest.ts.cache +2 -2
  61. package/security/signedFiles/dist/signFiles.ts.cache +8 -10
  62. package/security/signedFiles/manifest.d.ts +44 -0
  63. package/security/signedFiles/signFiles.ts +6 -10
  64. package/storage/remoteStorage/ArchivesRemote.ts +8 -10
  65. package/storage/remoteStorage/accessPage.tsx +13 -90
  66. package/storage/remoteStorage/dist/ArchivesRemote.ts.cache +11 -12
  67. package/storage/remoteStorage/dist/serverConfig.ts.cache +7 -49
  68. package/storage/remoteStorage/dist/storageController.ts.cache +33 -114
  69. package/storage/remoteStorage/serverConfig.d.ts +0 -10
  70. package/storage/remoteStorage/serverConfig.ts +6 -48
  71. package/storage/remoteStorage/storageController.d.ts +4 -36
  72. package/storage/remoteStorage/storageController.ts +40 -126
  73. package/storage/remoteStorage/storageServer.ts +1 -8
  74. package/storage/remoteStorage/storageServerCli.ts +14 -0
  75. package/security/machines/trustState.ts +0 -53
  76. package/storage/remoteStorage/grantAccess.js +0 -4
  77. package/storage/remoteStorage/grantAccessCli.d.ts +0 -1
  78. package/storage/remoteStorage/grantAccessCli.ts +0 -25
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
3
+ //exports.main = void 0;
4
+ const discord_1 = require("./discord");
5
+ const remoteWebhook_1 = require("./remoteWebhook");
6
+ const remoteSSH_1 = require("../helpers/remoteSSH");
7
+ const USAGE = `Usage: yarn setupnotify [host] <discord-webhook-url> [${remoteWebhook_1.REPLACE_KEYWORD}]
8
+
9
+ With no host it sets the webhook up on this machine.`;
10
+ function parseArgs(argv) {
11
+ let replace = argv.includes(remoteWebhook_1.REPLACE_KEYWORD);
12
+ let positional = argv.filter(arg => arg !== remoteWebhook_1.REPLACE_KEYWORD);
13
+ if (!positional.length || positional.length > 2) {
14
+ throw new Error(`Expected a webhook URL, and optionally a host before it, was ${positional.length}`
15
+ + ` argument(s): ${positional.join(" ") || "(none)"}\n${USAGE}`);
16
+ }
17
+ // The webhook url is the last one, so whatever comes before it is the host. Without one this
18
+ // machine is the target.
19
+ let webhookURL = positional[positional.length - 1];
20
+ let host = positional.length > 1 && positional[0] || remoteSSH_1.THIS_MACHINE;
21
+ // Validates the URL shape up front, so we never go anywhere with a bad webhook.
22
+ (0, discord_1.parseWebhookFile)({ contents: webhookURL, sourceName: "the command line" });
23
+ return { host, webhookURL, replace };
24
+ }
25
+ async function main() {
26
+ let { host, webhookURL, replace } = parseArgs(process.argv.slice(2));
27
+ let { outcome, filePath } = await (0, remoteWebhook_1.ensureRemoteWebhook)({ host, webhookURL, replace });
28
+ if (outcome === "unchanged") {
29
+ console.log(`${(0, remoteSSH_1.describeHost)(host)} already has this exact webhook in ${filePath}, nothing to do.`);
30
+ return;
31
+ }
32
+ if (outcome === "replaced") {
33
+ console.log(`Replaced the webhook on ${(0, remoteSSH_1.describeHost)(host)} and notified the old one.`);
34
+ }
35
+ console.log(`Wrote ${filePath} on ${(0, remoteSSH_1.describeHost)(host)} (mode 600), and confirmed on the new webhook.`);
36
+ }
37
+ exports.main = main;
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBOb3RpZnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzZXR1cE5vdGlmeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx1Q0FBNkM7QUFDN0MsbURBQXVFO0FBQ3ZFLG9EQUFrRTtBQUVsRSxNQUFNLEtBQUssR0FBRyx5REFBeUQsK0JBQWU7O3FEQUVqQyxDQUFDO0FBRXRELFNBQVMsU0FBUyxDQUFDLElBQWM7SUFDN0IsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQywrQkFBZSxDQUFDLENBQUM7SUFDN0MsSUFBSSxVQUFVLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSywrQkFBZSxDQUFDLENBQUM7SUFDN0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLElBQUksVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUM5QyxNQUFNLElBQUksS0FBSyxDQUNYLGdFQUFnRSxVQUFVLENBQUMsTUFBTSxFQUFFO2NBQ2pGLGlCQUFpQixVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLFFBQVEsS0FBSyxLQUFLLEVBQUUsQ0FDbEUsQ0FBQztJQUNOLENBQUM7SUFDRCw2RkFBNkY7SUFDN0YseUJBQXlCO0lBQ3pCLElBQUksVUFBVSxHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ25ELElBQUksSUFBSSxHQUFHLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSx3QkFBWSxDQUFDO0lBQ2xFLGdGQUFnRjtJQUNoRixJQUFBLDBCQUFnQixFQUFDLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO0lBQzNFLE9BQU8sRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxDQUFDO0FBQ3pDLENBQUM7QUFFTSxLQUFLLFVBQVUsSUFBSTtJQUN0QixJQUFJLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNyRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sSUFBQSxtQ0FBbUIsRUFBQyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUNyRixJQUFJLE9BQU8sS0FBSyxXQUFXLEVBQUUsQ0FBQztRQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBQSx3QkFBWSxFQUFDLElBQUksQ0FBQyxzQ0FBc0MsUUFBUSxrQkFBa0IsQ0FBQyxDQUFDO1FBQ25HLE9BQU87SUFDWCxDQUFDO0lBQ0QsSUFBSSxPQUFPLEtBQUssVUFBVSxFQUFFLENBQUM7UUFDekIsT0FBTyxDQUFDLEdBQUcsQ0FBQywyQkFBMkIsSUFBQSx3QkFBWSxFQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQzNGLENBQUM7SUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsUUFBUSxPQUFPLElBQUEsd0JBQVksRUFBQyxJQUFJLENBQUMsZ0RBQWdELENBQUMsQ0FBQztBQUM1RyxDQUFDO0FBWEQsb0JBV0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBwYXJzZVdlYmhvb2tGaWxlIH0gZnJvbSBcIi4vZGlzY29yZFwiO1xuaW1wb3J0IHsgZW5zdXJlUmVtb3RlV2ViaG9vaywgUkVQTEFDRV9LRVlXT1JEIH0gZnJvbSBcIi4vcmVtb3RlV2ViaG9va1wiO1xuaW1wb3J0IHsgZGVzY3JpYmVIb3N0LCBUSElTX01BQ0hJTkUgfSBmcm9tIFwiLi4vaGVscGVycy9yZW1vdGVTU0hcIjtcblxuY29uc3QgVVNBR0UgPSBgVXNhZ2U6IHlhcm4gc2V0dXBub3RpZnkgW2hvc3RdIDxkaXNjb3JkLXdlYmhvb2stdXJsPiBbJHtSRVBMQUNFX0tFWVdPUkR9XVxuXG5XaXRoIG5vIGhvc3QgaXQgc2V0cyB0aGUgd2ViaG9vayB1cCBvbiB0aGlzIG1hY2hpbmUuYDtcblxuZnVuY3Rpb24gcGFyc2VBcmdzKGFyZ3Y6IHN0cmluZ1tdKSB7XG4gICAgbGV0IHJlcGxhY2UgPSBhcmd2LmluY2x1ZGVzKFJFUExBQ0VfS0VZV09SRCk7XG4gICAgbGV0IHBvc2l0aW9uYWwgPSBhcmd2LmZpbHRlcihhcmcgPT4gYXJnICE9PSBSRVBMQUNFX0tFWVdPUkQpO1xuICAgIGlmICghcG9zaXRpb25hbC5sZW5ndGggfHwgcG9zaXRpb25hbC5sZW5ndGggPiAyKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcihcbiAgICAgICAgICAgIGBFeHBlY3RlZCBhIHdlYmhvb2sgVVJMLCBhbmQgb3B0aW9uYWxseSBhIGhvc3QgYmVmb3JlIGl0LCB3YXMgJHtwb3NpdGlvbmFsLmxlbmd0aH1gXG4gICAgICAgICAgICArIGAgYXJndW1lbnQocyk6ICR7cG9zaXRpb25hbC5qb2luKFwiIFwiKSB8fCBcIihub25lKVwifVxcbiR7VVNBR0V9YFxuICAgICAgICApO1xuICAgIH1cbiAgICAvLyBUaGUgd2ViaG9vayB1cmwgaXMgdGhlIGxhc3Qgb25lLCBzbyB3aGF0ZXZlciBjb21lcyBiZWZvcmUgaXQgaXMgdGhlIGhvc3QuIFdpdGhvdXQgb25lIHRoaXNcbiAgICAvLyBtYWNoaW5lIGlzIHRoZSB0YXJnZXQuXG4gICAgbGV0IHdlYmhvb2tVUkwgPSBwb3NpdGlvbmFsW3Bvc2l0aW9uYWwubGVuZ3RoIC0gMV07XG4gICAgbGV0IGhvc3QgPSBwb3NpdGlvbmFsLmxlbmd0aCA+IDEgJiYgcG9zaXRpb25hbFswXSB8fCBUSElTX01BQ0hJTkU7XG4gICAgLy8gVmFsaWRhdGVzIHRoZSBVUkwgc2hhcGUgdXAgZnJvbnQsIHNvIHdlIG5ldmVyIGdvIGFueXdoZXJlIHdpdGggYSBiYWQgd2ViaG9vay5cbiAgICBwYXJzZVdlYmhvb2tGaWxlKHsgY29udGVudHM6IHdlYmhvb2tVUkwsIHNvdXJjZU5hbWU6IFwidGhlIGNvbW1hbmQgbGluZVwiIH0pO1xuICAgIHJldHVybiB7IGhvc3QsIHdlYmhvb2tVUkwsIHJlcGxhY2UgfTtcbn1cblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIG1haW4oKSB7XG4gICAgbGV0IHsgaG9zdCwgd2ViaG9va1VSTCwgcmVwbGFjZSB9ID0gcGFyc2VBcmdzKHByb2Nlc3MuYXJndi5zbGljZSgyKSk7XG4gICAgbGV0IHsgb3V0Y29tZSwgZmlsZVBhdGggfSA9IGF3YWl0IGVuc3VyZVJlbW90ZVdlYmhvb2soeyBob3N0LCB3ZWJob29rVVJMLCByZXBsYWNlIH0pO1xuICAgIGlmIChvdXRjb21lID09PSBcInVuY2hhbmdlZFwiKSB7XG4gICAgICAgIGNvbnNvbGUubG9nKGAke2Rlc2NyaWJlSG9zdChob3N0KX0gYWxyZWFkeSBoYXMgdGhpcyBleGFjdCB3ZWJob29rIGluICR7ZmlsZVBhdGh9LCBub3RoaW5nIHRvIGRvLmApO1xuICAgICAgICByZXR1cm47XG4gICAgfVxuICAgIGlmIChvdXRjb21lID09PSBcInJlcGxhY2VkXCIpIHtcbiAgICAgICAgY29uc29sZS5sb2coYFJlcGxhY2VkIHRoZSB3ZWJob29rIG9uICR7ZGVzY3JpYmVIb3N0KGhvc3QpfSBhbmQgbm90aWZpZWQgdGhlIG9sZCBvbmUuYCk7XG4gICAgfVxuICAgIGNvbnNvbGUubG9nKGBXcm90ZSAke2ZpbGVQYXRofSBvbiAke2Rlc2NyaWJlSG9zdChob3N0KX0gKG1vZGUgNjAwKSwgYW5kIGNvbmZpcm1lZCBvbiB0aGUgbmV3IHdlYmhvb2suYCk7XG59XG4iXX0=
39
+ /* _JS_SOURCE_HASH = "75262294c247703aec2fc4b9dcf81c245e79b0b1566401ca4654e019705f6a40"; */
@@ -1,4 +1,4 @@
1
- "use strict";
1
+ "use strict"; var console = (function shimConsole() { let baseConsole = globalThis.console; if (typeof window !== "undefined") return baseConsole; let name = __filename.replaceAll("\\", "/").split("/").pop(); let dirName = __dirname.replaceAll("\\", "/").split("/").pop(); let context = { __FILE__: __filename, __DIR__: __dirname, __NAME__: name, __DIRNAME__: dirName }; let newConsole = { ...baseConsole }; for (let shim of ["log", "info", "warn", "error"]) { newConsole[shim] = (...args) => { args.push(context); baseConsole[shim](...args); }; } newConsole.__context = context; return newConsole; })(); "use strict";
2
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
4
4
  };
@@ -82,4 +82,4 @@ function formatManifest(manifest) {
82
82
  }
83
83
  exports.formatManifest = formatManifest;
84
84
  //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manifest.js","sourceRoot":"","sources":["manifest.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto from \"crypto\";\nimport fs from \"fs/promises\";\nimport path from \"path\";\nimport { spawnPromise } from \"../helpers/spawn\";\n\n// PORTED CODE: security/authorizedKeys/daemon/portsecureDaemon.js contains a plain JS port of the\n// verifying half of this file, so it can check a signature with no dependencies. Both sides must\n// agree on the manifest shape and on which files it covers - if you change one, make the matching\n// change in the other.\n\nexport const MANIFEST_NAME = \"signedfiles.json\";\nexport const SIGNATURE_NAME = \"signedfiles.json.sig\";\n// ssh signatures are namespaced, so a signature made for one purpose cannot be replayed as another.\nexport const SIGN_NAMESPACE = \"signfiles\";\nexport const MANIFEST_VERSION = 1;\n\nexport type Manifest = {\n    version: number;\n    files: { path: string; size: number; sha256: string }[];\n};\n\n/** Everything in the repo that is not ignored: what is in the index, plus what is not staged yet.\n    Git is asked because git is what knows how to apply the ignore rules.\n\n    What comes back is a hint that a file might be there, not that it is. A file deleted from the\n    working tree stays in the index until that deletion is staged, so git names it and there is\n    nothing to read, which is why each one is checked before it goes in.\n\n    The manifest and its signature are left out, since they cannot describe themselves. */\nexport async function listRepoFiles(repoPath: string) {\n    let result = await spawnPromise({\n        command: \"git\",\n        args: [\"ls-files\", \"--cached\", \"--others\", \"--exclude-standard\"],\n        cwd: repoPath,\n    });\n    if (result.status !== 0) {\n        throw new Error(\n            `Expected to list the files in ${repoPath}, git ls-files exited ${result.status}. `\n            + `${(result.stdout + result.stderr).trim()}`\n        );\n    }\n    let listed = result.stdout.split(\"\\n\")\n        .map(line => line.trim())\n        .filter(line => line && line !== MANIFEST_NAME && line !== SIGNATURE_NAME)\n        .sort();\n\n    let present: string[] = [];\n    for (let relativePath of listed) {\n        try {\n            await fs.access(path.join(repoPath, relativePath));\n            present.push(relativePath);\n        } catch (e) {\n            console.log(`Leaving ${relativePath} out of the manifest, it is gone from the working tree`);\n        }\n    }\n    return present;\n}\n\n/** A Windows checkout turns LF into CRLF, so the same commit hashes differently there than it\n    does on the machine that pulls it. Normalising first makes the digest describe the content\n    rather than whichever checkout produced it. latin1 round trips every byte, so this is safe on\n    files that are not text. */\nexport function normalizeContent(contents: Buffer) {\n    return Buffer.from(contents.toString(\"latin1\").replace(/\\r\\n/g, \"\\n\"), \"latin1\");\n}\n\n/** The size and hash of a file's normalised content. The size is the normalised one on purpose,\n    so it agrees with the hash rather than with whatever the local checkout happens to hold. */\nexport async function digestFile(filePath: string) {\n    let contents = normalizeContent(await fs.readFile(filePath));\n    return { size: contents.length, sha256: crypto.createHash(\"sha256\").update(contents).digest(\"hex\") };\n}\n\nexport async function buildManifest(repoPath: string) {\n    let files: Manifest[\"files\"] = [];\n    for (let relativePath of await listRepoFiles(repoPath)) {\n        let digest = await digestFile(path.join(repoPath, relativePath));\n        files.push({ path: relativePath, size: digest.size, sha256: digest.sha256 });\n    }\n    return { version: MANIFEST_VERSION, files };\n}\n\n/** Sorted keys and a trailing newline, so the same tree always produces the same bytes to sign. */\nexport function formatManifest(manifest: Manifest) {\n    return JSON.stringify(manifest, undefined, 4) + \"\\n\";\n}\n"]}
85
- /* _JS_SOURCE_HASH = "e58787cb53d84ba9647f11c90c737f7303e120b8e02ca37cc9f38202fce1929d"; */
85
+ /* _JS_SOURCE_HASH = "201e773734f1a3a4a276457669646f936d46b81026afab845e5b8161d1b4310d"; */
@@ -12,6 +12,7 @@ const paths_1 = require("../helpers/paths");
12
12
  const spawn_1 = require("../helpers/spawn");
13
13
  const manifest_1 = require("./manifest");
14
14
  const unrevoke_1 = require("../authorizedKeys/unrevoke");
15
+ const keysRepo_1 = require("../authorizedKeys/keysRepo");
15
16
  const authorizedKeys_1 = require("../authorizedKeys/authorizedKeys");
16
17
  // A hardware backed key is the entire point. A key sitting on disk is compromised the moment the
17
18
  // machine is, and then the signature proves nothing, so this is what we make when asked to make one.
@@ -150,14 +151,11 @@ async function signRepo(config) {
150
151
  exports.signRepo = signRepo;
151
152
  async function main() {
152
153
  let { keyPath, pushToGit } = parseArgs(process.argv.slice(2));
153
- // Read for its value, so stdout has to be on its own. runPromise joins it with stderr, and a
154
- // git warning glued to the front of this becomes a directory that does not exist.
155
- let topLevel = await (0, spawn_1.spawnPromise)({ command: "git", args: ["rev-parse", "--show-toplevel"] });
156
- let repoPath = topLevel.stdout.trim();
157
- if (topLevel.status !== 0 || !repoPath) {
158
- throw new Error(`Expected the current directory to be inside a git repo, it is not.\n`
159
- + `${(topLevel.stdout + topLevel.stderr).trim()}\n${USAGE}`);
160
- }
154
+ // The keys repo, which is this one when it holds keys and this machine's otherwise. Signing
155
+ // whatever repo the terminal happened to be in is how you end up signing something that is not
156
+ // a keys repo at all.
157
+ let { repoPath } = await (0, keysRepo_1.resolveKeysRepo)();
158
+ console.log(`Signing ${repoPath}`);
161
159
  await signRepo({ repoPath, keyPath });
162
160
  if (!pushToGit) {
163
161
  console.log(`Commit and push ${manifest_1.MANIFEST_NAME} and ${manifest_1.SIGNATURE_NAME} for anything to see them.`);
@@ -177,5 +175,5 @@ async function main() {
177
175
  console.log(`Committed and pushed.`);
178
176
  }
179
177
  exports.main = main;
180
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"signFiles.js","sourceRoot":"","sources":["signFiles.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 { expandHome } from \"../helpers/paths\";\nimport { spawnPromise } from \"../helpers/spawn\";\nimport { buildManifest, formatManifest, MANIFEST_NAME, SIGNATURE_NAME, SIGN_NAMESPACE } from \"./manifest\";\nimport { revokedKeysInRepo } from \"../authorizedKeys/unrevoke\";\nimport { findKeyProblems, normalizeKeys } from \"../authorizedKeys/authorizedKeys\";\n\n// A hardware backed key is the entire point. A key sitting on disk is compromised the moment the\n// machine is, and then the signature proves nothing, so this is what we make when asked to make one.\nconst DEFAULT_KEY_TYPE = \"ed25519-sk\";\nconst DEFAULT_KEY_PATH = \"~/.ssh/signfiles_ed25519_sk\";\nconst GIT_KEYWORD = \"git\";\nconst COMMIT_MESSAGE = \"deploying signed files\";\nconst MAX_ERROR_BODY_LENGTH = 500;\nconst USAGE = `Usage: yarn signfiles [signing-key] [${GIT_KEYWORD}]\n\nSigns the files of the repo in the current directory. With no key, a hardware backed\n${DEFAULT_KEY_TYPE} key at ${DEFAULT_KEY_PATH} is used, and created if it does not exist.\nPass ${GIT_KEYWORD} to also commit and push the result.`;\n\n/** runPromise takes a command line rather than an argument list, so anything holding a path has to\n    survive the shell. Double quotes work on both cmd and posix shells. */\nfunction quote(value: string) {\n    return `\"${value}\"`;\n}\n\nasync function pathExists(filePath: string) {\n    try {\n        await fs.access(filePath);\n        return true;\n    } catch (e) {\n        return false;\n    }\n}\n\n/** Creating this needs the security key plugged in, and a touch. */\nasync function ensureDefaultKey() {\n    let keyPath = expandHome(DEFAULT_KEY_PATH);\n    if (await pathExists(keyPath)) {\n        return keyPath;\n    }\n    console.log(`No signing key at ${keyPath}, creating an ${DEFAULT_KEY_TYPE} one.`);\n    console.log(`Plug your security key in - you will be asked to touch it.`);\n    await fs.mkdir(path.dirname(keyPath), { recursive: true, mode: 0o700 });\n    await runPromise(`ssh-keygen -t ${DEFAULT_KEY_TYPE} -f ${quote(keyPath)} -N \"\" -C signfiles`);\n    return keyPath;\n}\n\n/** The public key in the form the daemon reports it, so what is printed here can be compared\n    against what arrives on Discord. */\nasync function publicKeyOf(keyPath: string) {\n    let contents = await fs.readFile(`${keyPath}.pub`, \"utf8\");\n    let [keyType, keyBody] = contents.trim().split(/\\s+/);\n    if (!keyType || !keyBody) {\n        throw new Error(`Expected a public key in ${keyPath}.pub, was ${contents.slice(0, MAX_ERROR_BODY_LENGTH)}`);\n    }\n    return `${keyType} ${keyBody}`;\n}\n\n/** A keys repo has rules the rest of this cannot enforce afterwards, so they are enforced before it\n    is signed. Signing anything that is not a keys repo is none of this function's business. */\nasync function refuseUnusableKeys(repoPath: string) {\n    let authorizedPath = path.join(repoPath, \"authorized_keys\");\n    if (!await pathExists(authorizedPath)) {\n        return;\n    }\n    let problems = findKeyProblems(normalizeKeys(await fs.readFile(authorizedPath, \"utf8\")));\n    if (!problems.length) {\n        return;\n    }\n    throw new Error(\n        `Expected every key in ${authorizedPath} to be restricted and to belong to one person,`\n        + ` found ${problems.length} problem(s):\\n`\n        + problems.map(problem => `  - ${problem}`).join(\"\\n\")\n        + `\\n\\nEvery key needs a from= naming the addresses it may be used from, and no two keys may`\n        + `\\nname the same ones. Revoking a key that shares its addresses with another leaves that`\n        + `\\nother key working, which defeats the point of revoking it.`\n    );\n}\n\n/** Signing a keys repo that still holds a revoked key would publish it back to every machine that\n    took it out. Only applies to a repo that holds keys and has a revoke repo to check - signing\n    anything else is none of this function's business. */\nasync function refuseRevokedKeys(repoPath: string) {\n    if (!await pathExists(path.join(repoPath, \"authorized_keys\"))) {\n        return;\n    }\n    // Read for its value, so stdout has to be on its own. runPromise joins it with stderr.\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        return;\n    }\n    let revoked;\n    try {\n        revoked = await revokedKeysInRepo({ repoPath, sourceURL: originURL });\n    } catch (e) {\n        // No revoke repo, or no access to it. Nothing has been revoked that we can see.\n        return;\n    }\n    if (!revoked.length) {\n        return;\n    }\n    throw new Error(\n        `Expected ${repoPath} to hold no revoked keys, it holds ${revoked.length}:\\n`\n        + revoked.map(entry => `  ${entry.revocation.fingerprint} revoked by ${entry.revocation.revokedBy || \"?\"}`\n            + ` after use from ${entry.revocation.attempt?.ip || \"?\"}`).join(\"\\n\")\n        + `\\nDelete them from authorized_keys, or run \"yarn unrevoke\" here to allow them again.`\n    );\n}\n\nfunction parseArgs(argv: string[]) {\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 signing key, was ${positional.length} argument(s): ${positional.join(\" \")}\\n${USAGE}`);\n    }\n    return { keyPath: positional[0], pushToGit };\n}\n\n/** Writes the manifest and its signature into a repo. Separate from the command so anything that\n    changes a keys repo can leave it signed, rather than telling someone to go and do it. */\nexport async function signRepo(config: { repoPath: string; keyPath?: string }) {\n    let { repoPath } = config;\n    let signingKey = config.keyPath && expandHome(config.keyPath) || await ensureDefaultKey();\n    if (!await pathExists(signingKey)) {\n        throw new Error(`Expected a signing key at ${signingKey}, no such file exists`);\n    }\n\n    await refuseUnusableKeys(repoPath);\n    await refuseRevokedKeys(repoPath);\n\n    let manifest = await buildManifest(repoPath);\n    console.log(`${MANIFEST_NAME} covers ${manifest.files.length} file(s) in ${repoPath}`);\n\n    // The manifest is built and signed away from the repo, and only moved in once both exist.\n    // Landing a new manifest next to an old signature produces a pair that can never verify, and\n    // the daemon reading it can only treat that as tampering.\n    let stagingDirectory = await fs.mkdtemp(path.join(os.tmpdir(), \"signfiles-\"));\n    let stagedManifest = path.join(stagingDirectory, MANIFEST_NAME);\n    let stagedSignature = `${stagedManifest}.sig`;\n    await fs.writeFile(stagedManifest, formatManifest(manifest));\n\n    // Signing happens before any git work, so a failed push never costs a second touch of the key.\n    await runPromise(`ssh-keygen -Y sign -f ${quote(signingKey)} -n ${SIGN_NAMESPACE} ${quote(stagedManifest)}`);\n    // Checked here rather than left for a machine that has already pulled it to discover.\n    await runPromise(\n        `ssh-keygen -Y check-novalidate -n ${SIGN_NAMESPACE} -s ${quote(stagedSignature)} < ${quote(stagedManifest)}`\n    );\n    await fs.copyFile(stagedManifest, path.join(repoPath, MANIFEST_NAME));\n    await fs.copyFile(stagedSignature, path.join(repoPath, SIGNATURE_NAME));\n    await fs.rm(stagingDirectory, { recursive: true, force: true });\n    console.log(`Signed with ${await publicKeyOf(signingKey)}`);\n}\n\nexport async function main() {\n    let { keyPath, pushToGit } = parseArgs(process.argv.slice(2));\n\n    // Read for its value, so stdout has to be on its own. runPromise joins it with stderr, and a\n    // git warning glued to the front of this becomes a directory that does not exist.\n    let topLevel = await spawnPromise({ command: \"git\", args: [\"rev-parse\", \"--show-toplevel\"] });\n    let repoPath = topLevel.stdout.trim();\n    if (topLevel.status !== 0 || !repoPath) {\n        throw new Error(\n            `Expected the current directory to be inside a git repo, it is not.\\n`\n            + `${(topLevel.stdout + topLevel.stderr).trim()}\\n${USAGE}`\n        );\n    }\n    await signRepo({ repoPath, keyPath });\n\n    if (!pushToGit) {\n        console.log(`Commit and push ${MANIFEST_NAME} and ${SIGNATURE_NAME} for anything to see them.`);\n        return;\n    }\n    await runPromise(`git add -A`, { cwd: repoPath });\n    // Nothing staged is not worth stopping on. git commit calls that a failure, but it only means\n    // the signature matches the one already committed, so there is nothing to deploy.\n    let status = await spawnPromise({ command: \"git\", args: [\"status\", \"--porcelain\"], cwd: repoPath });\n    let staged = status.stdout;\n    if (!staged.trim()) {\n        console.log(`Nothing changed, ${MANIFEST_NAME} and ${SIGNATURE_NAME} are already committed.`);\n        return;\n    }\n    await runPromise(`git commit -m ${quote(COMMIT_MESSAGE)}`, { cwd: repoPath });\n    await runPromise(`git push`, { cwd: repoPath });\n    console.log(`Committed and pushed.`);\n}\n"]}
181
- /* _JS_SOURCE_HASH = "5656bac7a766bdb1101df9294951fc82d227c63f880590d3dd4eb51bd67c88d1"; */
178
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"signFiles.js","sourceRoot":"","sources":["signFiles.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 { expandHome } from \"../helpers/paths\";\nimport { spawnPromise } from \"../helpers/spawn\";\nimport { buildManifest, formatManifest, MANIFEST_NAME, SIGNATURE_NAME, SIGN_NAMESPACE } from \"./manifest\";\nimport { revokedKeysInRepo } from \"../authorizedKeys/unrevoke\";\nimport { resolveKeysRepo } from \"../authorizedKeys/keysRepo\";\nimport { findKeyProblems, normalizeKeys } from \"../authorizedKeys/authorizedKeys\";\n\n// A hardware backed key is the entire point. A key sitting on disk is compromised the moment the\n// machine is, and then the signature proves nothing, so this is what we make when asked to make one.\nconst DEFAULT_KEY_TYPE = \"ed25519-sk\";\nconst DEFAULT_KEY_PATH = \"~/.ssh/signfiles_ed25519_sk\";\nconst GIT_KEYWORD = \"git\";\nconst COMMIT_MESSAGE = \"deploying signed files\";\nconst MAX_ERROR_BODY_LENGTH = 500;\nconst USAGE = `Usage: yarn signfiles [signing-key] [${GIT_KEYWORD}]\n\nSigns the files of the repo in the current directory. With no key, a hardware backed\n${DEFAULT_KEY_TYPE} key at ${DEFAULT_KEY_PATH} is used, and created if it does not exist.\nPass ${GIT_KEYWORD} to also commit and push the result.`;\n\n/** runPromise takes a command line rather than an argument list, so anything holding a path has to\n    survive the shell. Double quotes work on both cmd and posix shells. */\nfunction quote(value: string) {\n    return `\"${value}\"`;\n}\n\nasync function pathExists(filePath: string) {\n    try {\n        await fs.access(filePath);\n        return true;\n    } catch (e) {\n        return false;\n    }\n}\n\n/** Creating this needs the security key plugged in, and a touch. */\nasync function ensureDefaultKey() {\n    let keyPath = expandHome(DEFAULT_KEY_PATH);\n    if (await pathExists(keyPath)) {\n        return keyPath;\n    }\n    console.log(`No signing key at ${keyPath}, creating an ${DEFAULT_KEY_TYPE} one.`);\n    console.log(`Plug your security key in - you will be asked to touch it.`);\n    await fs.mkdir(path.dirname(keyPath), { recursive: true, mode: 0o700 });\n    await runPromise(`ssh-keygen -t ${DEFAULT_KEY_TYPE} -f ${quote(keyPath)} -N \"\" -C signfiles`);\n    return keyPath;\n}\n\n/** The public key in the form the daemon reports it, so what is printed here can be compared\n    against what arrives on Discord. */\nasync function publicKeyOf(keyPath: string) {\n    let contents = await fs.readFile(`${keyPath}.pub`, \"utf8\");\n    let [keyType, keyBody] = contents.trim().split(/\\s+/);\n    if (!keyType || !keyBody) {\n        throw new Error(`Expected a public key in ${keyPath}.pub, was ${contents.slice(0, MAX_ERROR_BODY_LENGTH)}`);\n    }\n    return `${keyType} ${keyBody}`;\n}\n\n/** A keys repo has rules the rest of this cannot enforce afterwards, so they are enforced before it\n    is signed. Signing anything that is not a keys repo is none of this function's business. */\nasync function refuseUnusableKeys(repoPath: string) {\n    let authorizedPath = path.join(repoPath, \"authorized_keys\");\n    if (!await pathExists(authorizedPath)) {\n        return;\n    }\n    let problems = findKeyProblems(normalizeKeys(await fs.readFile(authorizedPath, \"utf8\")));\n    if (!problems.length) {\n        return;\n    }\n    throw new Error(\n        `Expected every key in ${authorizedPath} to be restricted and to belong to one person,`\n        + ` found ${problems.length} problem(s):\\n`\n        + problems.map(problem => `  - ${problem}`).join(\"\\n\")\n        + `\\n\\nEvery key needs a from= naming the addresses it may be used from, and no two keys may`\n        + `\\nname the same ones. Revoking a key that shares its addresses with another leaves that`\n        + `\\nother key working, which defeats the point of revoking it.`\n    );\n}\n\n/** Signing a keys repo that still holds a revoked key would publish it back to every machine that\n    took it out. Only applies to a repo that holds keys and has a revoke repo to check - signing\n    anything else is none of this function's business. */\nasync function refuseRevokedKeys(repoPath: string) {\n    if (!await pathExists(path.join(repoPath, \"authorized_keys\"))) {\n        return;\n    }\n    // Read for its value, so stdout has to be on its own. runPromise joins it with stderr.\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        return;\n    }\n    let revoked;\n    try {\n        revoked = await revokedKeysInRepo({ repoPath, sourceURL: originURL });\n    } catch (e) {\n        // No revoke repo, or no access to it. Nothing has been revoked that we can see.\n        return;\n    }\n    if (!revoked.length) {\n        return;\n    }\n    throw new Error(\n        `Expected ${repoPath} to hold no revoked keys, it holds ${revoked.length}:\\n`\n        + revoked.map(entry => `  ${entry.revocation.fingerprint} revoked by ${entry.revocation.revokedBy || \"?\"}`\n            + ` after use from ${entry.revocation.attempt?.ip || \"?\"}`).join(\"\\n\")\n        + `\\nDelete them from authorized_keys, or run \"yarn unrevoke\" here to allow them again.`\n    );\n}\n\nfunction parseArgs(argv: string[]) {\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 signing key, was ${positional.length} argument(s): ${positional.join(\" \")}\\n${USAGE}`);\n    }\n    return { keyPath: positional[0], pushToGit };\n}\n\n/** Writes the manifest and its signature into a repo. Separate from the command so anything that\n    changes a keys repo can leave it signed, rather than telling someone to go and do it. */\nexport async function signRepo(config: { repoPath: string; keyPath?: string }) {\n    let { repoPath } = config;\n    let signingKey = config.keyPath && expandHome(config.keyPath) || await ensureDefaultKey();\n    if (!await pathExists(signingKey)) {\n        throw new Error(`Expected a signing key at ${signingKey}, no such file exists`);\n    }\n\n    await refuseUnusableKeys(repoPath);\n    await refuseRevokedKeys(repoPath);\n\n    let manifest = await buildManifest(repoPath);\n    console.log(`${MANIFEST_NAME} covers ${manifest.files.length} file(s) in ${repoPath}`);\n\n    // The manifest is built and signed away from the repo, and only moved in once both exist.\n    // Landing a new manifest next to an old signature produces a pair that can never verify, and\n    // the daemon reading it can only treat that as tampering.\n    let stagingDirectory = await fs.mkdtemp(path.join(os.tmpdir(), \"signfiles-\"));\n    let stagedManifest = path.join(stagingDirectory, MANIFEST_NAME);\n    let stagedSignature = `${stagedManifest}.sig`;\n    await fs.writeFile(stagedManifest, formatManifest(manifest));\n\n    // Signing happens before any git work, so a failed push never costs a second touch of the key.\n    await runPromise(`ssh-keygen -Y sign -f ${quote(signingKey)} -n ${SIGN_NAMESPACE} ${quote(stagedManifest)}`);\n    // Checked here rather than left for a machine that has already pulled it to discover.\n    await runPromise(\n        `ssh-keygen -Y check-novalidate -n ${SIGN_NAMESPACE} -s ${quote(stagedSignature)} < ${quote(stagedManifest)}`\n    );\n    await fs.copyFile(stagedManifest, path.join(repoPath, MANIFEST_NAME));\n    await fs.copyFile(stagedSignature, path.join(repoPath, SIGNATURE_NAME));\n    await fs.rm(stagingDirectory, { recursive: true, force: true });\n    console.log(`Signed with ${await publicKeyOf(signingKey)}`);\n}\n\nexport async function main() {\n    let { keyPath, pushToGit } = parseArgs(process.argv.slice(2));\n\n    // The keys repo, which is this one when it holds keys and this machine's otherwise. Signing\n    // whatever repo the terminal happened to be in is how you end up signing something that is not\n    // a keys repo at all.\n    let { repoPath } = await resolveKeysRepo();\n    console.log(`Signing ${repoPath}`);\n    await signRepo({ repoPath, keyPath });\n\n    if (!pushToGit) {\n        console.log(`Commit and push ${MANIFEST_NAME} and ${SIGNATURE_NAME} for anything to see them.`);\n        return;\n    }\n    await runPromise(`git add -A`, { cwd: repoPath });\n    // Nothing staged is not worth stopping on. git commit calls that a failure, but it only means\n    // the signature matches the one already committed, so there is nothing to deploy.\n    let status = await spawnPromise({ command: \"git\", args: [\"status\", \"--porcelain\"], cwd: repoPath });\n    let staged = status.stdout;\n    if (!staged.trim()) {\n        console.log(`Nothing changed, ${MANIFEST_NAME} and ${SIGNATURE_NAME} are already committed.`);\n        return;\n    }\n    await runPromise(`git commit -m ${quote(COMMIT_MESSAGE)}`, { cwd: repoPath });\n    await runPromise(`git push`, { cwd: repoPath });\n    console.log(`Committed and pushed.`);\n}\n"]}
179
+ /* _JS_SOURCE_HASH = "e62739f311ed1c2d2b818032186647cfb19cc96beec3178194cb15bda564b243"; */
@@ -0,0 +1,44 @@
1
+ /// <reference types="node" />
2
+ /// <reference types="node" />
3
+ export declare const MANIFEST_NAME = "signedfiles.json";
4
+ export declare const SIGNATURE_NAME = "signedfiles.json.sig";
5
+ export declare const SIGN_NAMESPACE = "signfiles";
6
+ export declare const MANIFEST_VERSION = 1;
7
+ export type Manifest = {
8
+ version: number;
9
+ files: {
10
+ path: string;
11
+ size: number;
12
+ sha256: string;
13
+ }[];
14
+ };
15
+ /** Everything in the repo that is not ignored: what is in the index, plus what is not staged yet.
16
+ Git is asked because git is what knows how to apply the ignore rules.
17
+
18
+ What comes back is a hint that a file might be there, not that it is. A file deleted from the
19
+ working tree stays in the index until that deletion is staged, so git names it and there is
20
+ nothing to read, which is why each one is checked before it goes in.
21
+
22
+ The manifest and its signature are left out, since they cannot describe themselves. */
23
+ export declare function listRepoFiles(repoPath: string): Promise<string[]>;
24
+ /** A Windows checkout turns LF into CRLF, so the same commit hashes differently there than it
25
+ does on the machine that pulls it. Normalising first makes the digest describe the content
26
+ rather than whichever checkout produced it. latin1 round trips every byte, so this is safe on
27
+ files that are not text. */
28
+ export declare function normalizeContent(contents: Buffer): Buffer;
29
+ /** The size and hash of a file's normalised content. The size is the normalised one on purpose,
30
+ so it agrees with the hash rather than with whatever the local checkout happens to hold. */
31
+ export declare function digestFile(filePath: string): Promise<{
32
+ size: number;
33
+ sha256: string;
34
+ }>;
35
+ export declare function buildManifest(repoPath: string): Promise<{
36
+ version: number;
37
+ files: {
38
+ path: string;
39
+ size: number;
40
+ sha256: string;
41
+ }[];
42
+ }>;
43
+ /** Sorted keys and a trailing newline, so the same tree always produces the same bytes to sign. */
44
+ export declare function formatManifest(manifest: Manifest): string;
@@ -6,6 +6,7 @@ import { expandHome } from "../helpers/paths";
6
6
  import { spawnPromise } from "../helpers/spawn";
7
7
  import { buildManifest, formatManifest, MANIFEST_NAME, SIGNATURE_NAME, SIGN_NAMESPACE } from "./manifest";
8
8
  import { revokedKeysInRepo } from "../authorizedKeys/unrevoke";
9
+ import { resolveKeysRepo } from "../authorizedKeys/keysRepo";
9
10
  import { findKeyProblems, normalizeKeys } from "../authorizedKeys/authorizedKeys";
10
11
 
11
12
  // A hardware backed key is the entire point. A key sitting on disk is compromised the moment the
@@ -159,16 +160,11 @@ export async function signRepo(config: { repoPath: string; keyPath?: string }) {
159
160
  export async function main() {
160
161
  let { keyPath, pushToGit } = parseArgs(process.argv.slice(2));
161
162
 
162
- // Read for its value, so stdout has to be on its own. runPromise joins it with stderr, and a
163
- // git warning glued to the front of this becomes a directory that does not exist.
164
- let topLevel = await spawnPromise({ command: "git", args: ["rev-parse", "--show-toplevel"] });
165
- let repoPath = topLevel.stdout.trim();
166
- if (topLevel.status !== 0 || !repoPath) {
167
- throw new Error(
168
- `Expected the current directory to be inside a git repo, it is not.\n`
169
- + `${(topLevel.stdout + topLevel.stderr).trim()}\n${USAGE}`
170
- );
171
- }
163
+ // The keys repo, which is this one when it holds keys and this machine's otherwise. Signing
164
+ // whatever repo the terminal happened to be in is how you end up signing something that is not
165
+ // a keys repo at all.
166
+ let { repoPath } = await resolveKeysRepo();
167
+ console.log(`Signing ${repoPath}`);
172
168
  await signRepo({ repoPath, keyPath });
173
169
 
174
170
  if (!pushToGit) {
@@ -99,15 +99,14 @@ export class ArchivesRemote implements IArchives {
99
99
  }
100
100
  }
101
101
 
102
- // Returns undefined if this machine has access to the account. Otherwise puts in an access request and returns our machineId + ip (so the caller can display them alongside the link, for the approver to match the incoming request) and the link to the grant page.
102
+ // Returns undefined if this machine has access to the account. Otherwise returns our machineId + ip as the server sees them, and the link to the access page - which shows the single command that grants access.
103
103
  public async waitingForAccess(): Promise<{ link: string; machineId: string; ip: string } | undefined> {
104
104
  let state = await this.callAuthed(() => this.controller.getAccessState({ account: this.account }));
105
105
  if (state.hasAccess) return undefined;
106
- let requested = await this.callAuthed(() => this.controller.requestAccess({ account: this.account }));
107
106
  return {
108
107
  link: `https://${this.parsed.address}:${this.parsed.port}/${this.account}`,
109
- machineId: requested.machineId,
110
- ip: requested.ip,
108
+ machineId: state.machineId,
109
+ ip: state.ip,
111
110
  };
112
111
  }
113
112
 
@@ -116,13 +115,12 @@ export class ArchivesRemote implements IArchives {
116
115
  return !!state.hasAccess;
117
116
  }
118
117
 
119
- // Registers our access request server-side (so an admin has a requestId to grant) and logs the grant instructions, at most once a minute
118
+ // Logs how to get access, at most once a minute. There is nothing to register any more: the server decides from the signed repo, so what it hands back is the command that puts us in it.
120
119
  private async registerAccessRequest(): Promise<void> {
121
- let requested = await this.callAuthed(() => this.controller.requestAccess({ account: this.account }));
122
- if (Date.now() - this.lastDeniedLog > timeInMinute) {
123
- this.lastDeniedLog = Date.now();
124
- console.log(`No access to storage account ${JSON.stringify(this.account)} on ${this.parsed.address}:${this.parsed.port} (our machine ${requested.machineId}, ip ${requested.ip}). See https://${this.parsed.address}:${this.parsed.port}/${this.account} - or grant it with: ${requested.grantAccessCommand}`);
125
- }
120
+ if (Date.now() - this.lastDeniedLog < timeInMinute) return;
121
+ let state = await this.callAuthed(() => this.controller.getAccessState({ account: this.account }));
122
+ this.lastDeniedLog = Date.now();
123
+ console.log(`No access to storage account ${JSON.stringify(this.account)} on ${this.parsed.address}:${this.parsed.port} (our machine ${state.machineId}, ip ${state.ip}). ${state.reason || ""} Grant it with: ${state.addMachineCommand || ""}`);
126
124
  }
127
125
 
128
126
  // Runs a call, authenticating (and re-authenticating after reconnects) and waiting for account access as needed. With waitForAccess false, denied calls throw immediately instead - but the access request is still registered (in the background), so the denial is grantable.
@@ -6,10 +6,10 @@ import { observer } from "../../render-utils/observer";
6
6
  import { isNode } from "socket-function/src/misc";
7
7
  import { css } from "typesafecss";
8
8
  import { SocketFunction } from "socket-function/SocketFunction";
9
- import { RemoteStorageController, AccessState, AccessRequest } from "./storageController";
9
+ import { RemoteStorageController, AccessState } from "./storageController";
10
10
  import { authenticateStorage } from "./ArchivesRemote";
11
11
 
12
- // The storage server's access page. Visit https://<storageDomain>:<port>/<accountName> to request access to that account for this browser's machine identity. Once granted, lists the machines that have access. To approve someone else's request, the user must type in the requester's IP pending requests are NEVER shown unsolicited (so a trusted user can't accidentally approve a random machine's request).
12
+ // The storage server's access page. Visit https://<storageDomain>:<port>/<accountName> to see whether this browser's machine identity has access, and if not, the one command that grants it. Nothing is requested or approved here: trust lives in the signed authorized_keys repo, so access is granted by someone running addmachine there with the hardware key, and this page only reports what that repo says.
13
13
 
14
14
  const REFRESH_INTERVAL = 1000 * 15;
15
15
  const COPIED_RESET_DELAY = 2000;
@@ -45,11 +45,6 @@ class AccessPage extends preact.Component {
45
45
  account: "",
46
46
  state: undefined as AccessState | undefined,
47
47
  error: "",
48
- lookupIp: "",
49
- lookupResults: undefined as { ip: string; requests: AccessRequest[] } | undefined,
50
- lookupError: "",
51
- looking: false,
52
- granting: "",
53
48
  });
54
49
 
55
50
  componentDidMount() {
@@ -82,123 +77,51 @@ class AccessPage extends preact.Component {
82
77
  }
83
78
  private async refresh(account: string) {
84
79
  let controller = await this.controller();
85
- await controller.requestAccess({ account });
86
80
  this.synced.state = await controller.getAccessState({ account });
87
81
  this.synced.error = "";
88
82
  }
89
83
 
90
- private lookupIP = async () => {
91
- let ip = this.synced.lookupIp.trim();
92
- if (!ip) return;
93
- this.synced.looking = true;
94
- this.synced.lookupError = "";
95
- try {
96
- let controller = await this.controller();
97
- let requests = await controller.listRequestsForIP({ account: this.synced.account, ip });
98
- this.synced.lookupResults = { ip, requests };
99
- } catch (e) {
100
- this.synced.lookupError = String(e);
101
- } finally {
102
- this.synced.looking = false;
103
- }
104
- };
105
-
106
- private approve = async (request: AccessRequest) => {
107
- this.synced.granting = request.requestId;
108
- try {
109
- let controller = await this.controller();
110
- await controller.grantAccess({ requestId: request.requestId });
111
- if (this.synced.lookupResults) {
112
- this.synced.lookupResults.requests = this.synced.lookupResults.requests.filter(r => r.requestId !== request.requestId);
113
- }
114
- await this.refresh(this.synced.account);
115
- } catch (e) {
116
- this.synced.lookupError = String(e);
117
- } finally {
118
- this.synced.granting = "";
119
- }
120
- };
121
-
122
84
  render() {
123
85
  let synced = this.synced;
124
86
  let { account, state, error } = synced;
125
87
  if (!account) {
126
88
  return <div className={css.vbox(8).pad2(16)}>
127
89
  <div>Remote storage server.</div>
128
- <div>Visit /(account name) to request access to an account for this browser.</div>
90
+ <div>Visit /(account name) to see whether this browser's machine has access to an account.</div>
129
91
  </div>;
130
92
  }
131
93
  return <div className={css.vbox(12).pad2(16)}>
132
94
  <div>Storage account: {account}</div>
133
95
  {error && <div>Error: {error}</div>}
134
- {!state && !error && <div>Requesting access...</div>}
96
+ {!state && !error && <div>Checking access...</div>}
135
97
  {state && !state.hasAccess && <div className={css.vbox(8)}>
136
- <div>This machine ({state.machineId}, ip {state.ip}) does NOT have access yet.</div>
137
- <div>An access request has been made. To grant it, run this command:</div>
138
- {state.grantAccessCommand && <CopyableCommand command={state.grantAccessCommand} />}
98
+ <div>This machine ({state.machineId}, ip {state.ip}) does NOT have access.</div>
99
+ {state.reason && <div>{state.reason}</div>}
100
+ <div>Run this in the authorized_keys repo, on a machine with the signing key:</div>
101
+ {state.addMachineCommand && <CopyableCommand command={state.addMachineCommand} />}
139
102
  <div>This page rechecks every {REFRESH_INTERVAL / 1000} seconds.</div>
140
103
  </div>}
141
104
  {state && state.hasAccess && <div className={css.vbox(16)}>
142
105
  <div>This machine ({state.machineId}, ip {state.ip}) has access.</div>
143
106
  <div className={css.vbox(6)}>
144
- <div>Machines with access:</div>
107
+ <div>Trusted machines:</div>
145
108
  <table>
146
109
  <thead>
147
110
  <tr>
148
111
  <th className={css.pad2(8, 2).textAlign("left")}>Machine</th>
149
- <th className={css.pad2(8, 2).textAlign("left")}>IP</th>
150
- <th className={css.pad2(8, 2).textAlign("left")}>Granted</th>
112
+ <th className={css.pad2(8, 2).textAlign("left")}>Allowed from</th>
113
+ <th className={css.pad2(8, 2).textAlign("left")}>Added</th>
151
114
  </tr>
152
115
  </thead>
153
116
  <tbody>
154
117
  {(state.trustedMachines || []).map(m => <tr key={m.machineId}>
155
118
  <td className={css.pad2(8, 2)}>{m.machineId}</td>
156
- <td className={css.pad2(8, 2)}>{m.ip}</td>
157
- <td className={css.pad2(8, 2)}>{new Date(m.time).toLocaleString()}</td>
119
+ <td className={css.pad2(8, 2)}>{m.ips.join(", ")}</td>
120
+ <td className={css.pad2(8, 2)}>{m.addedAt}</td>
158
121
  </tr>)}
159
122
  </tbody>
160
123
  </table>
161
124
  </div>
162
- <div className={css.vbox(6)}>
163
- <div>Approve request</div>
164
- <div className={css.hbox(8).alignItems("center")}>
165
- <input
166
- placeholder="ip"
167
- value={synced.lookupIp}
168
- onInput={e => { synced.lookupIp = (e.currentTarget as HTMLInputElement).value; }}
169
- onKeyDown={e => { if (e.key === "Enter") void this.lookupIP(); }}
170
- />
171
- <button disabled={synced.looking || !synced.lookupIp.trim()} onClick={this.lookupIP}>
172
- search
173
- </button>
174
- </div>
175
- {synced.lookupError && <div>Error: {synced.lookupError}</div>}
176
- {synced.lookupResults && synced.lookupResults.requests.length === 0 && <div>
177
- No pending requests for {synced.lookupResults.ip} on this account.
178
- </div>}
179
- {synced.lookupResults && synced.lookupResults.requests.length > 0 && <table>
180
- <thead>
181
- <tr>
182
- <th className={css.pad2(8, 2).textAlign("left")}>Machine</th>
183
- <th className={css.pad2(8, 2).textAlign("left")}>IP</th>
184
- <th className={css.pad2(8, 2).textAlign("left")}>Requested</th>
185
- <th className={css.pad2(8, 2).textAlign("left")}></th>
186
- </tr>
187
- </thead>
188
- <tbody>
189
- {synced.lookupResults.requests.map(r => <tr key={r.requestId}>
190
- <td className={css.pad2(8, 2)}>{r.machineId}</td>
191
- <td className={css.pad2(8, 2)}>{r.ip}</td>
192
- <td className={css.pad2(8, 2)}>{new Date(r.time).toLocaleString()}</td>
193
- <td className={css.pad2(8, 2)}>
194
- <button disabled={!!synced.granting} onClick={async () => this.approve(r)}>
195
- {synced.granting === r.requestId && "Approving..." || "Approve"}
196
- </button>
197
- </td>
198
- </tr>)}
199
- </tbody>
200
- </table>}
201
- </div>
202
125
  </div>}
203
126
  </div>;
204
127
  }