sliftutils 1.7.127 → 1.7.129
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.
- package/bin/addmachine.js +9 -0
- package/bin/machineclient.js +9 -0
- package/bin/machineserver.js +10 -0
- package/index.d.ts +15 -0
- package/misc/dist/ownIPs.ts.cache +43 -0
- package/misc/dist/strings.ts.cache +2 -2
- package/misc/https/dist/certs.ts.cache +2 -2
- package/misc/https/dist/persistentLocalStorage.ts.cache +2 -2
- package/misc/ownIPs.d.ts +11 -0
- package/misc/ownIPs.ts +34 -0
- package/package.json +9 -3
- package/security/authorizedKeys/authorizedKeys.ts +34 -0
- package/security/authorizedKeys/daemon/authLog.ts +12 -5
- package/security/authorizedKeys/daemon/changes.ts +16 -1
- package/security/authorizedKeys/daemon/daemon.ts +50 -40
- package/security/authorizedKeys/daemon/dist/changes.ts.cache +40 -0
- package/security/authorizedKeys/daemon/dist/git.ts.cache +121 -0
- package/security/authorizedKeys/daemon/dist/notify.ts.cache +39 -0
- package/security/authorizedKeys/daemon/dist/paths.ts.cache +29 -0
- package/security/authorizedKeys/daemon/dist/repoFiles.ts.cache +114 -0
- package/security/authorizedKeys/daemon/dist/revocation.ts.cache +0 -0
- package/security/authorizedKeys/daemon/dist/sessions.ts.cache +147 -0
- package/security/authorizedKeys/daemon/dist/state.ts.cache +74 -0
- package/security/authorizedKeys/daemon/dist/trust.ts.cache +295 -0
- package/security/authorizedKeys/daemon/git.ts +3 -3
- package/security/authorizedKeys/daemon/notify.ts +8 -2
- package/security/authorizedKeys/daemon/repoFiles.ts +118 -0
- package/security/authorizedKeys/daemon/revocation.ts +0 -0
- package/security/authorizedKeys/daemon/rootKeys.ts +77 -10
- package/security/authorizedKeys/daemon/state.ts +25 -7
- package/security/authorizedKeys/daemon/trust.ts +37 -16
- package/security/authorizedKeys/daemon/userKeys.ts +5 -4
- package/security/authorizedKeys/dist/authorizedKeys.ts.cache +37 -3
- package/security/authorizedKeys/dist/revokeSource.ts.cache +17 -4
- package/security/authorizedKeys/dist/sources.ts.cache +52 -8
- package/security/authorizedKeys/dist/unrevoke.ts.cache +113 -17
- package/security/authorizedKeys/revokeSource.ts +12 -2
- package/security/authorizedKeys/secureSSH.ts +66 -12
- package/security/authorizedKeys/sources.ts +47 -5
- package/security/authorizedKeys/unrevoke.ts +176 -16
- package/security/helpers/dist/remoteSSH.ts.cache +19 -9
- package/security/machines/addMachine.ts +83 -0
- package/security/machines/dist/addMachine.ts.cache +88 -0
- package/security/machines/dist/identity.ts.cache +176 -0
- package/security/machines/dist/machines.ts.cache +322 -0
- package/security/machines/dist/trustClient.ts.cache +48 -0
- package/security/machines/dist/trustState.ts.cache +57 -0
- package/security/machines/identity.ts +199 -0
- package/security/machines/machines.ts +355 -0
- package/security/machines/trustClient.ts +51 -0
- package/security/machines/trustServer.ts +85 -0
- package/security/machines/trustState.ts +53 -0
- package/security/notifications/discord.ts +14 -5
- package/security/notifications/dist/discord.ts.cache +17 -8
|
@@ -2,12 +2,14 @@ import fs from "fs/promises";
|
|
|
2
2
|
import os from "os";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import { runPromise } from "socket-function/src/runPromise";
|
|
5
|
-
import { keyFingerprint, normalizeKeys } from "./authorizedKeys";
|
|
6
|
-
import { revokeRepoURL } from "./revokeSource";
|
|
5
|
+
import { allowAddresses, keyFingerprint, normalizeKeys, summarizeKey } from "./authorizedKeys";
|
|
6
|
+
import { deriveRevokeKey, revokeRepoURL } from "./revokeSource";
|
|
7
|
+
import { findSourceKey } from "./sources";
|
|
7
8
|
import { signRepo } from "../signedFiles/signFiles";
|
|
8
9
|
import { readRepoKeys } from "./authorizedKeys";
|
|
9
10
|
import { expandHome } from "../helpers/paths";
|
|
10
11
|
import { spawnPromise } from "../helpers/spawn";
|
|
12
|
+
import { machineState } from "../machines/machines";
|
|
11
13
|
|
|
12
14
|
const UNREVOKES_DIR = "unrevoked";
|
|
13
15
|
const REVOCATIONS_DIR = "revocations";
|
|
@@ -22,26 +24,54 @@ passes. It signs the result, and with ${GIT_KEYWORD} it commits and pushes it to
|
|
|
22
24
|
Keys that were revoked should normally be deleted from the repo instead. Unrevoking only matters
|
|
23
25
|
for a key you still want.`;
|
|
24
26
|
|
|
27
|
+
/** One revocation event. Either an ssh key used from an address it is not allowed from, or a
|
|
28
|
+
machine that talked to us from one. Both are the same shape - an identity and an address - and
|
|
29
|
+
an unrevoke undoes either by allowing that same pair.
|
|
30
|
+
|
|
31
|
+
Which is why unrevoking never makes anything unrevokable: used from some other address, it is
|
|
32
|
+
revoked again, under a new id no existing unrevoke names. */
|
|
25
33
|
export type Revocation = {
|
|
26
34
|
revocationId: string;
|
|
27
|
-
fingerprint
|
|
35
|
+
// Exactly one of these. A key revocation names a fingerprint, a machine revocation a machineId.
|
|
36
|
+
fingerprint?: string;
|
|
37
|
+
machineId?: string;
|
|
38
|
+
ip?: string;
|
|
28
39
|
key?: string;
|
|
29
40
|
revokedAt?: string;
|
|
30
41
|
revokedBy?: string;
|
|
42
|
+
reason?: string;
|
|
31
43
|
attempt?: { ip?: string; user?: string; required?: string };
|
|
32
44
|
};
|
|
33
45
|
|
|
34
|
-
/**
|
|
35
|
-
|
|
36
|
-
|
|
46
|
+
/** Older revocation files carry the address under attempt only. */
|
|
47
|
+
export function revocationIP(revocation: Revocation) {
|
|
48
|
+
return revocation.ip || revocation.attempt?.ip || "";
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** What the revocation is about, which is what an unrevoke has to name to undo it. */
|
|
52
|
+
export function revocationIdentity(revocation: Revocation) {
|
|
53
|
+
return revocation.fingerprint || revocation.machineId || "";
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** Every revocation the revoke repo lists. Cloned read only into a temp directory.
|
|
57
|
+
|
|
58
|
+
A person running this has their own access to the repo, so their credentials are what is used.
|
|
59
|
+
On a machine that is already a portsecure host there may be no such credentials, but the source
|
|
60
|
+
deploy key is right there, and the key derived from it is one that repo definitely accepts. */
|
|
37
61
|
export async function readRemoteRevocations(config: { sourceURL: string }) {
|
|
38
62
|
let { sourceURL } = config;
|
|
39
63
|
let temporaryDirectory = await fs.mkdtemp(path.join(os.tmpdir(), "unrevoke-"));
|
|
40
64
|
let repoPath = path.join(temporaryDirectory, "repo");
|
|
41
|
-
let
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
65
|
+
let cloneArgs = ["clone", "--depth", "1", revokeRepoURL(sourceURL), repoPath];
|
|
66
|
+
let sourceKey = await findSourceKey(sourceURL);
|
|
67
|
+
if (sourceKey) {
|
|
68
|
+
let derived = deriveRevokeKey(await fs.readFile(sourceKey, "utf8"));
|
|
69
|
+
let derivedKeyPath = path.join(temporaryDirectory, "key");
|
|
70
|
+
await fs.writeFile(derivedKeyPath, derived.privateKeyFile, { mode: 0o600 });
|
|
71
|
+
let sshCommand = `ssh -i ${derivedKeyPath} -o IdentitiesOnly=yes -o BatchMode=yes -o StrictHostKeyChecking=accept-new`;
|
|
72
|
+
cloneArgs = ["-c", `core.sshCommand=${sshCommand}`, ...cloneArgs];
|
|
73
|
+
}
|
|
74
|
+
let clone = await spawnPromise({ command: "git", args: cloneArgs });
|
|
45
75
|
if (clone.status !== 0) {
|
|
46
76
|
await fs.rm(temporaryDirectory, { recursive: true, force: true });
|
|
47
77
|
throw new Error(
|
|
@@ -77,6 +107,10 @@ export async function revokedKeysInRepo(config: { repoPath: string; sourceURL: s
|
|
|
77
107
|
continue;
|
|
78
108
|
}
|
|
79
109
|
let parsed = JSON.parse(await fs.readFile(path.join(directory, name), "utf8"));
|
|
110
|
+
for (let allowed of parsed.allowed || []) {
|
|
111
|
+
unrevoked.add(`${allowed.fingerprint || allowed.machineId} ${allowed.ip}`);
|
|
112
|
+
}
|
|
113
|
+
// Named ids, for the unrevokes written before this was about pairs.
|
|
80
114
|
for (let revocationId of parsed.revocationIds || []) {
|
|
81
115
|
unrevoked.add(revocationId);
|
|
82
116
|
}
|
|
@@ -84,13 +118,84 @@ export async function revokedKeysInRepo(config: { repoPath: string; sourceURL: s
|
|
|
84
118
|
} catch (e) {
|
|
85
119
|
// Nothing has been unrevoked.
|
|
86
120
|
}
|
|
87
|
-
let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId)
|
|
121
|
+
let stillRevoked = revocations.filter(revocation => !unrevoked.has(revocation.revocationId)
|
|
122
|
+
&& !unrevoked.has(`${revocation.fingerprint} ${revocationIP(revocation)}`));
|
|
88
123
|
let keys = normalizeKeys(await fs.readFile(path.join(repoPath, "authorized_keys"), "utf8").catch(() => ""));
|
|
89
124
|
return stillRevoked
|
|
90
125
|
.filter(revocation => keys.some(key => keyFingerprint(key) === revocation.fingerprint))
|
|
91
126
|
.map(revocation => ({ revocation, key: keys.find(key => keyFingerprint(key) === revocation.fingerprint) || "" }));
|
|
92
127
|
}
|
|
93
128
|
|
|
129
|
+
/** Writes the addresses into the from= list of each key in the repo's authorized_keys, and says
|
|
130
|
+
which ones were actually new. Only the lines being changed are touched, so comments, ordering
|
|
131
|
+
and any key not involved come out of this byte for byte the same. */
|
|
132
|
+
async function allowAddressesInRepo(config: {
|
|
133
|
+
repoPath: string;
|
|
134
|
+
addressesByFingerprint: Map<string, string[]>;
|
|
135
|
+
}) {
|
|
136
|
+
let { repoPath, addressesByFingerprint } = config;
|
|
137
|
+
let added = new Map<string, string[]>();
|
|
138
|
+
let filePath = path.join(repoPath, "authorized_keys");
|
|
139
|
+
let contents;
|
|
140
|
+
try {
|
|
141
|
+
contents = await fs.readFile(filePath, "utf8");
|
|
142
|
+
} catch (e) {
|
|
143
|
+
// A repo holding its keys as separate .pub files. Nothing to edit in one place, so the
|
|
144
|
+
// caller's listing is all whoever ran this gets.
|
|
145
|
+
console.log(`No authorized_keys in ${repoPath}, so the addresses were not added to any key.`);
|
|
146
|
+
return added;
|
|
147
|
+
}
|
|
148
|
+
let lines = contents.split("\n");
|
|
149
|
+
for (let index = 0; index < lines.length; index++) {
|
|
150
|
+
let fingerprint = keyFingerprint(lines[index]);
|
|
151
|
+
let addresses = fingerprint && addressesByFingerprint.get(fingerprint);
|
|
152
|
+
if (!addresses || !addresses.length) {
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
let result = allowAddresses(lines[index], addresses);
|
|
156
|
+
lines[index] = result.keyLine;
|
|
157
|
+
added.set(fingerprint, [...(added.get(fingerprint) || []), ...result.added]);
|
|
158
|
+
}
|
|
159
|
+
if ([...added.values()].some(list => list.length)) {
|
|
160
|
+
await fs.writeFile(filePath, lines.join("\n"));
|
|
161
|
+
}
|
|
162
|
+
return added;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/** Puts each machine's addresses back into its own file, which is the machine equivalent of adding
|
|
166
|
+
an address to a key's from= list: without it the machine is allowed again in principle and
|
|
167
|
+
still rejected on sight, which revokes it once more. */
|
|
168
|
+
async function allowAddressesForMachines(config: { repoPath: string; revocations: Revocation[] }) {
|
|
169
|
+
let { repoPath, revocations } = config;
|
|
170
|
+
let added = new Map<string, string[]>();
|
|
171
|
+
// Read the whole list, change what these revocations are about, write it back. Setting is by
|
|
172
|
+
// the whole set, so writing one machine at a time would delete every other machine.
|
|
173
|
+
let machines = await machineState({ repoPath });
|
|
174
|
+
for (let revocation of revocations) {
|
|
175
|
+
let machineId = revocation.machineId;
|
|
176
|
+
let ip = revocationIP(revocation);
|
|
177
|
+
if (!machineId || !ip) {
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
let existing = machines.find(machine => machine.machineId === machineId);
|
|
181
|
+
if (!existing) {
|
|
182
|
+
// Removed from the repo since it was revoked, so there is nothing to allow. Deleting a
|
|
183
|
+
// machine is the stronger statement and it stands.
|
|
184
|
+
console.log(`machines/${machineId}.json is not in this repo, so ${ip} was not added to it`);
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
if (existing.ips.includes(ip)) {
|
|
188
|
+
continue;
|
|
189
|
+
}
|
|
190
|
+
existing.ips = [...existing.ips, ip];
|
|
191
|
+
added.set(machineId, [...(added.get(machineId) || []), ip]);
|
|
192
|
+
}
|
|
193
|
+
if (added.size) {
|
|
194
|
+
await machineState({ repoPath, machines });
|
|
195
|
+
}
|
|
196
|
+
return added;
|
|
197
|
+
}
|
|
198
|
+
|
|
94
199
|
/** The repo named, or the one we are standing in. Checked the same way securessh checks it: a git
|
|
95
200
|
repo that actually holds keys and has an origin to clone from. */
|
|
96
201
|
async function resolveKeysRepo(named: string | undefined) {
|
|
@@ -140,22 +245,77 @@ export async function main() {
|
|
|
140
245
|
await fs.writeFile(path.join(directory, `${unrevokeId}.json`), JSON.stringify({
|
|
141
246
|
unrevokeId,
|
|
142
247
|
createdAt: new Date().toISOString(),
|
|
143
|
-
//
|
|
144
|
-
//
|
|
145
|
-
|
|
248
|
+
// What this file says: each of these keys is allowed from this address. Pairs, not keys,
|
|
249
|
+
// and not a blanket "allow everything again" - a key forgiven here for one address is
|
|
250
|
+
// still revoked the moment it is used from another.
|
|
251
|
+
allowed: revocations.map(revocation => ({
|
|
252
|
+
fingerprint: revocation.fingerprint,
|
|
253
|
+
machineId: revocation.machineId,
|
|
254
|
+
ip: revocationIP(revocation),
|
|
255
|
+
})),
|
|
146
256
|
revocations: revocations.map(revocation => ({
|
|
147
257
|
revocationId: revocation.revocationId,
|
|
148
258
|
fingerprint: revocation.fingerprint,
|
|
259
|
+
machineId: revocation.machineId,
|
|
260
|
+
ip: revocationIP(revocation),
|
|
149
261
|
revokedAt: revocation.revokedAt,
|
|
150
262
|
revokedBy: revocation.revokedBy,
|
|
151
263
|
attempt: revocation.attempt,
|
|
152
264
|
})),
|
|
153
265
|
}, undefined, 4) + "\n");
|
|
154
266
|
|
|
155
|
-
|
|
267
|
+
// Named the way the notifications name them. A fingerprint is not in authorized_keys and
|
|
268
|
+
// cannot be worked out by eye, so on its own it tells whoever is reading this nothing about
|
|
269
|
+
// which of their keys is being talked about.
|
|
270
|
+
let keysByFingerprint = new Map<string, string>();
|
|
271
|
+
for (let key of await readRepoKeys(repoPath).catch(() => [] as string[])) {
|
|
272
|
+
keysByFingerprint.set(keyFingerprint(key), key);
|
|
273
|
+
}
|
|
274
|
+
let describeKey = (revocation: Revocation) => {
|
|
275
|
+
let key = keysByFingerprint.get(revocation.fingerprint || "") || revocation.key || "";
|
|
276
|
+
return key && summarizeKey(key) || `a key no longer in this repo (${revocation.fingerprint})`;
|
|
277
|
+
};
|
|
278
|
+
|
|
279
|
+
let addressesByIdentity = new Map<string, string[]>();
|
|
156
280
|
for (let revocation of revocations) {
|
|
157
|
-
|
|
281
|
+
let ip = revocationIP(revocation);
|
|
282
|
+
let identity = revocationIdentity(revocation);
|
|
283
|
+
let existing = addressesByIdentity.get(identity) || [];
|
|
284
|
+
if (ip && !existing.includes(ip)) {
|
|
285
|
+
existing.push(ip);
|
|
286
|
+
}
|
|
287
|
+
addressesByIdentity.set(identity, existing);
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
// Cancelling the revocation on its own would leave sshd refusing that address, and the machines
|
|
291
|
+
// revoking all over again, so the addresses go into the key's from= list and into the machine's
|
|
292
|
+
// own file here. We are in the repo that owns both, so there is nothing to hand back to whoever
|
|
293
|
+
// ran this.
|
|
294
|
+
let added = await allowAddressesInRepo({ repoPath, addressesByFingerprint: addressesByIdentity });
|
|
295
|
+
let addedForMachines = await allowAddressesForMachines({ repoPath, revocations });
|
|
296
|
+
|
|
297
|
+
console.log("");
|
|
298
|
+
for (let [identity, addresses] of addressesByIdentity) {
|
|
299
|
+
let entries = revocations.filter(entry => revocationIdentity(entry) === identity);
|
|
300
|
+
let machineId = entries[0].machineId;
|
|
301
|
+
console.log(`Unfreezing ${machineId && `machine ${machineId}` || describeKey(entries[0])}`);
|
|
302
|
+
console.log(`Allowing IP ${addresses.join(", ") || "(no address recorded)"}`);
|
|
303
|
+
let addedHere = machineId && addedForMachines.get(machineId) || added.get(identity) || [];
|
|
304
|
+
if (addedHere.length) {
|
|
305
|
+
let where = machineId && `machines/${machineId}.json` || `that key's from= list in authorized_keys`;
|
|
306
|
+
console.log(` added to ${where}: ${addedHere.join(", ")}`);
|
|
307
|
+
} else {
|
|
308
|
+
console.log(` already allowed from ${addresses.join(", ") || "everywhere"}`);
|
|
309
|
+
}
|
|
310
|
+
for (let entry of entries) {
|
|
311
|
+
console.log(
|
|
312
|
+
` frozen by ${entry.revokedBy || "?"} ${entry.revokedAt || "at an unrecorded time"}`
|
|
313
|
+
);
|
|
314
|
+
}
|
|
315
|
+
console.log("");
|
|
158
316
|
}
|
|
317
|
+
console.log(`Every other address stays frozen, and any of these used from anywhere else is`);
|
|
318
|
+
console.log(`frozen again.`);
|
|
159
319
|
|
|
160
320
|
// Signed here rather than left as a step to remember. An unrevoke nobody signed does nothing at
|
|
161
321
|
// all, and the repo would sit there looking done while every machine ignored it.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
|
|
3
|
-
//exports.remoteCommandExists = exports.writeRemoteFile = exports.readRemoteFile = exports.runOverSSH = exports.SUDO_PREAMBLE = void 0;
|
|
3
|
+
//exports.remoteCommandExists = exports.writeRemoteFile = exports.readRemoteFile = exports.runOverSSH = exports.describeHost = exports.THIS_MACHINE = exports.SUDO_PREAMBLE = void 0;
|
|
4
4
|
const spawn_1 = require("./spawn");
|
|
5
5
|
const SSH_CONNECT_TIMEOUT = 10;
|
|
6
6
|
const EXISTS_MARKER = "__PORTSECURE_EXISTS__";
|
|
@@ -8,27 +8,37 @@ const MISSING_MARKER = "__PORTSECURE_MISSING__";
|
|
|
8
8
|
const MAX_ERROR_BODY_LENGTH = 500;
|
|
9
9
|
// /etc is root owned, so fall back to sudo whenever the SSH user is not root.
|
|
10
10
|
exports.SUDO_PREAMBLE = `SUDO=""; if [ "$(id -u)" -ne 0 ]; then SUDO="sudo -n"; fi`;
|
|
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
|
+
exports.THIS_MACHINE = "";
|
|
15
|
+
function describeHost(host) {
|
|
16
|
+
return host || "this machine";
|
|
17
|
+
}
|
|
18
|
+
exports.describeHost = describeHost;
|
|
11
19
|
/** The host string is handed to ssh untouched. Users, keys and ports belong in the caller's ssh
|
|
12
20
|
config, so BatchMode makes a missing setup fail immediately instead of prompting. */
|
|
13
21
|
async function runOverSSH(config) {
|
|
14
22
|
let { host, script, input, allowFailure } = config;
|
|
15
23
|
let result = await (0, spawn_1.spawnPromise)({
|
|
16
|
-
command: "ssh",
|
|
17
|
-
args: [
|
|
24
|
+
command: host && "ssh" || "sh",
|
|
25
|
+
args: host && [
|
|
18
26
|
"-o", "BatchMode=yes",
|
|
19
27
|
"-o", `ConnectTimeout=${SSH_CONNECT_TIMEOUT}`,
|
|
20
28
|
host,
|
|
21
29
|
script,
|
|
22
|
-
],
|
|
30
|
+
] || ["-c", script],
|
|
23
31
|
input,
|
|
24
32
|
inheritStderr: !allowFailure,
|
|
25
33
|
});
|
|
26
34
|
if (result.error) {
|
|
27
|
-
throw new Error(`Expected
|
|
35
|
+
throw new Error(`Expected to run against ${describeHost(host)}, failed with ${result.error.message}`);
|
|
28
36
|
}
|
|
29
37
|
if (result.status !== 0 && !allowFailure) {
|
|
30
|
-
|
|
31
|
-
|
|
38
|
+
let advice = host
|
|
39
|
+
&& ` Non-interactive ssh access to ${host} has to work on its own - fix it in your ssh config.`
|
|
40
|
+
|| "";
|
|
41
|
+
throw new Error(`Expected the script on ${describeHost(host)} to exit 0, was ${result.status}.${advice}\n`
|
|
32
42
|
+ `${(result.stdout + result.stderr).trim().slice(0, MAX_ERROR_BODY_LENGTH)}`);
|
|
33
43
|
}
|
|
34
44
|
return { stdout: result.stdout || "", stderr: result.stderr || "", status: result.status };
|
|
@@ -86,5 +96,5 @@ async function remoteCommandExists(config) {
|
|
|
86
96
|
return result.stdout.trim() === "yes";
|
|
87
97
|
}
|
|
88
98
|
exports.remoteCommandExists = remoteCommandExists;
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
-
/* _JS_SOURCE_HASH = "
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"remoteSSH.js","sourceRoot":"","sources":["remoteSSH.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawnPromise } from \"./spawn\";\n\nconst SSH_CONNECT_TIMEOUT = 10;\nconst EXISTS_MARKER = \"__PORTSECURE_EXISTS__\";\nconst MISSING_MARKER = \"__PORTSECURE_MISSING__\";\nconst MAX_ERROR_BODY_LENGTH = 500;\n\n// /etc is root owned, so fall back to sudo whenever the SSH user is not root.\nexport const SUDO_PREAMBLE = `SUDO=\"\"; if [ \"$(id -u)\" -ne 0 ]; then SUDO=\"sudo -n\"; fi`;\n\n/** No host means this machine, so the very same script runs with nothing in front of it. Local and\n    remote then do exactly the same thing, rather than being two pieces of code that have to be kept\n    saying the same thing. */\nexport const THIS_MACHINE = \"\";\n\nexport function describeHost(host: string) {\n    return host || \"this machine\";\n}\n\n/** The host string is handed to ssh untouched. Users, keys and ports belong in the caller's ssh\n    config, so BatchMode makes a missing setup fail immediately instead of prompting. */\nexport async function runOverSSH(config: { host: string; script: string; input?: string; allowFailure?: boolean }) {\n    let { host, script, input, allowFailure } = config;\n    let result = await spawnPromise({\n        command: host && \"ssh\" || \"sh\",\n        args: host && [\n            \"-o\", \"BatchMode=yes\",\n            \"-o\", `ConnectTimeout=${SSH_CONNECT_TIMEOUT}`,\n            host,\n            script,\n        ] || [\"-c\", script],\n        input,\n        inheritStderr: !allowFailure,\n    });\n    if (result.error) {\n        throw new Error(`Expected to run against ${describeHost(host)}, failed with ${result.error.message}`);\n    }\n    if (result.status !== 0 && !allowFailure) {\n        let advice = host\n            && ` Non-interactive ssh access to ${host} has to work on its own - fix it in your ssh config.`\n            || \"\";\n        throw new Error(\n            `Expected the script on ${describeHost(host)} to exit 0, was ${result.status}.${advice}\\n`\n            + `${(result.stdout + result.stderr).trim().slice(0, MAX_ERROR_BODY_LENGTH)}`\n        );\n    }\n    return { stdout: result.stdout || \"\", stderr: result.stderr || \"\", status: result.status };\n}\n\n/** Returns undefined when the file does not exist, so a missing file reads differently from an\n    empty one. */\nexport async function readRemoteFile(config: { host: string; filePath: string }) {\n    let { host, filePath } = config;\n    let output = (await runOverSSH({\n        host,\n        script: `${SUDO_PREAMBLE}\nif $SUDO test -f \"${filePath}\"; then\n    echo \"${EXISTS_MARKER}\"\n    $SUDO cat \"${filePath}\"\nelse\n    echo \"${MISSING_MARKER}\"\nfi`,\n    })).stdout;\n    let newlineIndex = output.indexOf(\"\\n\");\n    let marker = output.slice(0, newlineIndex).trim();\n    if (marker === MISSING_MARKER) {\n        return undefined;\n    }\n    if (marker !== EXISTS_MARKER) {\n        throw new Error(`Expected ${EXISTS_MARKER} or ${MISSING_MARKER} from ${host}, was ${output.slice(0, MAX_ERROR_BODY_LENGTH)}`);\n    }\n    return output.slice(newlineIndex + 1);\n}\n\nexport async function writeRemoteFile(config: {\n    host: string;\n    filePath: string;\n    contents: string;\n    fileMode: string;\n    directoryMode: string;\n}) {\n    let { host, filePath, contents, fileMode, directoryMode } = config;\n    let directory = filePath.slice(0, filePath.lastIndexOf(\"/\"));\n    await runOverSSH({\n        host,\n        // Deploying from Windows must not carry CRLF onto the target, where it breaks systemd\n        // units and makes private keys unreadable to ssh.\n        input: contents.replace(/\\r\\n/g, \"\\n\"),\n        script: `${SUDO_PREAMBLE}\nset -e\n$SUDO mkdir -p \"${directory}\"\n$SUDO chmod ${directoryMode} \"${directory}\"\n$SUDO tee \"${filePath}\" > /dev/null\n$SUDO chmod ${fileMode} \"${filePath}\"`,\n    });\n}\n\nexport async function remoteCommandExists(config: { host: string; command: string }) {\n    let { host, command } = config;\n    let result = await runOverSSH({\n        host,\n        script: `command -v \"${command}\" > /dev/null 2>&1 && echo yes || echo no`,\n        allowFailure: true,\n    });\n    return result.stdout.trim() === \"yes\";\n}\n"]}
|
|
100
|
+
/* _JS_SOURCE_HASH = "50b1a08f2aa4b96f04f676f20c516bc6c2897a47ad7c12729c0f651735c71057"; */
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import os from "os";
|
|
2
|
+
import { getOwnIPs } from "../../misc/ownIPs";
|
|
3
|
+
import { describeHost } from "../helpers/remoteSSH";
|
|
4
|
+
import { createRemoteIdentity, Identity, localDomains, localIdentity, remoteIdentity } from "./identity";
|
|
5
|
+
import { machineState, resolveKeysRepo } from "./machines";
|
|
6
|
+
|
|
7
|
+
const USAGE = `Usage: yarn addmachine <domain> [ip]
|
|
8
|
+
|
|
9
|
+
The domain is required: a machine has a different identity, and so a different machine id, under
|
|
10
|
+
every domain it runs under, so there is no such thing as "this machine" without one.
|
|
11
|
+
|
|
12
|
+
With no ip it adds this machine, with its own addresses. With an ip it asks that machine over ssh
|
|
13
|
+
for its identity under that domain, gives it one if it has none, and adds it under that address.
|
|
14
|
+
|
|
15
|
+
It edits the keys repo this machine reads, wherever that is, not whatever directory this was run
|
|
16
|
+
from. Nothing is signed or pushed here. Run "yarn signfiles git" in that repo afterwards, or no
|
|
17
|
+
machine will believe any of it.`;
|
|
18
|
+
|
|
19
|
+
export async function main() {
|
|
20
|
+
let argv = process.argv.slice(2);
|
|
21
|
+
if (!argv.length || argv.length > 2) {
|
|
22
|
+
throw new Error(`Expected a domain and optionally an ip, was ${argv.length} argument(s)\n${USAGE}`);
|
|
23
|
+
}
|
|
24
|
+
let [domain, host = ""] = argv;
|
|
25
|
+
// The same repo the acceptance check reads. Editing anything else would write a machine list
|
|
26
|
+
// nothing on this machine ever looks at.
|
|
27
|
+
let { repoPath } = await resolveKeysRepo();
|
|
28
|
+
|
|
29
|
+
let identity: Identity;
|
|
30
|
+
let addresses: string[];
|
|
31
|
+
if (!host) {
|
|
32
|
+
let found = await localIdentity(domain);
|
|
33
|
+
if (!found) {
|
|
34
|
+
throw new Error(
|
|
35
|
+
`Expected an identity for ${domain} in ${os.homedir()}, this machine has none.\n`
|
|
36
|
+
+ `It has: ${(await localDomains()).join(", ") || "no identities at all"}\n`
|
|
37
|
+
+ `One is generated the first time something runs here under a domain, so run that`
|
|
38
|
+
+ ` first, or name another machine to add instead.`
|
|
39
|
+
);
|
|
40
|
+
}
|
|
41
|
+
identity = found;
|
|
42
|
+
addresses = await getOwnIPs();
|
|
43
|
+
if (!addresses.length) {
|
|
44
|
+
throw new Error(`Expected this machine to have an address anything else can see, it has none`);
|
|
45
|
+
}
|
|
46
|
+
} else {
|
|
47
|
+
// Nothing there under this domain means it gets one. Its own from this point on: the key
|
|
48
|
+
// is written there and nothing keeps a copy.
|
|
49
|
+
let found = await remoteIdentity(host, domain);
|
|
50
|
+
if (!found) {
|
|
51
|
+
console.log(`${describeHost(host)} has no identity for ${domain}, generating one`);
|
|
52
|
+
}
|
|
53
|
+
identity = found || await createRemoteIdentity({ host, domain });
|
|
54
|
+
// The address it was named by is the address it talks to us from, which is the one thing
|
|
55
|
+
// it cannot lie about.
|
|
56
|
+
addresses = [host];
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// The whole list is read and written back, because setting is by the set: writing this one
|
|
60
|
+
// machine alone would remove every other machine from the repo.
|
|
61
|
+
let machines = await machineState({ repoPath });
|
|
62
|
+
let existing = machines.find(machine => machine.machineId === identity.machineId);
|
|
63
|
+
let ips = [...(existing?.ips || [])];
|
|
64
|
+
let added = addresses.filter(address => !ips.includes(address));
|
|
65
|
+
if (existing) {
|
|
66
|
+
existing.ips = [...ips, ...added];
|
|
67
|
+
} else {
|
|
68
|
+
machines.push({ machineId: identity.machineId, ips: [...added], addedAt: "" });
|
|
69
|
+
}
|
|
70
|
+
await machineState({ repoPath, machines });
|
|
71
|
+
|
|
72
|
+
console.log(`\nTrusting machine ${identity.machineId}`);
|
|
73
|
+
console.log(`Allowing IP ${[...ips, ...added].join(", ")}`);
|
|
74
|
+
if (added.length) {
|
|
75
|
+
console.log(` added to machines/${identity.machineId}.json: ${added.join(", ")}`);
|
|
76
|
+
} else {
|
|
77
|
+
console.log(` already allowed from ${addresses.join(", ")}`);
|
|
78
|
+
}
|
|
79
|
+
console.log(` identity ${identity.fullDomain}`);
|
|
80
|
+
console.log(` in ${repoPath}`);
|
|
81
|
+
console.log(`\nNothing believes this until it is signed. In that repo, run:`);
|
|
82
|
+
console.log(`\`\`\`\nyarn signfiles git\n\`\`\``);
|
|
83
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
|
|
6
|
+
//exports.main = void 0;
|
|
7
|
+
const os_1 = __importDefault(require("os"));
|
|
8
|
+
const ownIPs_1 = require("../../misc/ownIPs");
|
|
9
|
+
const remoteSSH_1 = require("../helpers/remoteSSH");
|
|
10
|
+
const identity_1 = require("./identity");
|
|
11
|
+
const machines_1 = require("./machines");
|
|
12
|
+
const USAGE = `Usage: yarn addmachine <domain> [ip]
|
|
13
|
+
|
|
14
|
+
The domain is required: a machine has a different identity, and so a different machine id, under
|
|
15
|
+
every domain it runs under, so there is no such thing as "this machine" without one.
|
|
16
|
+
|
|
17
|
+
With no ip it adds this machine, with its own addresses. With an ip it asks that machine over ssh
|
|
18
|
+
for its identity under that domain, gives it one if it has none, and adds it under that address.
|
|
19
|
+
|
|
20
|
+
It edits the keys repo this machine reads, wherever that is, not whatever directory this was run
|
|
21
|
+
from. Nothing is signed or pushed here. Run "yarn signfiles git" in that repo afterwards, or no
|
|
22
|
+
machine will believe any of it.`;
|
|
23
|
+
async function main() {
|
|
24
|
+
let argv = process.argv.slice(2);
|
|
25
|
+
if (!argv.length || argv.length > 2) {
|
|
26
|
+
throw new Error(`Expected a domain and optionally an ip, was ${argv.length} argument(s)\n${USAGE}`);
|
|
27
|
+
}
|
|
28
|
+
let [domain, host = ""] = argv;
|
|
29
|
+
// The same repo the acceptance check reads. Editing anything else would write a machine list
|
|
30
|
+
// nothing on this machine ever looks at.
|
|
31
|
+
let { repoPath } = await (0, machines_1.resolveKeysRepo)();
|
|
32
|
+
let identity;
|
|
33
|
+
let addresses;
|
|
34
|
+
if (!host) {
|
|
35
|
+
let found = await (0, identity_1.localIdentity)(domain);
|
|
36
|
+
if (!found) {
|
|
37
|
+
throw new Error(`Expected an identity for ${domain} in ${os_1.default.homedir()}, this machine has none.\n`
|
|
38
|
+
+ `It has: ${(await (0, identity_1.localDomains)()).join(", ") || "no identities at all"}\n`
|
|
39
|
+
+ `One is generated the first time something runs here under a domain, so run that`
|
|
40
|
+
+ ` first, or name another machine to add instead.`);
|
|
41
|
+
}
|
|
42
|
+
identity = found;
|
|
43
|
+
addresses = await (0, ownIPs_1.getOwnIPs)();
|
|
44
|
+
if (!addresses.length) {
|
|
45
|
+
throw new Error(`Expected this machine to have an address anything else can see, it has none`);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
// Nothing there under this domain means it gets one. Its own from this point on: the key
|
|
50
|
+
// is written there and nothing keeps a copy.
|
|
51
|
+
let found = await (0, identity_1.remoteIdentity)(host, domain);
|
|
52
|
+
if (!found) {
|
|
53
|
+
console.log(`${(0, remoteSSH_1.describeHost)(host)} has no identity for ${domain}, generating one`);
|
|
54
|
+
}
|
|
55
|
+
identity = found || await (0, identity_1.createRemoteIdentity)({ host, domain });
|
|
56
|
+
// The address it was named by is the address it talks to us from, which is the one thing
|
|
57
|
+
// it cannot lie about.
|
|
58
|
+
addresses = [host];
|
|
59
|
+
}
|
|
60
|
+
// The whole list is read and written back, because setting is by the set: writing this one
|
|
61
|
+
// machine alone would remove every other machine from the repo.
|
|
62
|
+
let machines = await (0, machines_1.machineState)({ repoPath });
|
|
63
|
+
let existing = machines.find(machine => machine.machineId === identity.machineId);
|
|
64
|
+
let ips = [...((existing === null || existing === void 0 ? void 0 : existing.ips) || [])];
|
|
65
|
+
let added = addresses.filter(address => !ips.includes(address));
|
|
66
|
+
if (existing) {
|
|
67
|
+
existing.ips = [...ips, ...added];
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
machines.push({ machineId: identity.machineId, ips: [...added], addedAt: "" });
|
|
71
|
+
}
|
|
72
|
+
await (0, machines_1.machineState)({ repoPath, machines });
|
|
73
|
+
console.log(`\nTrusting machine ${identity.machineId}`);
|
|
74
|
+
console.log(`Allowing IP ${[...ips, ...added].join(", ")}`);
|
|
75
|
+
if (added.length) {
|
|
76
|
+
console.log(` added to machines/${identity.machineId}.json: ${added.join(", ")}`);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
console.log(` already allowed from ${addresses.join(", ")}`);
|
|
80
|
+
}
|
|
81
|
+
console.log(` identity ${identity.fullDomain}`);
|
|
82
|
+
console.log(` in ${repoPath}`);
|
|
83
|
+
console.log(`\nNothing believes this until it is signed. In that repo, run:`);
|
|
84
|
+
console.log(`\`\`\`\nyarn signfiles git\n\`\`\``);
|
|
85
|
+
}
|
|
86
|
+
exports.main = main;
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"addMachine.js","sourceRoot":"","sources":["addMachine.ts"],"names":[],"mappings":"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","sourcesContent":["import os from \"os\";\nimport { getOwnIPs } from \"../../misc/ownIPs\";\nimport { describeHost } from \"../helpers/remoteSSH\";\nimport { createRemoteIdentity, Identity, localDomains, localIdentity, remoteIdentity } from \"./identity\";\nimport { machineState, resolveKeysRepo } from \"./machines\";\n\nconst USAGE = `Usage: yarn addmachine <domain> [ip]\n\nThe domain is required: a machine has a different identity, and so a different machine id, under\nevery domain it runs under, so there is no such thing as \"this machine\" without one.\n\nWith no ip it adds this machine, with its own addresses. With an ip it asks that machine over ssh\nfor its identity under that domain, gives it one if it has none, and adds it under that address.\n\nIt edits the keys repo this machine reads, wherever that is, not whatever directory this was run\nfrom. Nothing is signed or pushed here. Run \"yarn signfiles git\" in that repo afterwards, or no\nmachine will believe any of it.`;\n\nexport async function main() {\n    let argv = process.argv.slice(2);\n    if (!argv.length || argv.length > 2) {\n        throw new Error(`Expected a domain and optionally an ip, was ${argv.length} argument(s)\\n${USAGE}`);\n    }\n    let [domain, host = \"\"] = argv;\n    // The same repo the acceptance check reads. Editing anything else would write a machine list\n    // nothing on this machine ever looks at.\n    let { repoPath } = await resolveKeysRepo();\n\n    let identity: Identity;\n    let addresses: string[];\n    if (!host) {\n        let found = await localIdentity(domain);\n        if (!found) {\n            throw new Error(\n                `Expected an identity for ${domain} in ${os.homedir()}, this machine has none.\\n`\n                + `It has: ${(await localDomains()).join(\", \") || \"no identities at all\"}\\n`\n                + `One is generated the first time something runs here under a domain, so run that`\n                + ` first, or name another machine to add instead.`\n            );\n        }\n        identity = found;\n        addresses = await getOwnIPs();\n        if (!addresses.length) {\n            throw new Error(`Expected this machine to have an address anything else can see, it has none`);\n        }\n    } else {\n        // Nothing there under this domain means it gets one. Its own from this point on: the key\n        // is written there and nothing keeps a copy.\n        let found = await remoteIdentity(host, domain);\n        if (!found) {\n            console.log(`${describeHost(host)} has no identity for ${domain}, generating one`);\n        }\n        identity = found || await createRemoteIdentity({ host, domain });\n        // The address it was named by is the address it talks to us from, which is the one thing\n        // it cannot lie about.\n        addresses = [host];\n    }\n\n    // The whole list is read and written back, because setting is by the set: writing this one\n    // machine alone would remove every other machine from the repo.\n    let machines = await machineState({ repoPath });\n    let existing = machines.find(machine => machine.machineId === identity.machineId);\n    let ips = [...(existing?.ips || [])];\n    let added = addresses.filter(address => !ips.includes(address));\n    if (existing) {\n        existing.ips = [...ips, ...added];\n    } else {\n        machines.push({ machineId: identity.machineId, ips: [...added], addedAt: \"\" });\n    }\n    await machineState({ repoPath, machines });\n\n    console.log(`\\nTrusting machine ${identity.machineId}`);\n    console.log(`Allowing IP ${[...ips, ...added].join(\", \")}`);\n    if (added.length) {\n        console.log(`  added to machines/${identity.machineId}.json: ${added.join(\", \")}`);\n    } else {\n        console.log(`  already allowed from ${addresses.join(\", \")}`);\n    }\n    console.log(`  identity ${identity.fullDomain}`);\n    console.log(`  in ${repoPath}`);\n    console.log(`\\nNothing believes this until it is signed. In that repo, run:`);\n    console.log(`\\`\\`\\`\\nyarn signfiles git\\n\\`\\`\\``);\n}\n"]}
|
|
88
|
+
/* _JS_SOURCE_HASH = "8b6a7e13912660fd6733b2585e4fec0865a5548fe5846ee6e23f46c506f83e34"; */
|