sliftutils 1.7.130 → 1.7.131

package/security/machines/machines.d.ts

@@ -0,0 +1,81 @@
+export declare const MACHINES_DIR = "machines";
+/** One machine we are willing to talk to, and the addresses it may talk to us from. */
+export type MachineState = {
+    machineId: string;
+    ips: string[];
+    addedAt: string;
+};
+/** This machine's keys repo, worked out once and then remembered.
+
+    A failure is remembered too, but only briefly: a server may well start before the machine has
+    been set up, and should start working when it is, rather than needing a restart. */
+export declare const keysRepo: {
+    (): Promise<{
+        repoPath: string;
+        sourceURL: string;
+    }>;
+    reset(): void;
+    set(newValue: Promise<{
+        repoPath: string;
+        sourceURL: string;
+    }>): void;
+};
+/** Every machine a checkout lists. Without a repo, this machine's own. */
+export declare function getMachines(repoPath?: string): Promise<MachineState[]>;
+/** The machines this system trusts, as the signed repo lists them.
+
+    Held rather than read per call, and refreshed in the background, so nobody asking whether a
+    machine is trusted waits for a directory of files to be read and a signature to be checked. A
+    refresh that fails leaves the list we already have: the checkout is only stale, not wrong. */
+export declare function getTrustedMachines(): Promise<MachineState[]>;
+/** Makes a checkout list exactly these machines: those named are written with the addresses given,
+    and anything not named is removed. So read them, change what you want, and write the result.
+
+    The addresses are part of setting rather than a separate step, because a machine with no
+    address it may talk from is not a machine that would ever be accepted - there is no state where
+    naming one without them means anything.
+
+    Nothing here signs or commits. The signature is what every other machine checks before
+    believing any of this, and it takes the hardware key, so `yarn signfiles git` is still yours to
+    run afterwards. */
+export declare function setMachines(config: {
+    repoPath?: string;
+    machines: {
+        machineId: string;
+        ips: string[];
+    }[];
+}): Promise<MachineState[]>;
+/** What to run to trust a machine that has just been refused.
+
+    Everything in it is already known to whoever is being refused: their machine id, the address we
+    saw them at, and the domain they just talked to. Handing it back saves them working out the
+    parts of a command they have every right to know. Running it still takes the hardware key on
+    the machine that owns the repo, so telling them costs nothing. */
+export declare function addMachineCommand(config: {
+    machineId: string;
+    ip: string;
+    domain?: string;
+}): string;
+/** Whether we will talk to this machine, coming from this address.
+
+    Both halves are required and neither is a guess: the caller knows the machine id because the
+    connection proved it, and knows the address because the packets came from there. A machine we
+    do not list is simply not accepted. A machine we do list, arriving from an address it does not
+    have, is treated as the same kind of event as a stolen ssh key - it is revoked everywhere, and
+    stays revoked until an unrevoke allows that machine from that address.
+
+    Says why when the answer is no, because the three ways to be refused are entirely different
+    things to a person reading it: never trusted at all, trusted but frozen, or trusted and talking
+    from somewhere it should not be.
+
+    Throws when the repo itself cannot be read or is not signed, rather than answering false: that
+    is a broken installation, not a rejected machine, and the two deserve different handling. */
+export type MachineVerdict = {
+    accepted: boolean;
+    reason: string;
+};
+export declare function isMachineAccepted(config: {
+    machineId: string;
+    ip: string;
+    domain?: string;
+}): Promise<MachineVerdict>;

package/security/machines/machines.ts

@@ -11,6 +11,8 @@ import { verifyCheckout } from "../authorizedKeys/daemon/trust";
 import { revokeRepoPath, revokeRepoURL } from "../authorizedKeys/revokeSource";
 import { notify } from "../authorizedKeys/daemon/notify";
 import { areDiscordNotificationsConfigured, configureDiscordNotifications, DEFAULT_WEBHOOK_FILE_PATH } from "../notifications/discord";
+import { lazy } from "socket-function/src/caching";
+import { runInfinitePoll } from "socket-function/src/batching";
 import { spawnPromise } from "../helpers/spawn";
 
 // Which machines this system talks to, kept in the same repo as the ssh keys. That repo is already
@@ -22,6 +24,14 @@ const REVOCATION_REASON = "a machine talked to us from an unapproved IP";
 // The revoke repo is pulled at most this often. A check happens per request, and a request must
 // not cost a round trip to github.
 const REVOKE_SYNC_INTERVAL = 60 * 1000;
+// And the machine list is re-read from the checkout on this interval, in the background. The
+// checkout itself only moves when the daemon pulls it, which is on the same sort of interval, so
+// reading more often than this would only re-read the same bytes.
+const MACHINES_REFRESH_INTERVAL = 60 * 1000;
+// How long a failure to find the keys repo is remembered. A long lived process may start before
+// the machine is set up, and should pick it up once it is, without being restarted - but it must
+// not pay for resolving the repo on every request either.
+const REPO_RETRY_DELAY = 15 * 1000;
 
 /** One machine we are willing to talk to, and the addresses it may talk to us from. */
 export type MachineState = {
@@ -43,9 +53,57 @@ function machineFilePath(repoPath: string, machineId: string) {
     return path.join(repoPath, MACHINES_DIR, `${machineId}.json`);
 }
 
-/** Every machine a checkout lists. */
-export async function getMachines(repoPath: string): Promise<MachineState[]> {
-    return [...(await readMachines(repoPath)).values()];
+/** This machine's keys repo, worked out once and then remembered.
+
+    A failure is remembered too, but only briefly: a server may well start before the machine has
+    been set up, and should start working when it is, rather than needing a restart. */
+export const keysRepo = lazy(async () => {
+    let lookup = resolveKeysRepo();
+    lookup.catch(() => {
+        setTimeout(() => keysRepo.reset(), REPO_RETRY_DELAY).unref();
+    });
+    return await lookup;
+});
+
+/** Every machine a checkout lists. Without a repo, this machine's own. */
+export async function getMachines(repoPath?: string): Promise<MachineState[]> {
+    return [...(await readMachines(repoPath || (await keysRepo()).repoPath)).values()];
+}
+
+/** Reads the machine list, once its signature has been checked. An unsigned machine list, or one
+    signed over different contents, is not evidence of anything, so this throws rather than
+    quietly trusting nobody. */
+async function readTrustedMachines() {
+    let { repoPath } = await keysRepo();
+    await verifyCheckout(repoPath);
+    return await getMachines(repoPath);
+}
+
+const trustedMachines = lazy(async () => {
+    let read = readTrustedMachines();
+    read.catch(() => trustedMachines.reset());
+    return await read;
+});
+
+let refreshing = false;
+
+/** The machines this system trusts, as the signed repo lists them.
+
+    Held rather than read per call, and refreshed in the background, so nobody asking whether a
+    machine is trusted waits for a directory of files to be read and a signature to be checked. A
+    refresh that fails leaves the list we already have: the checkout is only stale, not wrong. */
+export async function getTrustedMachines(): Promise<MachineState[]> {
+    if (!refreshing) {
+        refreshing = true;
+        runInfinitePoll(MACHINES_REFRESH_INTERVAL, async () => {
+            try {
+                trustedMachines.set(Promise.resolve(await readTrustedMachines()));
+            } catch (e) {
+                console.log(`Could not re-read the trusted machines, keeping the ones we have. ${e}`);
+            }
+        });
+    }
+    return await trustedMachines();
 }
 
 /** Makes a checkout list exactly these machines: those named are written with the addresses given,
@@ -59,10 +117,13 @@ export async function getMachines(repoPath: string): Promise<MachineState[]> {
     believing any of this, and it takes the hardware key, so `yarn signfiles git` is still yours to
     run afterwards. */
 export async function setMachines(config: {
-    repoPath: string;
+    repoPath?: string;
     machines: { machineId: string; ips: string[] }[];
 }): Promise<MachineState[]> {
-    let { repoPath, machines } = config;
+    let { machines } = config;
+    let repoPath = config.repoPath || (await keysRepo()).repoPath;
+    // Whatever was held is now stale, whoever reads it next.
+    trustedMachines.reset();
     let existing = await readMachines(repoPath);
     let directory = path.join(repoPath, MACHINES_DIR);
     let written: MachineState[] = [];
@@ -158,6 +219,17 @@ async function readMachineRevocations(sourceURL: string) {
     return revocations;
 }
 
+/** What to run to trust a machine that has just been refused.
+
+    Everything in it is already known to whoever is being refused: their machine id, the address we
+    saw them at, and the domain they just talked to. Handing it back saves them working out the
+    parts of a command they have every right to know. Running it still takes the hardware key on
+    the machine that owns the repo, so telling them costs nothing. */
+export function addMachineCommand(config: { machineId: string; ip: string; domain?: string }) {
+    let { machineId, ip, domain } = config;
+    return `To trust it, run: yarn addmachine ${domain || "<domain>"} ${machineId} ${ip} git`;
+}
+
 /** Sends the one notification this file is allowed to send, when it can.
 
     The daemon configures notifications on startup and would simply send. This can also run in some
@@ -247,19 +319,22 @@ async function recordMachineRevocation(config: {
     is a broken installation, not a rejected machine, and the two deserve different handling. */
 export type MachineVerdict = { accepted: boolean; reason: string };
 
-export async function isMachineAccepted(config: { machineId: string; ip: string }): Promise<MachineVerdict> {
-    let { machineId, ip } = config;
+export async function isMachineAccepted(config: {
+    machineId: string;
+    ip: string;
+    // Only used to write a complete command into the refusal. A caller that knows which domain it
+    // is answering as saves whoever is refused from having to guess it.
+    domain?: string;
+}): Promise<MachineVerdict> {
+    let { machineId, ip, domain } = config;
     if (!machineId || !ip) {
         throw new Error(`Expected a machineId and an ip, was ${JSON.stringify(machineId)} and ${JSON.stringify(ip)}`);
     }
-    let { repoPath, sourceURL } = await resolveKeysRepo();
-    // Unsigned, or signed over different contents, means the machine list is not evidence of
-    // anything. Same gate the ssh keys go through.
-    await verifyCheckout(repoPath);
-
-    let machine = (await readMachines(repoPath)).get(machineId);
+    let { sourceURL } = await keysRepo();
+    // Verified before it is believed, and cached, since this is asked once per request.
+    let machine = (await getTrustedMachines()).find(entry => entry.machineId === machineId);
     if (!machine) {
-        return { accepted: false, reason: "that machine is not trusted" };
+        return { accepted: false, reason: `that machine is not trusted. ${addMachineCommand({ machineId, ip, domain })}` };
     }
 
     await syncRevocations(sourceURL);

package/security/notifications/discord.d.ts

@@ -0,0 +1,36 @@
+export declare const DEFAULT_WEBHOOK_FILE_PATH = "/etc/portsecure/discord-webhook";
+/** Pulls the webhook URL out of webhook file contents. `sourceName` only appears in errors, so
+    callers can name a remote path. */
+export declare function parseWebhookFile(config: {
+    contents: string;
+    sourceName: string;
+}): string;
+/** Keeps the id and both ends of the token, so a reader can confirm which webhook replaced theirs
+    without receiving one they could post to. */
+export declare function redactWebhookURL(webhookURL: string): string;
+export declare function formatWebhookFile(webhookURL: string): string;
+/** When the message was sent, in the sending machine's own time zone. Discord shows when it
+    received something, which is not the same thing when a machine has been offline or a send has
+    been retried, and the zone matters when the machines are not all in one place. */
+export declare function messageTimestamp(now: Date): string;
+/** Sends to an explicit webhook URL, for tooling that acts on a webhook before (or instead of)
+    configureDiscordNotifications - setup, migrations, connectivity checks. */
+export declare function sendToWebhookURL(config: {
+    webhookURL: string;
+    message: string;
+}): Promise<void>;
+/** Must be called once on startup, before any notification is sent. Aborts the process if the
+    webhook file is missing or invalid, then re-checks the file on an interval and warns the old
+    webhook whenever it changes. */
+export declare function configureDiscordNotifications(config?: {
+    filePath?: string;
+    checkInterval?: number;
+}): Promise<{
+    filePath: string;
+    checkInterval: number;
+}>;
+export declare function sendDiscordNotification(message: string): Promise<void>;
+/** Whether notifications are set up in this process. For code that may run outside the daemon,
+    where sending is worth doing if it can be and not worth failing over if it cannot. */
+export declare function areDiscordNotificationsConfigured(): boolean;
+export declare function stopDiscordNotifications(): void;

package/security/notifications/dist/discord.ts.cache

@@ -1,4 +1,4 @@
-"use strict";
+"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";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
 };
@@ -203,4 +203,4 @@ function stopDiscordNotifications() {
 }
 exports.stopDiscordNotifications = stopDiscordNotifications;
 //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"discord.js","sourceRoot":"","sources":["discord.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs/promises\";\n\n// PORTED CODE: security/authorizedKeys/daemon/portsecureDaemon.js embeds a hand port of this file in plain JS, so the\n// daemon can run with no dependencies. The two are expected to behave identically - if you change\n// one, make the matching change in the other.\n\nexport const DEFAULT_WEBHOOK_FILE_PATH = \"/etc/portsecure/discord-webhook\";\nconst DEFAULT_CHECK_INTERVAL = 5 * 60 * 1000;\nconst VALID_WEBHOOK_PREFIXES = [\n    \"https://discord.com/api/webhooks/\",\n    \"https://discordapp.com/api/webhooks/\",\n    \"https://canary.discord.com/api/webhooks/\",\n];\nconst DISCORD_MESSAGE_LIMIT = 2000;\nconst MAX_ERROR_BODY_LENGTH = 500;\nconst MAX_SEND_ATTEMPTS = 3;\nconst REDACTED_TOKEN_VISIBLE = 8;\nconst DEFAULT_RATE_LIMIT_WAIT = 2 * 1000;\n\nlet notificationState: {\n    filePath: string;\n    webhookURL: string;\n    checkTimer: NodeJS.Timeout;\n} | undefined;\n\n// Discord webhooks are rate limited (roughly 5 requests per 2 seconds), so every send\n// goes through one chain instead of racing.\nlet sendChain: Promise<unknown> = Promise.resolve();\n\n/** Pulls the webhook URL out of webhook file contents. `sourceName` only appears in errors, so\n    callers can name a remote path. */\nexport function parseWebhookFile(config: { contents: string; sourceName: string }) {\n    let { contents, sourceName } = config;\n    let lines = contents.split(\"\\n\").map(line => line.trim()).filter(line => line && !line.startsWith(\"#\"));\n    let webhookURL = lines[0];\n    if (!webhookURL) {\n        throw new Error(`Expected a Discord webhook URL in ${sourceName}, the file has no usable lines`);\n    }\n    if (!VALID_WEBHOOK_PREFIXES.some(prefix => webhookURL.startsWith(prefix))) {\n        throw new Error(\n            `Expected a Discord webhook URL starting with one of ${VALID_WEBHOOK_PREFIXES.join(\", \")}, `\n            + `was ${webhookURL.slice(0, MAX_ERROR_BODY_LENGTH)} (in ${sourceName})`\n        );\n    }\n    return webhookURL;\n}\n\n/** Keeps the id and both ends of the token, so a reader can confirm which webhook replaced theirs\n    without receiving one they could post to. */\nexport function redactWebhookURL(webhookURL: string) {\n    let separatorIndex = webhookURL.lastIndexOf(\"/\");\n    let base = webhookURL.slice(0, separatorIndex + 1);\n    let token = webhookURL.slice(separatorIndex + 1);\n    if (token.length <= REDACTED_TOKEN_VISIBLE * 2) {\n        // Too short to show both ends without giving away the whole token.\n        return `${base}${token.slice(0, REDACTED_TOKEN_VISIBLE)}...`;\n    }\n    return `${base}${token.slice(0, REDACTED_TOKEN_VISIBLE)}...${token.slice(-REDACTED_TOKEN_VISIBLE)}`;\n}\n\nexport function formatWebhookFile(webhookURL: string) {\n    return `# portsecure Discord webhook. First non-comment line is used.\\n${webhookURL}\\n`;\n}\n\nasync function readWebhookFile(filePath: string) {\n    let contents;\n    try {\n        contents = await fs.readFile(filePath, \"utf8\");\n    } catch (e) {\n        throw new Error(`Expected a readable Discord webhook file at ${filePath}, ${e}`);\n    }\n    return parseWebhookFile({ contents, sourceName: filePath });\n}\n\n/** When the message was sent, in the sending machine's own time zone. Discord shows when it\n    received something, which is not the same thing when a machine has been offline or a send has\n    been retried, and the zone matters when the machines are not all in one place. */\nexport function messageTimestamp(now: Date) {\n    let date = now.toLocaleDateString(\"en-CA\");\n    let time = now.toLocaleTimeString(\"en-US\", {\n        hour: \"2-digit\",\n        minute: \"2-digit\",\n        second: \"2-digit\",\n        hour12: true,\n        timeZoneName: \"short\",\n    });\n    return `${date} ${time}`;\n}\n\nasync function postToWebhook(webhookURL: string, message: string) {\n    // Stamped once rather than per attempt, so a retry says when the thing happened rather than\n    // when we last managed to get it out. At the end, because the first line of a message is the\n    // notification preview and a timestamp there would spend it saying nothing.\n    let content = `${message} · \\`${messageTimestamp(new Date())}\\``;\n    if (content.length > DISCORD_MESSAGE_LIMIT) {\n        content = content.slice(0, DISCORD_MESSAGE_LIMIT - 3) + \"...\";\n    }\n    for (let attempt = 1; attempt <= MAX_SEND_ATTEMPTS; attempt++) {\n        let response = await fetch(webhookURL, {\n            method: \"POST\",\n            headers: { \"Content-Type\": \"application/json\" },\n            body: JSON.stringify({ content }),\n        });\n        if (response.ok) {\n            return;\n        }\n        let body = (await response.text()).slice(0, MAX_ERROR_BODY_LENGTH);\n        if (response.status === 429 && attempt < MAX_SEND_ATTEMPTS) {\n            let retryAfter = Number(response.headers.get(\"retry-after\"));\n            let waitTime = retryAfter && retryAfter * 1000 || DEFAULT_RATE_LIMIT_WAIT;\n            await new Promise(resolve => setTimeout(resolve, waitTime));\n            continue;\n        }\n        throw new Error(\n            `Expected a 2xx response from the Discord webhook, was ${response.status} ${response.statusText}, body ${body}`\n        );\n    }\n}\n\nfunction queueSend(webhookURL: string, message: string) {\n    let send = () => postToWebhook(webhookURL, message);\n    let result = sendChain.then(send, send);\n    sendChain = result.catch(() => undefined);\n    return result;\n}\n\n/** Sends to an explicit webhook URL, for tooling that acts on a webhook before (or instead of)\n    configureDiscordNotifications - setup, migrations, connectivity checks. */\nexport function sendToWebhookURL(config: { webhookURL: string; message: string }) {\n    return queueSend(config.webhookURL, config.message);\n}\n\nasync function checkWebhookFileChanged() {\n    let state = notificationState;\n    if (!state) {\n        return;\n    }\n    let newWebhookURL;\n    try {\n        newWebhookURL = await readWebhookFile(state.filePath);\n    } catch (e) {\n        console.error(`portsecure: Discord webhook file is no longer readable, still using the loaded webhook. ${e}`);\n        return;\n    }\n    if (newWebhookURL === state.webhookURL) {\n        return;\n    }\n    // Warn the old channel first, with the new webhook redacted, so a stolen old webhook does not\n    // hand the attacker a usable new one.\n    try {\n        await queueSend(\n            state.webhookURL,\n            `**portsecure**: **NOTIFICATIONS ARE MOVING TO ANOTHER CHANNEL**`\n            + `\\n\\nThis channel stops receiving them now. If that was not you, somebody with access`\n            + ` to this machine just redirected its alerts.`\n            + `\\n\\nnew webhook: \\`${redactWebhookURL(newWebhookURL)}\\``\n            + `\\nset in: \\`${state.filePath}\\``\n        );\n    } catch (e) {\n        console.error(`portsecure: failed to warn the old Discord webhook about the change. ${e}`);\n    }\n    state.webhookURL = newWebhookURL;\n}\n\n/** Must be called once on startup, before any notification is sent. Aborts the process if the\n    webhook file is missing or invalid, then re-checks the file on an interval and warns the old\n    webhook whenever it changes. */\nexport async function configureDiscordNotifications(config?: {\n    filePath?: string;\n    checkInterval?: number;\n}) {\n    if (notificationState) {\n        throw new Error(`Expected configureDiscordNotifications to be called once, was called again (already using ${notificationState.filePath})`);\n    }\n    let filePath = config?.filePath || DEFAULT_WEBHOOK_FILE_PATH;\n    let checkInterval = config?.checkInterval || DEFAULT_CHECK_INTERVAL;\n    let webhookURL;\n    try {\n        webhookURL = await readWebhookFile(filePath);\n    } catch (e) {\n        console.error(`portsecure: refusing to start without a valid Discord webhook file.\\n${e}`);\n        process.exit(1);\n    }\n    let checkTimer = setInterval(() => {\n        checkWebhookFileChanged().catch(e => console.error(`portsecure: Discord webhook file check failed. ${e}`));\n    }, checkInterval);\n    // The check should never be the reason the process stays alive.\n    checkTimer.unref();\n    notificationState = { filePath, webhookURL, checkTimer };\n    return { filePath, checkInterval };\n}\n\n// DO NOT add new calls to this. Every message goes to a real Discord server someone reads, so a\n// notification is only ever added when the user explicitly asks for that specific case. Startup,\n// success, errors, retries and recoveries all belong in a log instead.\nexport async function sendDiscordNotification(message: string) {\n    let state = notificationState;\n    if (!state) {\n        throw new Error(`Expected configureDiscordNotifications to be called before sending, was called with message ${message.slice(0, MAX_ERROR_BODY_LENGTH)}`);\n    }\n    await queueSend(state.webhookURL, message);\n}\n\n/** Whether notifications are set up in this process. For code that may run outside the daemon,\n    where sending is worth doing if it can be and not worth failing over if it cannot. */\nexport function areDiscordNotificationsConfigured() {\n    return !!notificationState;\n}\n\nexport function stopDiscordNotifications() {\n    if (!notificationState) {\n        return;\n    }\n    clearInterval(notificationState.checkTimer);\n    notificationState = undefined;\n}\n"]}
- /* _JS_SOURCE_HASH = "abb6e0b243d1d85cb4a3599020263d0b3164ce4bf2aef2aa81489e304cd43b4c"; */
+ /* _JS_SOURCE_HASH = "a4fe18f537fa6da028d1607b16331b146697f9fabb96c6de058f0b41c5553b17"; */

package/security/signedFiles/dist/manifest.ts.cache

@@ -1,4 +1,4 @@
-"use strict";
+"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";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
 };
@@ -82,4 +82,4 @@ function formatManifest(manifest) {
 }
 exports.formatManifest = formatManifest;
 //# 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"]}
- /* _JS_SOURCE_HASH = "e58787cb53d84ba9647f11c90c737f7303e120b8e02ca37cc9f38202fce1929d"; */
+ /* _JS_SOURCE_HASH = "201e773734f1a3a4a276457669646f936d46b81026afab845e5b8161d1b4310d"; */

package/security/signedFiles/manifest.d.ts

@@ -0,0 +1,44 @@
+/// <reference types="node" />
+/// <reference types="node" />
+export declare const MANIFEST_NAME = "signedfiles.json";
+export declare const SIGNATURE_NAME = "signedfiles.json.sig";
+export declare const SIGN_NAMESPACE = "signfiles";
+export declare const MANIFEST_VERSION = 1;
+export type Manifest = {
+    version: number;
+    files: {
+        path: string;
+        size: number;
+        sha256: string;
+    }[];
+};
+/** Everything in the repo that is not ignored: what is in the index, plus what is not staged yet.
+    Git is asked because git is what knows how to apply the ignore rules.
+
+    What comes back is a hint that a file might be there, not that it is. A file deleted from the
+    working tree stays in the index until that deletion is staged, so git names it and there is
+    nothing to read, which is why each one is checked before it goes in.
+
+    The manifest and its signature are left out, since they cannot describe themselves. */
+export declare function listRepoFiles(repoPath: string): Promise<string[]>;
+/** A Windows checkout turns LF into CRLF, so the same commit hashes differently there than it
+    does on the machine that pulls it. Normalising first makes the digest describe the content
+    rather than whichever checkout produced it. latin1 round trips every byte, so this is safe on
+    files that are not text. */
+export declare function normalizeContent(contents: Buffer): Buffer;
+/** The size and hash of a file's normalised content. The size is the normalised one on purpose,
+    so it agrees with the hash rather than with whatever the local checkout happens to hold. */
+export declare function digestFile(filePath: string): Promise<{
+    size: number;
+    sha256: string;
+}>;
+export declare function buildManifest(repoPath: string): Promise<{
+    version: number;
+    files: {
+        path: string;
+        size: number;
+        sha256: string;
+    }[];
+}>;
+/** Sorted keys and a trailing newline, so the same tree always produces the same bytes to sign. */
+export declare function formatManifest(manifest: Manifest): string;

package/storage/remoteStorage/ArchivesRemote.ts

@@ -99,15 +99,14 @@ export class ArchivesRemote implements IArchives {
         }
     }
 
-    // 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.
+    // 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.
     public async waitingForAccess(): Promise<{ link: string; machineId: string; ip: string } | undefined> {
         let state = await this.callAuthed(() => this.controller.getAccessState({ account: this.account }));
         if (state.hasAccess) return undefined;
-        let requested = await this.callAuthed(() => this.controller.requestAccess({ account: this.account }));
         return {
             link: `https://${this.parsed.address}:${this.parsed.port}/${this.account}`,
-            machineId: requested.machineId,
-            ip: requested.ip,
+            machineId: state.machineId,
+            ip: state.ip,
         };
     }
 
@@ -116,13 +115,12 @@ export class ArchivesRemote implements IArchives {
         return !!state.hasAccess;
     }
 
-    // Registers our access request server-side (so an admin has a requestId to grant) and logs the grant instructions, at most once a minute
+    // 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.
     private async registerAccessRequest(): Promise<void> {
-        let requested = await this.callAuthed(() => this.controller.requestAccess({ account: this.account }));
-        if (Date.now() - this.lastDeniedLog > timeInMinute) {
-            this.lastDeniedLog = Date.now();
-            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}`);
-        }
+        if (Date.now() - this.lastDeniedLog < timeInMinute) return;
+        let state = await this.callAuthed(() => this.controller.getAccessState({ account: this.account }));
+        this.lastDeniedLog = Date.now();
+        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 || ""}`);
     }
 
     // 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.

package/storage/remoteStorage/accessPage.tsx

@@ -6,10 +6,10 @@ import { observer } from "../../render-utils/observer";
 import { isNode } from "socket-function/src/misc";
 import { css } from "typesafecss";
 import { SocketFunction } from "socket-function/SocketFunction";
-import { RemoteStorageController, AccessState, AccessRequest } from "./storageController";
+import { RemoteStorageController, AccessState } from "./storageController";
 import { authenticateStorage } from "./ArchivesRemote";
 
-// 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).
+// 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.
 
 const REFRESH_INTERVAL = 1000 * 15;
 const COPIED_RESET_DELAY = 2000;
@@ -45,11 +45,6 @@ class AccessPage extends preact.Component {
         account: "",
         state: undefined as AccessState | undefined,
         error: "",
-        lookupIp: "",
-        lookupResults: undefined as { ip: string; requests: AccessRequest[] } | undefined,
-        lookupError: "",
-        looking: false,
-        granting: "",
     });
 
     componentDidMount() {
@@ -82,123 +77,51 @@ class AccessPage extends preact.Component {
     }
     private async refresh(account: string) {
         let controller = await this.controller();
-        await controller.requestAccess({ account });
         this.synced.state = await controller.getAccessState({ account });
         this.synced.error = "";
     }
 
-    private lookupIP = async () => {
-        let ip = this.synced.lookupIp.trim();
-        if (!ip) return;
-        this.synced.looking = true;
-        this.synced.lookupError = "";
-        try {
-            let controller = await this.controller();
-            let requests = await controller.listRequestsForIP({ account: this.synced.account, ip });
-            this.synced.lookupResults = { ip, requests };
-        } catch (e) {
-            this.synced.lookupError = String(e);
-        } finally {
-            this.synced.looking = false;
-        }
-    };
-
-    private approve = async (request: AccessRequest) => {
-        this.synced.granting = request.requestId;
-        try {
-            let controller = await this.controller();
-            await controller.grantAccess({ requestId: request.requestId });
-            if (this.synced.lookupResults) {
-                this.synced.lookupResults.requests = this.synced.lookupResults.requests.filter(r => r.requestId !== request.requestId);
-            }
-            await this.refresh(this.synced.account);
-        } catch (e) {
-            this.synced.lookupError = String(e);
-        } finally {
-            this.synced.granting = "";
-        }
-    };
-
     render() {
         let synced = this.synced;
         let { account, state, error } = synced;
         if (!account) {
             return <div className={css.vbox(8).pad2(16)}>
                 <div>Remote storage server.</div>
-                <div>Visit /(account name) to request access to an account for this browser.</div>
+                <div>Visit /(account name) to see whether this browser's machine has access to an account.</div>
             </div>;
         }
         return <div className={css.vbox(12).pad2(16)}>
             <div>Storage account: {account}</div>
             {error && <div>Error: {error}</div>}
-            {!state && !error && <div>Requesting access...</div>}
+            {!state && !error && <div>Checking access...</div>}
             {state && !state.hasAccess && <div className={css.vbox(8)}>
-                <div>This machine ({state.machineId}, ip {state.ip}) does NOT have access yet.</div>
-                <div>An access request has been made. To grant it, run this command:</div>
-                {state.grantAccessCommand && <CopyableCommand command={state.grantAccessCommand} />}
+                <div>This machine ({state.machineId}, ip {state.ip}) does NOT have access.</div>
+                {state.reason && <div>{state.reason}</div>}
+                <div>Run this in the authorized_keys repo, on a machine with the signing key:</div>
+                {state.addMachineCommand && <CopyableCommand command={state.addMachineCommand} />}
                 <div>This page rechecks every {REFRESH_INTERVAL / 1000} seconds.</div>
             </div>}
             {state && state.hasAccess && <div className={css.vbox(16)}>
                 <div>This machine ({state.machineId}, ip {state.ip}) has access.</div>
                 <div className={css.vbox(6)}>
-                    <div>Machines with access:</div>
+                    <div>Trusted machines:</div>
                     <table>
                         <thead>
                             <tr>
                                 <th className={css.pad2(8, 2).textAlign("left")}>Machine</th>
-                                <th className={css.pad2(8, 2).textAlign("left")}>IP</th>
-                                <th className={css.pad2(8, 2).textAlign("left")}>Granted</th>
+                                <th className={css.pad2(8, 2).textAlign("left")}>Allowed from</th>
+                                <th className={css.pad2(8, 2).textAlign("left")}>Added</th>
                             </tr>
                         </thead>
                         <tbody>
                             {(state.trustedMachines || []).map(m => <tr key={m.machineId}>
                                 <td className={css.pad2(8, 2)}>{m.machineId}</td>
-                                <td className={css.pad2(8, 2)}>{m.ip}</td>
-                                <td className={css.pad2(8, 2)}>{new Date(m.time).toLocaleString()}</td>
+                                <td className={css.pad2(8, 2)}>{m.ips.join(", ")}</td>
+                                <td className={css.pad2(8, 2)}>{m.addedAt}</td>
                             </tr>)}
                         </tbody>
                     </table>
                 </div>
-                <div className={css.vbox(6)}>
-                    <div>Approve request</div>
-                    <div className={css.hbox(8).alignItems("center")}>
-                        <input
-                            placeholder="ip"
-                            value={synced.lookupIp}
-                            onInput={e => { synced.lookupIp = (e.currentTarget as HTMLInputElement).value; }}
-                            onKeyDown={e => { if (e.key === "Enter") void this.lookupIP(); }}
-                        />
-                        <button disabled={synced.looking || !synced.lookupIp.trim()} onClick={this.lookupIP}>
-                            search
-                        </button>
-                    </div>
-                    {synced.lookupError && <div>Error: {synced.lookupError}</div>}
-                    {synced.lookupResults && synced.lookupResults.requests.length === 0 && <div>
-                        No pending requests for {synced.lookupResults.ip} on this account.
-                    </div>}
-                    {synced.lookupResults && synced.lookupResults.requests.length > 0 && <table>
-                        <thead>
-                            <tr>
-                                <th className={css.pad2(8, 2).textAlign("left")}>Machine</th>
-                                <th className={css.pad2(8, 2).textAlign("left")}>IP</th>
-                                <th className={css.pad2(8, 2).textAlign("left")}>Requested</th>
-                                <th className={css.pad2(8, 2).textAlign("left")}></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {synced.lookupResults.requests.map(r => <tr key={r.requestId}>
-                                <td className={css.pad2(8, 2)}>{r.machineId}</td>
-                                <td className={css.pad2(8, 2)}>{r.ip}</td>
-                                <td className={css.pad2(8, 2)}>{new Date(r.time).toLocaleString()}</td>
-                                <td className={css.pad2(8, 2)}>
-                                    <button disabled={!!synced.granting} onClick={async () => this.approve(r)}>
-                                        {synced.granting === r.requestId && "Approving..." || "Approve"}
-                                    </button>
-                                </td>
-                            </tr>)}
-                        </tbody>
-                    </table>}
-                </div>
             </div>}
         </div>;
     }