sliftutils 1.7.131 → 1.7.133

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

@@ -1,4 +1,4 @@
-"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";
+"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":";;;;;;AAAA,oDAA4B;AAC5B,2DAA6B;AAC7B,gDAAwB;AACxB,4CAAgD;AAEhD,kGAAkG;AAClG,iGAAiG;AACjG,kGAAkG;AAClG,uBAAuB;AAEV,QAAA,aAAa,GAAG,kBAAkB,CAAC;AACnC,QAAA,cAAc,GAAG,sBAAsB,CAAC;AACrD,oGAAoG;AACvF,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAOlC;;;;;;;0FAO0F;AACnF,KAAK,UAAU,aAAa,CAAC,QAAgB;IAChD,IAAI,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC;QAC5B,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,CAAC;QAChE,GAAG,EAAE,QAAQ;KAChB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACX,iCAAiC,QAAQ,yBAAyB,MAAM,CAAC,MAAM,IAAI;cACjF,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,CAAC;IACN,CAAC;IACD,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;SACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SACxB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,KAAK,qBAAa,IAAI,IAAI,KAAK,sBAAc,CAAC;SACzE,IAAI,EAAE,CAAC;IAEZ,IAAI,OAAO,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;QAC9B,IAAI,CAAC;YACD,MAAM,kBAAE,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,WAAW,YAAY,wDAAwD,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AA3BD,sCA2BC;AAED;;;+BAG+B;AAC/B,SAAgB,gBAAgB,CAAC,QAAgB;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;AACrF,CAAC;AAFD,4CAEC;AAED;+FAC+F;AACxF,KAAK,UAAU,UAAU,CAAC,QAAgB;IAC7C,IAAI,QAAQ,GAAG,gBAAgB,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;AACzG,CAAC;AAHD,gCAGC;AAEM,KAAK,UAAU,aAAa,CAAC,QAAgB;IAChD,IAAI,KAAK,GAAsB,EAAE,CAAC;IAClC,KAAK,IAAI,YAAY,IAAI,MAAM,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QACjE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,wBAAgB,EAAE,KAAK,EAAE,CAAC;AAChD,CAAC;AAPD,sCAOC;AAED,mGAAmG;AACnG,SAAgB,cAAc,CAAC,QAAkB;IAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;AACzD,CAAC;AAFD,wCAEC","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 = "201e773734f1a3a4a276457669646f936d46b81026afab845e5b8161d1b4310d"; */
+ /* _JS_SOURCE_HASH = "e58787cb53d84ba9647f11c90c737f7303e120b8e02ca37cc9f38202fce1929d"; */

package/storage/backblaze.ts

@@ -562,6 +562,17 @@ export class ArchivesBackblaze implements IArchives {
         } catch (err: any) {
             if (retries <= 0) throw err;
 
+            // A file that does not exist is an answer, not a failure. It is the one error here that
+            // cannot become anything else by asking again, so it is thrown at once instead of being
+            // slept on twice - callers turn it into undefined, which is what they were asking.
+            if (
+                err.stack.includes(`"not_found"`)
+                || err.stack.includes(`file_not_found`)
+                || err.stack.includes(`"status": 404`)
+            ) {
+                throw err;
+            }
+
             // If it's a 503 and it's been a minute since we last reset, then Wait and reset.
             if (
                 (err.stack.includes(`"status": 503`)

package/bin/machineclient.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-// Asks a server whether this machine is trusted.
-require("typenode");
-
-require("../security/machines/trustClient").main().catch(e => {
-    console.error(`${e}`);
-    process.exitCode = 1;
-}).finally(() => process.exit());

package/bin/machineserver.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-// Answers whether the machine asking is trusted, from the address it is asking from.
-require("typenode");
-
-// No exit on success: this one is a server, and returning from main only means it is listening.
-require("../security/machines/trustServer").main().catch(e => {
-    console.error(`${e}`);
-    process.exit(1);
-});

package/security/machines/identity.ts

@@ -1,199 +0,0 @@
-import crypto from "crypto";
-import fs from "fs/promises";
-import os from "os";
-import path from "path";
-import { generateTestCA, getMachineId, identityStorageKey, IdentityStorageType, verifyMachineIdForPublicKey } from "../../misc/https/certs";
-import { runOverSSH, writeRemoteFile } from "../helpers/remoteSSH";
-
-// A machine's identity is the CA it generated for itself, kept in one file in the home directory
-// of whoever runs it. The name carries the domain it belongs to, so a machine can hold one per
-// domain, and the id itself is a hash of that CA's public key - which is why a machine cannot
-// claim to be another one without holding its key.
-const IDENTITY_PREFIX = "keystore_";
-const IDENTITY_SUFFIX = `_${identityStorageKey}.json`;
-// How stale a signed packet may be. Long enough for clock skew between two machines, short enough
-// that a captured packet is not worth replaying.
-export const PACKET_LIFETIME = 2 * 60 * 1000;
-
-export type Identity = {
-    machineId: string;
-    domain: string;
-    fullDomain: string;
-    fileName: string;
-};
-
-function identityFileName(domain: string) {
-    return `${IDENTITY_PREFIX}${domain}${IDENTITY_SUFFIX}`;
-}
-
-/** The domain out of an identity file's name, or "" if it is not one. */
-function domainOfFileName(fileName: string) {
-    if (!fileName.startsWith(IDENTITY_PREFIX) || !fileName.endsWith(IDENTITY_SUFFIX)) {
-        return "";
-    }
-    return fileName.slice(IDENTITY_PREFIX.length, -IDENTITY_SUFFIX.length);
-}
-
-function describeIdentity(config: { domain: string; stored: IdentityStorageType }) {
-    let { domain, stored } = config;
-    return {
-        machineId: getMachineId(stored.domain, domain),
-        domain,
-        fullDomain: stored.domain,
-        fileName: identityFileName(domain),
-    };
-}
-
-/** Every domain this machine holds an identity under. A machine has one identity per domain, and
-    they are different machine ids, so which one is meant is a real question rather than a detail. */
-export async function localDomains() {
-    let domains: string[] = [];
-    for (let name of (await fs.readdir(os.homedir()).catch(() => [] as string[])).sort()) {
-        let domain = domainOfFileName(name);
-        if (domain) {
-            domains.push(domain);
-        }
-    }
-    return domains;
-}
-
-/** This machine's identity under one domain. Undefined when it has none under that one.
-
-    The domain is required everywhere it appears. A machine has a different identity, and so a
-    different machine id, under every domain it runs under, so "this machine" on its own does not
-    name anything: answering under the wrong one means answering as a machine we are not. */
-export async function localIdentity(domain: string): Promise<Identity | undefined> {
-    if (!domain) {
-        throw new Error(`Expected a domain, was ${JSON.stringify(domain)}`);
-    }
-    let contents = await fs.readFile(path.join(os.homedir(), identityFileName(domain)), "utf8").catch(() => "");
-    if (!contents) {
-        return undefined;
-    }
-    return describeIdentity({ domain, stored: JSON.parse(contents) });
-}
-
-/** This machine's identity and its keys, for signing. */
-export async function localIdentityKeys(domain: string) {
-    let identity = await localIdentity(domain);
-    if (!identity) {
-        throw new Error(
-            `Expected an identity for ${domain} at ${path.join(os.homedir(), identityFileName(domain))},`
-            + ` there is none.\n`
-            + `This machine has: ${(await localDomains()).join(", ") || "no identities at all"}`
-        );
-    }
-    let stored: IdentityStorageType = JSON.parse(
-        await fs.readFile(path.join(os.homedir(), identity.fileName), "utf8")
-    );
-    return { identity, stored };
-}
-
-/** The identity of another machine under one domain, over ssh. Undefined when it has none under
-    that domain, whatever else it may have under others. */
-export async function remoteIdentity(host: string, domain: string): Promise<Identity | undefined> {
-    if (!domain) {
-        throw new Error(`Expected a domain, was ${JSON.stringify(domain)}`);
-    }
-    let home = (await runOverSSH({ host, script: `echo $HOME` })).stdout.trim();
-    if (!home) {
-        throw new Error(`Expected ${host} to report a home directory, it reported nothing`);
-    }
-    let contents = await runOverSSH({
-        host,
-        script: `cat ${home}/${identityFileName(domain)} 2>/dev/null || true`,
-    });
-    if (!contents.stdout.trim()) {
-        return undefined;
-    }
-    return describeIdentity({ domain, stored: JSON.parse(contents.stdout) });
-}
-
-/** Gives a machine an identity it does not have yet, by generating one here and writing it there.
-
-    The CA is self signed and never leaves that machine afterwards, so generating it here is only a
-    convenience: what matters is that the private key ends up in one place and the id is the hash
-    of its public half. */
-export async function createRemoteIdentity(config: { host: string; domain: string }) {
-    let { host, domain } = config;
-    let generated = generateTestCA(domain);
-    let stored: IdentityStorageType = {
-        domain: generated.domain,
-        certB64: generated.cert.toString("base64"),
-        keyB64: generated.key.toString("base64"),
-    };
-    let home = (await runOverSSH({ host, script: `echo $HOME` })).stdout.trim();
-    await writeRemoteFile({
-        host,
-        filePath: `${home}/${identityFileName(domain)}`,
-        contents: JSON.stringify(stored),
-        fileMode: "600",
-        // The home directory is already there, this is only what it is created with if it is not.
-        directoryMode: "700",
-    });
-    return describeIdentity({ domain, stored });
-}
-
-/** The raw ed25519 public key out of a certificate, which is what the machine id is a hash of. */
-function publicKeyBytes(certPEM: string) {
-    let spki = new crypto.X509Certificate(certPEM).publicKey.export({ type: "spki", format: "der" });
-    // An ed25519 SPKI is a fixed 12 byte header followed by the 32 byte key.
-    return spki.subarray(spki.length - 32);
-}
-
-export type TrustPacket = {
-    machineId: string;
-    certB64: string;
-    signedAt: number;
-    signatureB64: string;
-};
-
-/** Proves we hold the private key behind our machine id, right now. The signature covers the id
-    and the time, so the packet cannot be replayed later or reused for another id. */
-export async function signTrustPacket(domain: string): Promise<TrustPacket> {
-    let { identity, stored } = await localIdentityKeys(domain);
-    let signedAt = Date.now();
-    let signature = crypto.sign(
-        null,
-        Buffer.from(`${identity.machineId} ${signedAt}`),
-        crypto.createPrivateKey(Buffer.from(stored.keyB64, "base64").toString())
-    );
-    return {
-        machineId: identity.machineId,
-        certB64: stored.certB64,
-        signedAt,
-        signatureB64: signature.toString("base64"),
-    };
-}
-
-/** Whether a packet really came from the machine it names. Says why when it did not, because
-    "this is not that machine" and "this arrived too late" are different problems. */
-export function verifyTrustPacket(packet: TrustPacket) {
-    if (!packet || !packet.machineId || !packet.certB64 || !packet.signatureB64) {
-        return { valid: false, problem: "the packet is missing fields" };
-    }
-    if (Math.abs(Date.now() - packet.signedAt) > PACKET_LIFETIME) {
-        return { valid: false, problem: `it was signed ${Math.round((Date.now() - packet.signedAt) / 1000)}s ago` };
-    }
-    let certPEM = Buffer.from(packet.certB64, "base64").toString();
-    let publicKey: crypto.KeyObject;
-    try {
-        publicKey = new crypto.X509Certificate(certPEM).publicKey;
-    } catch (e) {
-        return { valid: false, problem: `its certificate could not be read, ${e}` };
-    }
-    // The id is a hash of the public key, so this is what stops a machine claiming another's id.
-    if (!verifyMachineIdForPublicKey({ machineId: packet.machineId, publicKey: publicKeyBytes(certPEM) })) {
-        return { valid: false, problem: "the machine id does not belong to that certificate" };
-    }
-    let signed = crypto.verify(
-        null,
-        Buffer.from(`${packet.machineId} ${packet.signedAt}`),
-        publicKey,
-        Buffer.from(packet.signatureB64, "base64")
-    );
-    if (!signed) {
-        return { valid: false, problem: "the signature does not check out" };
-    }
-    return { valid: true, problem: "" };
-}

package/security/machines/trustClient.ts

@@ -1,51 +0,0 @@
-import { signTrustPacket } from "./identity";
-
-// The other half of the demonstration: asks a server whether it trusts this machine. The answer
-// depends on the address this machine reaches the server from, which is why the client cannot
-// work it out alone.
-const TRUST_PATH = "/trusted";
-const USAGE = `Usage: yarn machineclient <url> <domain>
-
-Asks that server whether this machine is trusted, proving which machine it is with a signed packet.
-The server decides using the address we reach it from, so the answer is about how we are talking to
-it, not only about who we are.
-
-The domain is required: this machine has a different identity under each one, and the answer is
-about the identity we sign with.`;
-
-export type TrustAnswer = {
-    trusted: boolean;
-    machineId?: string;
-    ip?: string;
-    reason?: string;
-};
-
-/** Asks one server whether it trusts this machine, as it is under this domain. */
-export async function askIfTrusted(config: { baseURL: string; domain: string }): Promise<TrustAnswer> {
-    let { baseURL, domain } = config;
-    let packet = await signTrustPacket(domain);
-    let url = `${baseURL.replace(/\/+$/, "")}${TRUST_PATH}`;
-    let response = await fetch(url, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(packet),
-    });
-    return await response.json() as TrustAnswer;
-}
-
-export async function main() {
-    let [baseURL, domain] = process.argv.slice(2);
-    if (!baseURL || !domain) {
-        throw new Error(USAGE);
-    }
-    let answer = await askIfTrusted({ baseURL, domain });
-    console.log(`${answer.trusted && "TRUSTED" || "NOT TRUSTED"} by ${baseURL}`);
-    console.log(`  machine ${answer.machineId || "(not established)"}`);
-    console.log(`  seen coming from ${answer.ip || "(unknown)"}`);
-    if (answer.reason) {
-        console.log(`  ${answer.reason}`);
-    }
-    if (!answer.trusted) {
-        process.exitCode = 1;
-    }
-}

package/security/machines/trustServer.ts

@@ -1,87 +0,0 @@
-import http from "http";
-import { verifyTrustPacket } from "./identity";
-import { isMachineAccepted } from "./machines";
-
-// A demonstration of machine trust, and the smallest thing that exercises it end to end: a client
-// proves which machine it is, and this answers whether that machine is trusted from the address it
-// is actually talking from.
-//
-// Plain http on purpose. Nothing here is secret - the packet proves who the client is by signature
-// rather than by the channel, and the answer is a yes or no about a machine the caller already
-// knows the id of.
-const DEFAULT_PORT = 47812;
-const TRUST_PATH = "/trusted";
-const MAX_BODY_LENGTH = 64 * 1024;
-
-/** The address the client is actually talking from. Not read from anything the client sent,
-    because that is the one half of the pair it must not get to choose. */
-function addressOf(request: http.IncomingMessage) {
-    let address = request.socket.remoteAddress || "";
-    // Node reports IPv4 over a dual stack socket this way.
-    return address.replace(/^::ffff:/, "");
-}
-
-async function readBody(request: http.IncomingMessage) {
-    let chunks: Buffer[] = [];
-    let length = 0;
-    for await (let chunk of request) {
-        length += chunk.length;
-        if (length > MAX_BODY_LENGTH) {
-            throw new Error(`Expected at most ${MAX_BODY_LENGTH} bytes, was more`);
-        }
-        chunks.push(chunk);
-    }
-    return Buffer.concat(chunks).toString("utf8");
-}
-
-export function startTrustServer(config: { port: number }) {
-    let server = http.createServer((request, response) => {
-        let answer = async () => {
-            if (request.url !== TRUST_PATH) {
-                return { status: 404, body: { error: `POST a trust packet to ${TRUST_PATH}` } };
-            }
-            let packet = JSON.parse(await readBody(request));
-            let ip = addressOf(request);
-            let verified = verifyTrustPacket(packet);
-            if (!verified.valid) {
-                // Not a rejection of the machine, a packet that does not prove anything about one.
-                return { status: 400, body: { trusted: false, ip, reason: verified.problem } };
-            }
-            let verdict = await isMachineAccepted({ machineId: packet.machineId, ip });
-            return {
-                status: 200,
-                body: {
-                    trusted: verdict.accepted,
-                    machineId: packet.machineId,
-                    ip,
-                    // Whatever the check itself said. It is the only thing that knows which of the
-                    // ways to be refused this was.
-                    reason: verdict.reason,
-                },
-            };
-        };
-        answer().then(result => {
-            console.log(`${request.method} ${request.url} from ${addressOf(request)}: ${JSON.stringify(result.body)}`);
-            response.writeHead(result.status, { "Content-Type": "application/json" });
-            response.end(JSON.stringify(result.body, undefined, 4));
-        }).catch(e => {
-            console.log(`${request.method} ${request.url} from ${addressOf(request)} failed. ${e}`);
-            response.writeHead(500, { "Content-Type": "application/json" });
-            response.end(JSON.stringify({ trusted: false, error: `${e}` }, undefined, 4));
-        });
-    });
-    server.listen(config.port);
-    return server;
-}
-
-export async function main() {
-    let port = Number(process.argv[2] || DEFAULT_PORT);
-    if (!Number.isFinite(port)) {
-        throw new Error(`Usage: yarn machineserver [port]`);
-    }
-    startTrustServer({ port });
-    console.log(`Answering trust checks on http://0.0.0.0:${port}${TRUST_PATH}`);
-    console.log(`A client asks with: yarn machineclient http://<this machine>:${port}`);
-    // Left running. Nothing else to do here, the server is the program.
-    await new Promise(() => { });
-}