sliftutils 1.7.126 → 1.7.127

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.
@@ -8,7 +8,7 @@ import { deriveRevokeKey, REVOKE_KEY_LABEL, revokeRepoURL } from "./revokeSource
8
8
  import { revokedKeysInRepo } from "./unrevoke";
9
9
  import { expandHome } from "../helpers/paths";
10
10
  import { spawnPromise } from "../helpers/spawn";
11
- import { readRemoteFile, remoteCommandExists, runOverSSH, SUDO_PREAMBLE, writeRemoteFile } from "../helpers/remoteSSH";
11
+ import { describeHost, readRemoteFile, remoteCommandExists, runOverSSH, SUDO_PREAMBLE, THIS_MACHINE, writeRemoteFile } from "../helpers/remoteSSH";
12
12
 
13
13
  const SERVICE_SOURCE = path.join(__dirname, "daemon", "portsecure.service");
14
14
  // The daemon runs from a checkout of this repo on the host, rather than from a copy we upload, so
@@ -22,12 +22,16 @@ const ROOT_AUTHORIZED_KEYS = "/root/.ssh/authorized_keys";
22
22
  const SERVICE_NAME = "portsecure";
23
23
  const MAX_ERROR_BODY_LENGTH = 500;
24
24
  const VERBS = ["add", "remove", "list", "update"];
25
- // The repo url is optional, and defaults to the repo the command is run from.
25
+ // The host is optional, and without one everything happens on this machine. The repo url is
26
+ // optional too, and defaults to the repo the command is run from.
26
27
  const USAGE = `Usage:
27
- yarn securessh <host> add <repo-private-key> [repo-url]
28
- yarn securessh <host> remove [repo-url]
29
- yarn securessh <host> list
30
- yarn securessh <host> update`;
28
+ yarn securessh [host] add <repo-private-key> [repo-url]
29
+ yarn securessh [host] remove [repo-url]
30
+ yarn securessh [host] list
31
+ yarn securessh [host] update
32
+
33
+ With no host it acts on this machine, and still installs from github rather than from wherever
34
+ this was run.`;
31
35
 
32
36
  async function pathExists(filePath: string) {
33
37
  try {
@@ -176,7 +180,19 @@ async function ensureRevokeReposExist(repoSources: string[]) {
176
180
  let revokeURL = revokeRepoURL(repoURL);
177
181
  let temporaryDirectory = await fs.mkdtemp(path.join(os.tmpdir(), "portsecure-revoke-"));
178
182
  let checkoutPath = path.join(temporaryDirectory, "repo");
179
- let clone = await runLocal({ command: "git", args: ["clone", revokeURL, checkoutPath], allowFailure: true });
183
+ // On a machine that is already a portsecure host, the source's deploy key is right there,
184
+ // and the key derived from it is the one credential that repo is guaranteed to accept.
185
+ // Anywhere else, a person is running this and has their own access.
186
+ let ownKey = "";
187
+ if (await pathExists(sourceKeyPath(repoURL))) {
188
+ let derived = deriveRevokeKey(await fs.readFile(sourceKeyPath(repoURL), "utf8"));
189
+ ownKey = path.join(temporaryDirectory, "key");
190
+ await fs.writeFile(ownKey, derived.privateKeyFile, { mode: 0o600 });
191
+ }
192
+ let cloneRevoke = async (allowFailure: boolean) => ownKey
193
+ && await gitWithKey({ keyPath: ownKey, args: ["clone", revokeURL, checkoutPath], allowFailure })
194
+ || await runLocal({ command: "git", args: ["clone", revokeURL, checkoutPath], allowFailure });
195
+ let clone = await cloneRevoke(true);
180
196
  if (clone.status !== 0) {
181
197
  await fs.rm(temporaryDirectory, { recursive: true, force: true });
182
198
  throw new Error(
@@ -194,10 +210,15 @@ async function ensureRevokeReposExist(repoSources: string[]) {
194
210
  for (let args of [
195
211
  ["-C", checkoutPath, "add", "-A"],
196
212
  ["-C", checkoutPath, "-c", "user.email=portsecure@localhost", "-c", "user.name=portsecure", "commit", "-m", "initialise revoke repo"],
197
- ["-C", checkoutPath, "push", "origin", "HEAD"],
198
213
  ]) {
199
214
  await runLocal({ command: "git", args });
200
215
  }
216
+ let push = ["-C", checkoutPath, "push", "origin", "HEAD"];
217
+ if (ownKey) {
218
+ await gitWithKey({ keyPath: ownKey, args: push });
219
+ } else {
220
+ await runLocal({ command: "git", args: push });
221
+ }
201
222
  }
202
223
  await fs.rm(temporaryDirectory, { recursive: true, force: true });
203
224
  console.log(`${revokeURL} is ready`);
@@ -296,14 +317,24 @@ async function installDaemon(config: { host: string; hostLabel: string; repoSour
296
317
 
297
318
  // The checkout is brought to the latest commit rather than a copy being pushed, so what runs on
298
319
  // the host is exactly what is on github.
299
- console.log(`Updating ${REMOTE_CHECKOUT_PATH} on ${host}`);
320
+ console.log(`Updating ${REMOTE_CHECKOUT_PATH} on ${describeHost(host)}`);
300
321
  await runOverSSH({
301
322
  host,
302
323
  script: `${SUDO_PREAMBLE}
303
324
  set -e
304
325
  $SUDO mkdir -p "${path.posix.dirname(REMOTE_CHECKOUT_PATH)}"
305
326
  if $SUDO test -d "${REMOTE_CHECKOUT_PATH}/.git"; then
327
+ # Stashed first, the way machine-alwaysup does it. Anything sitting modified in a host's
328
+ # checkout is either an accident or somebody editing the daemon in place, and either way it is
329
+ # worth keeping rather than quietly erasing. The identity is passed inline because a host has
330
+ # no git config of its own and stash writes a commit.
331
+ $SUDO git -C "${REMOTE_CHECKOUT_PATH}" add --all
332
+ $SUDO git -C "${REMOTE_CHECKOUT_PATH}" -c user.email=portsecure@localhost -c user.name=portsecure stash
306
333
  $SUDO git -C "${REMOTE_CHECKOUT_PATH}" fetch --prune origin
334
+ # A stash and a pull cannot cross a branch that has diverged, and a drifted checkout must not be
335
+ # able to leave a host running old code, so it is put on the remote's state rather than merged
336
+ # with it. set-head so that is the remote's default branch now, not the one it had at clone.
337
+ $SUDO git -C "${REMOTE_CHECKOUT_PATH}" remote set-head origin --auto
307
338
  $SUDO git -C "${REMOTE_CHECKOUT_PATH}" reset --hard origin/HEAD
308
339
  else
309
340
  $SUDO rm -rf "${REMOTE_CHECKOUT_PATH}"
@@ -368,7 +399,7 @@ async function requireRemoteWebhook(host: string) {
368
399
  throw new Error(
369
400
  `Expected a Discord webhook at ${DEFAULT_WEBHOOK_FILE_PATH} on ${host}, no such file exists.`
370
401
  + ` The daemon will not start without one.\n`
371
- + `Set it up first:\n yarn setupnotify ${host} <discord-webhook-url>`
402
+ + `Set it up first:\n yarn setupnotify ${host} <discord-webhook-url>`.replace(" <discord", host && " <discord" || "<discord")
372
403
  );
373
404
  }
374
405
  return parseWebhookFile({ contents, sourceName: `${host}:${DEFAULT_WEBHOOK_FILE_PATH}` });
@@ -392,18 +423,22 @@ async function addSource(config: { host: string; keyPath: string; repoURL: strin
392
423
 
393
424
  let remoteConfig = await readRemoteConfig(host);
394
425
  if (remoteConfig.repoSources.includes(repoURL)) {
395
- console.log(`${host} already has ${repoURL}, refreshing its key and the daemon.`);
426
+ console.log(`${describeHost(host)} already has ${repoURL}, refreshing its key and the daemon.`);
396
427
  }
397
428
 
398
- // The merged result is what root ends up with, so our own key has to be somewhere in it.
399
- console.log(`Checking our access to ${host} survives the merged keys`);
400
- let ourFingerprint = await findAuthenticatingFingerprint(host);
429
+ // The merged result is what root ends up with, so our own key has to be somewhere in it. On
430
+ // this machine there is no ssh session to preserve, so there is nothing to check.
431
+ let ourFingerprint = "";
432
+ if (host) {
433
+ console.log(`Checking our access to ${describeHost(host)} survives the merged keys`);
434
+ ourFingerprint = await findAuthenticatingFingerprint(host);
435
+ }
401
436
  let inspectionPath = await cloneRepoForInspection({ repoURL, keyPath });
402
437
  let newKeys = await readRepoKeys(inspectionPath);
403
438
  // Whatever is applied on the host came from the existing sources, so it stays in the merge.
404
439
  let existingKeys = normalizeKeys(await readRemoteFile({ host, filePath: ROOT_AUTHORIZED_KEYS }) || "");
405
440
  let mergedFingerprints = await fingerprintKeys([...existingKeys, ...newKeys]);
406
- if (!mergedFingerprints.includes(ourFingerprint)) {
441
+ if (ourFingerprint && !mergedFingerprints.includes(ourFingerprint)) {
407
442
  throw new Error(
408
443
  `Expected the key we use for ${host} to be in the merged keys, it is not.\n`
409
444
  + `Ours: ${ourFingerprint}\n`
@@ -412,7 +447,9 @@ async function addSource(config: { host: string; keyPath: string; repoURL: strin
412
447
  + ` lock you out of ${host}. Add your public key to ${repoURL} first.`
413
448
  );
414
449
  }
415
- console.log(`Our key ${ourFingerprint} is in the merged keys, access will survive.`);
450
+ if (ourFingerprint) {
451
+ console.log(`Our key ${ourFingerprint} is in the merged keys, access will survive.`);
452
+ }
416
453
 
417
454
  await ensureRevokeRepo({ keyPath, repoURL });
418
455
 
@@ -428,7 +465,7 @@ async function addSource(config: { host: string; keyPath: string; repoURL: strin
428
465
  }
429
466
 
430
467
  let webhookURL = await requireRemoteWebhook(host);
431
- console.log(`${host} notifies ${webhookURL}`);
468
+ console.log(`${describeHost(host)} notifies ${webhookURL}`);
432
469
 
433
470
  await writeRemoteFile({
434
471
  host,
@@ -441,7 +478,7 @@ async function addSource(config: { host: string; keyPath: string; repoURL: strin
441
478
  let repoSources = remoteConfig.repoSources.filter(source => source !== repoURL);
442
479
  repoSources.push(repoURL);
443
480
  await installDaemon({ host, hostLabel: remoteConfig.hostLabel, repoSources });
444
- console.log(`${repoURL} added to ${host}. ${repoSources.length} source(s) now merged.`);
481
+ console.log(`${repoURL} added to ${describeHost(host)}. ${repoSources.length} source(s) now merged.`);
445
482
  }
446
483
 
447
484
  async function removeSource(config: { host: string; repoURL: string }) {
@@ -455,9 +492,10 @@ async function removeSource(config: { host: string; repoURL: string }) {
455
492
  }
456
493
  let repoSources = remoteConfig.repoSources.filter(source => source !== repoURL);
457
494
 
458
- if (repoSources.length) {
495
+ // On this machine there is no ssh session to preserve, so there is nothing to check.
496
+ if (repoSources.length && host) {
459
497
  // The keys left over are what root gets, so our own key has to be among them.
460
- console.log(`Checking our access to ${host} survives without ${repoURL}`);
498
+ console.log(`Checking our access to ${describeHost(host)} survives without ${repoURL}`);
461
499
  let ourFingerprint = await findAuthenticatingFingerprint(host);
462
500
  let remainingKeys: string[] = [];
463
501
  for (let source of repoSources) {
@@ -485,47 +523,15 @@ $SUDO rm -f "${sourceKeyPath(repoURL)}"
485
523
  $SUDO rm -rf "${sourceRepoPath(repoURL)}"`,
486
524
  });
487
525
  await installDaemon({ host, hostLabel: remoteConfig.hostLabel, repoSources });
488
- console.log(`${repoURL} removed from ${host}. ${repoSources.length} source(s) left.`);
526
+ console.log(`${repoURL} removed from ${describeHost(host)}. ${repoSources.length} source(s) left.`);
489
527
  }
490
528
 
491
529
  /** Answers "who can log into this box, and which repo says so". The paths the daemon uses are
492
530
  left out on purpose, they are plumbing rather than something to act on. */
493
- /** The daemon is installed from this checkout, so the checkout is brought up to date first.
494
- Anything that stops the pull - a conflict, local commits, no upstream - stops the update too,
495
- rather than quietly installing whatever happened to be on disk. */
496
- async function pullLocalCheckout() {
497
- let topLevel = await spawnPromise({ command: "git", args: ["rev-parse", "--show-toplevel"], cwd: __dirname });
498
- if (topLevel.status !== 0) {
499
- throw new Error(
500
- `Expected ${__dirname} to be inside a git checkout, it is not.`
501
- + ` update installs the daemon from this checkout, so it has to be one.`
502
- );
503
- }
504
- let repoPath = topLevel.stdout.trim();
505
- let pull = await spawnPromise({ command: "git", args: ["pull", "--ff-only"], cwd: repoPath });
506
- if (pull.status !== 0) {
507
- throw new Error(
508
- `Expected git pull in ${repoPath} to succeed, it did not, so nothing was installed.\n`
509
- + `${(pull.stdout + pull.stderr).trim().slice(0, MAX_ERROR_BODY_LENGTH)}`
510
- );
511
- }
512
- // The host installs from github, not from here, so local commits that have not been pushed
513
- // are not what it will run.
514
- let local = await spawnPromise({ command: "git", args: ["rev-parse", "HEAD"], cwd: repoPath });
515
- let remote = await spawnPromise({ command: "git", args: ["rev-parse", "@{u}"], cwd: repoPath });
516
- if (local.stdout.trim() !== remote.stdout.trim()) {
517
- console.log(`WARNING: ${repoPath} has commits that are not pushed. The host installs from github,`);
518
- console.log(` so it will run the pushed version, not what is here.`);
519
- }
520
- console.log(`Pulled ${repoPath}`);
521
- }
522
531
 
523
532
  /** Pushes the current daemon onto a host that already has one, for when this code has moved on.
524
533
  Nothing about which keys the host trusts is touched. */
525
534
  async function updateDaemon(host: string) {
526
- // Pulled before anything else, so a checkout that cannot be brought up to date fails here
527
- // rather than after we have already started changing the host.
528
- await pullLocalCheckout();
529
535
  let contents = await readRemoteFile({ host, filePath: REMOTE_CONFIG_PATH });
530
536
  if (!contents) {
531
537
  throw new Error(
@@ -538,16 +544,21 @@ async function updateDaemon(host: string) {
538
544
  await requireRemoteWebhook(host);
539
545
  await ensureRevokeReposExist(repoSources);
540
546
  await installDaemon({ host, hostLabel: parsed.hostLabel || host, repoSources });
541
- console.log(`Updated the daemon on ${host}. ${repoSources.length} source(s), unchanged.`);
547
+ console.log(`Updated the daemon on ${describeHost(host)}, and restarted it.`);
548
+ console.log(`Its ${repoSources.length} key source(s) were left as they are, along with the keys and`);
549
+ console.log(`signers it has already accepted. Only the daemon itself changed:`);
550
+ for (let repoURL of repoSources) {
551
+ console.log(` ${repoURL}`);
552
+ }
542
553
  }
543
554
 
544
555
  async function listSources(host: string) {
545
556
  let remoteConfig = await readRemoteConfig(host);
546
557
  if (!remoteConfig.repoSources.length) {
547
- console.log(`${host} has no key sources. root's authorized_keys is left exactly as it is.`);
558
+ console.log(`${describeHost(host)} has no key sources. root's authorized_keys is left exactly as it is.`);
548
559
  return;
549
560
  }
550
- console.log(`${host} lets root log in with the keys from ${remoteConfig.repoSources.length} repo(s):`);
561
+ console.log(`${describeHost(host)} lets root log in with the keys from ${remoteConfig.repoSources.length} repo(s):`);
551
562
  let merged = new Set<string>();
552
563
  for (let repoURL of remoteConfig.repoSources) {
553
564
  let keys = await readRemoteSourceKeys({ host, repoURL });
@@ -578,11 +589,16 @@ function parseArgs(argv: string[]) {
578
589
  throw new Error(`Expected one of ${VERBS.join(", ")}, was ${verbs.join(" and ")}\n${USAGE}`);
579
590
  }
580
591
  let verb = verbs[0];
581
- let [host, ...rest] = argv.filter(arg => arg !== verb);
582
- if (!host) {
583
- throw new Error(`Expected a host, was nothing\n${USAGE}`);
584
- }
585
- return { verb, host, rest };
592
+ let positional = argv.filter(arg => arg !== verb);
593
+ // A host, when there is one, comes first and is a bare name or address. Everything else that
594
+ // can appear here is a path or a repo url, and those all carry a slash, which is what tells
595
+ // them apart. So no host at all means this machine.
596
+ let host = THIS_MACHINE;
597
+ if (positional.length && !/[\/~\\]/.test(positional[0])) {
598
+ host = positional[0];
599
+ positional = positional.slice(1);
600
+ }
601
+ return { verb, host, rest: positional };
586
602
  }
587
603
 
588
604
  export async function main() {
@@ -4,17 +4,20 @@ import path from "path";
4
4
  import { runPromise } from "socket-function/src/runPromise";
5
5
  import { keyFingerprint, normalizeKeys } from "./authorizedKeys";
6
6
  import { revokeRepoURL } from "./revokeSource";
7
+ import { signRepo } from "../signedFiles/signFiles";
7
8
  import { readRepoKeys } from "./authorizedKeys";
8
9
  import { expandHome } from "../helpers/paths";
9
10
  import { spawnPromise } from "../helpers/spawn";
10
11
 
11
12
  const UNREVOKES_DIR = "unrevoked";
12
13
  const REVOCATIONS_DIR = "revocations";
13
- const USAGE = `Usage: yarn unrevoke [keys-repo]
14
+ const GIT_KEYWORD = "git";
15
+ const COMMIT_MESSAGE = "unrevoke keys";
16
+ const USAGE = `Usage: yarn unrevoke [keys-repo] [${GIT_KEYWORD}]
14
17
 
15
18
  Run this in a keys repo, or name one. It reads that repo's revoke repo and writes one unrevoke file
16
19
  naming every revocation in it, so the keys are accepted again once each machine's hour long wait
17
- passes.
20
+ passes. It signs the result, and with ${GIT_KEYWORD} it commits and pushes it too.
18
21
 
19
22
  Keys that were revoked should normally be deleted from the repo instead. Unrevoking only matters
20
23
  for a key you still want.`;
@@ -92,17 +95,24 @@ export async function revokedKeysInRepo(config: { repoPath: string; sourceURL: s
92
95
  repo that actually holds keys and has an origin to clone from. */
93
96
  async function resolveKeysRepo(named: string | undefined) {
94
97
  let cwd = named && expandHome(named) || undefined;
95
- let repoPath = (await runPromise("git rev-parse --show-toplevel", { quiet: true, cwd })).trim();
96
- if (!repoPath) {
97
- throw new Error(`Expected ${named || "the current directory"} to be inside a git repo, it is not.\n${USAGE}`);
98
+ // spawnPromise rather than runPromise, because these two are read for their value. runPromise
99
+ // returns stdout and stderr joined, so one git warning ends up glued to the front of the path.
100
+ let topLevel = await spawnPromise({ command: "git", args: ["rev-parse", "--show-toplevel"], cwd });
101
+ let repoPath = topLevel.stdout.trim();
102
+ if (topLevel.status !== 0 || !repoPath) {
103
+ throw new Error(
104
+ `Expected ${named || "the current directory"} to be inside a git repo, it is not.\n`
105
+ + `${(topLevel.stdout + topLevel.stderr).trim()}\n${USAGE}`
106
+ );
98
107
  }
99
108
  try {
100
109
  await readRepoKeys(repoPath);
101
110
  } catch (e) {
102
111
  throw new Error(`Expected ${repoPath} to be a keys repo, it holds no keys.\n${e}\n${USAGE}`);
103
112
  }
104
- let originURL = (await runPromise("git remote get-url origin", { quiet: true, cwd: repoPath })).trim();
105
- if (!originURL) {
113
+ let origin = await spawnPromise({ command: "git", args: ["remote", "get-url", "origin"], cwd: repoPath });
114
+ let originURL = origin.stdout.trim();
115
+ if (origin.status !== 0 || !originURL) {
106
116
  throw new Error(`Expected ${repoPath} to have an origin remote, it has none.\n${USAGE}`);
107
117
  }
108
118
  return { repoPath, originURL };
@@ -110,10 +120,12 @@ async function resolveKeysRepo(named: string | undefined) {
110
120
 
111
121
  export async function main() {
112
122
  let argv = process.argv.slice(2);
113
- if (argv.length > 1) {
114
- throw new Error(`Expected at most a keys repo, was ${argv.length} argument(s)\n${USAGE}`);
123
+ let pushToGit = argv.includes(GIT_KEYWORD);
124
+ let positional = argv.filter(arg => arg !== GIT_KEYWORD);
125
+ if (positional.length > 1) {
126
+ throw new Error(`Expected at most a keys repo, was ${positional.length} argument(s)\n${USAGE}`);
115
127
  }
116
- let { repoPath, originURL } = await resolveKeysRepo(argv[0]);
128
+ let { repoPath, originURL } = await resolveKeysRepo(positional[0]);
117
129
 
118
130
  let revocations = await readRemoteRevocations({ sourceURL: originURL });
119
131
  if (!revocations.length) {
@@ -144,6 +156,20 @@ export async function main() {
144
156
  for (let revocation of revocations) {
145
157
  console.log(` ${revocation.fingerprint} revoked by ${revocation.revokedBy || "?"} from ${revocation.attempt?.ip || "?"}`);
146
158
  }
147
- console.log(`Each machine waits an hour after seeing it before the keys work again.`);
148
- console.log(`Sign and publish it with:\n yarn signfiles git`);
159
+
160
+ // Signed here rather than left as a step to remember. An unrevoke nobody signed does nothing at
161
+ // all, and the repo would sit there looking done while every machine ignored it.
162
+ await signRepo({ repoPath });
163
+
164
+ if (!pushToGit) {
165
+ console.log(`\nCommit and push it, and each machine will wait an hour after seeing it before`);
166
+ console.log(`those keys work again:`);
167
+ console.log(`\`\`\`\ngit add -A\ngit commit -m "${COMMIT_MESSAGE}"\ngit push\n\`\`\``);
168
+ return;
169
+ }
170
+ await runPromise(`git add -A`, { cwd: repoPath });
171
+ await runPromise(`git commit -m "${COMMIT_MESSAGE}"`, { cwd: repoPath });
172
+ await runPromise(`git push`, { cwd: repoPath });
173
+ console.log(`\nCommitted and pushed. Each machine waits an hour after seeing it before those`);
174
+ console.log(`keys work again.`);
149
175
  }
@@ -8,28 +8,39 @@ const MAX_ERROR_BODY_LENGTH = 500;
8
8
  // /etc is root owned, so fall back to sudo whenever the SSH user is not root.
9
9
  export const SUDO_PREAMBLE = `SUDO=""; if [ "$(id -u)" -ne 0 ]; then SUDO="sudo -n"; fi`;
10
10
 
11
+ /** No host means this machine, so the very same script runs with nothing in front of it. Local and
12
+ remote then do exactly the same thing, rather than being two pieces of code that have to be kept
13
+ saying the same thing. */
14
+ export const THIS_MACHINE = "";
15
+
16
+ export function describeHost(host: string) {
17
+ return host || "this machine";
18
+ }
19
+
11
20
  /** The host string is handed to ssh untouched. Users, keys and ports belong in the caller's ssh
12
21
  config, so BatchMode makes a missing setup fail immediately instead of prompting. */
13
22
  export async function runOverSSH(config: { host: string; script: string; input?: string; allowFailure?: boolean }) {
14
23
  let { host, script, input, allowFailure } = config;
15
24
  let result = await spawnPromise({
16
- command: "ssh",
17
- args: [
25
+ command: host && "ssh" || "sh",
26
+ args: host && [
18
27
  "-o", "BatchMode=yes",
19
28
  "-o", `ConnectTimeout=${SSH_CONNECT_TIMEOUT}`,
20
29
  host,
21
30
  script,
22
- ],
31
+ ] || ["-c", script],
23
32
  input,
24
33
  inheritStderr: !allowFailure,
25
34
  });
26
35
  if (result.error) {
27
- throw new Error(`Expected ssh to run against ${host}, failed with ${result.error.message}`);
36
+ throw new Error(`Expected to run against ${describeHost(host)}, failed with ${result.error.message}`);
28
37
  }
29
38
  if (result.status !== 0 && !allowFailure) {
39
+ let advice = host
40
+ && ` Non-interactive ssh access to ${host} has to work on its own - fix it in your ssh config.`
41
+ || "";
30
42
  throw new Error(
31
- `Expected ssh to ${host} to exit 0, was ${result.status}.`
32
- + ` Non-interactive ssh access to ${host} has to work on its own - fix it in your ssh config.\n`
43
+ `Expected the script on ${describeHost(host)} to exit 0, was ${result.status}.${advice}\n`
33
44
  + `${(result.stdout + result.stderr).trim().slice(0, MAX_ERROR_BODY_LENGTH)}`
34
45
  );
35
46
  }
@@ -72,8 +72,25 @@ async function readWebhookFile(filePath: string) {
72
72
  return parseWebhookFile({ contents, sourceName: filePath });
73
73
  }
74
74
 
75
+ /** When the message was sent, in the sending machine's own time zone. Discord shows when it
76
+ received something, which is not the same thing when a machine has been offline or a send has
77
+ been retried, and the zone matters when the machines are not all in one place. */
78
+ export function messageTimestamp(now: Date) {
79
+ let date = now.toLocaleDateString("en-CA");
80
+ let time = now.toLocaleTimeString("en-US", {
81
+ hour: "2-digit",
82
+ minute: "2-digit",
83
+ second: "2-digit",
84
+ hour12: true,
85
+ timeZoneName: "short",
86
+ });
87
+ return `${date} ${time}`;
88
+ }
89
+
75
90
  async function postToWebhook(webhookURL: string, message: string) {
76
- let content = message;
91
+ // Stamped once rather than per attempt, so a retry says when the thing happened rather than
92
+ // when we last managed to get it out.
93
+ let content = `\`${messageTimestamp(new Date())}\` ${message}`;
77
94
  if (content.length > DISCORD_MESSAGE_LIMIT) {
78
95
  content = content.slice(0, DISCORD_MESSAGE_LIMIT - 3) + "...";
79
96
  }
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
6
- //exports.stopDiscordNotifications = exports.sendDiscordNotification = exports.configureDiscordNotifications = exports.sendToWebhookURL = exports.formatWebhookFile = exports.redactWebhookURL = exports.parseWebhookFile = exports.DEFAULT_WEBHOOK_FILE_PATH = void 0;
6
+ //exports.stopDiscordNotifications = exports.sendDiscordNotification = exports.configureDiscordNotifications = exports.sendToWebhookURL = exports.messageTimestamp = exports.formatWebhookFile = exports.redactWebhookURL = exports.parseWebhookFile = exports.DEFAULT_WEBHOOK_FILE_PATH = void 0;
7
7
  const promises_1 = __importDefault(require("fs/promises"));
8
8
  // PORTED CODE: security/authorizedKeys/daemon/portsecureDaemon.js embeds a hand port of this file in plain JS, so the
9
9
  // daemon can run with no dependencies. The two are expected to behave identically - if you change
@@ -67,8 +67,25 @@ async function readWebhookFile(filePath) {
67
67
  }
68
68
  return parseWebhookFile({ contents, sourceName: filePath });
69
69
  }
70
+ /** When the message was sent, in the sending machine's own time zone. Discord shows when it
71
+ received something, which is not the same thing when a machine has been offline or a send has
72
+ been retried, and the zone matters when the machines are not all in one place. */
73
+ function messageTimestamp(now) {
74
+ let date = now.toLocaleDateString("en-CA");
75
+ let time = now.toLocaleTimeString("en-US", {
76
+ hour: "2-digit",
77
+ minute: "2-digit",
78
+ second: "2-digit",
79
+ hour12: true,
80
+ timeZoneName: "short",
81
+ });
82
+ return `${date} ${time}`;
83
+ }
84
+ exports.messageTimestamp = messageTimestamp;
70
85
  async function postToWebhook(webhookURL, message) {
71
- let content = message;
86
+ // Stamped once rather than per attempt, so a retry says when the thing happened rather than
87
+ // when we last managed to get it out.
88
+ let content = `\`${messageTimestamp(new Date())}\` ${message}`;
72
89
  if (content.length > DISCORD_MESSAGE_LIMIT) {
73
90
  content = content.slice(0, DISCORD_MESSAGE_LIMIT - 3) + "...";
74
91
  }
@@ -176,5 +193,5 @@ function stopDiscordNotifications() {
176
193
  notificationState = undefined;
177
194
  }
178
195
  exports.stopDiscordNotifications = stopDiscordNotifications;
179
- //# 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\nasync function postToWebhook(webhookURL: string, message: string) {\n    let content = message;\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**: the Discord webhook in \\`${state.filePath}\\` changed to`\n            + ` \\`${redactWebhookURL(newWebhookURL)}\\`.`\n            + ` Notifications are moving to the new webhook and this channel will stop receiving them.`\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\nexport function stopDiscordNotifications() {\n    if (!notificationState) {\n        return;\n    }\n    clearInterval(notificationState.checkTimer);\n    notificationState = undefined;\n}\n"]}
180
- /* _JS_SOURCE_HASH = "d5d1b1a9e262cd5b805adb2fa7d074d1a92e9a99dd226550e7f055a9766ebd19"; */
196
+ //# 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.\n    let content = `\\`${messageTimestamp(new Date())}\\` ${message}`;\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**: the Discord webhook in \\`${state.filePath}\\` changed to`\n            + ` \\`${redactWebhookURL(newWebhookURL)}\\`.`\n            + ` Notifications are moving to the new webhook and this channel will stop receiving them.`\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\nexport function stopDiscordNotifications() {\n    if (!notificationState) {\n        return;\n    }\n    clearInterval(notificationState.checkTimer);\n    notificationState = undefined;\n}\n"]}
197
+ /* _JS_SOURCE_HASH = "be450922cec9e8a268e2a78f817bfedb88063a0b59db5b1a954d81c96169543a"; */
@@ -1,16 +1,25 @@
1
1
  import { parseWebhookFile } from "./discord";
2
2
  import { ensureRemoteWebhook, REPLACE_KEYWORD } from "./remoteWebhook";
3
+ import { describeHost, THIS_MACHINE } from "../helpers/remoteSSH";
3
4
 
4
- const USAGE = `Usage: yarn setupnotify <host> <discord-webhook-url> [${REPLACE_KEYWORD}]`;
5
+ const USAGE = `Usage: yarn setupnotify [host] <discord-webhook-url> [${REPLACE_KEYWORD}]
6
+
7
+ With no host it sets the webhook up on this machine.`;
5
8
 
6
9
  function parseArgs(argv: string[]) {
7
10
  let replace = argv.includes(REPLACE_KEYWORD);
8
11
  let positional = argv.filter(arg => arg !== REPLACE_KEYWORD);
9
- if (positional.length !== 2) {
10
- throw new Error(`Expected a host and a webhook URL, was ${positional.length} argument(s): ${positional.join(" ") || "(none)"}\n${USAGE}`);
12
+ if (!positional.length || positional.length > 2) {
13
+ throw new Error(
14
+ `Expected a webhook URL, and optionally a host before it, was ${positional.length}`
15
+ + ` argument(s): ${positional.join(" ") || "(none)"}\n${USAGE}`
16
+ );
11
17
  }
12
- let [host, webhookURL] = positional;
13
- // Validates the URL shape up front, so we never ssh anywhere with a bad webhook.
18
+ // The webhook url is the last one, so whatever comes before it is the host. Without one this
19
+ // machine is the target.
20
+ let webhookURL = positional[positional.length - 1];
21
+ let host = positional.length > 1 && positional[0] || THIS_MACHINE;
22
+ // Validates the URL shape up front, so we never go anywhere with a bad webhook.
14
23
  parseWebhookFile({ contents: webhookURL, sourceName: "the command line" });
15
24
  return { host, webhookURL, replace };
16
25
  }
@@ -19,11 +28,11 @@ export async function main() {
19
28
  let { host, webhookURL, replace } = parseArgs(process.argv.slice(2));
20
29
  let { outcome, filePath } = await ensureRemoteWebhook({ host, webhookURL, replace });
21
30
  if (outcome === "unchanged") {
22
- console.log(`${host} already has this exact webhook in ${filePath}, nothing to do.`);
31
+ console.log(`${describeHost(host)} already has this exact webhook in ${filePath}, nothing to do.`);
23
32
  return;
24
33
  }
25
34
  if (outcome === "replaced") {
26
- console.log(`Replaced the webhook on ${host} and notified the old one.`);
35
+ console.log(`Replaced the webhook on ${describeHost(host)} and notified the old one.`);
27
36
  }
28
- console.log(`Wrote ${filePath} on ${host} (mode 600), and confirmed on the new webhook.`);
37
+ console.log(`Wrote ${filePath} on ${describeHost(host)} (mode 600), and confirmed on the new webhook.`);
29
38
  }