agl 41.2.0 → 42.1.0
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/changelog.md +41 -0
- package/dist_serve/bundle.js +2625 -2278
- package/dist_serve/bundle.js.map +2 -2
- package/dist_serve/bundle.js.third-party-notices.json +3 -68
- package/dist_serve/bundle.js.third-party-notices.txt +4 -137
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +4 -4
- package/dist_ts/classes.authmodels.d.ts +2 -8
- package/dist_ts/classes.authmodels.js +60 -23
- package/dist_ts/classes.authstore.d.ts +24 -0
- package/dist_ts/classes.authstore.js +185 -23
- package/dist_ts/classes.cli.d.ts +3 -6
- package/dist_ts/classes.cli.js +38 -51
- package/dist_ts/classes.config.d.ts +17 -3
- package/dist_ts/classes.config.js +55 -18
- package/dist_ts/classes.controller.d.ts +83 -14
- package/dist_ts/classes.controller.js +545 -229
- package/dist_ts/classes.controllerdevices.d.ts +128 -0
- package/dist_ts/classes.controllerdevices.js +472 -0
- package/dist_ts/classes.controllermanagement.d.ts +42 -9
- package/dist_ts/classes.controllermanagement.js +72 -23
- package/dist_ts/classes.controllerservice.d.ts +3 -31
- package/dist_ts/classes.controllerservice.js +3 -47
- package/dist_ts/classes.mcpcontrollerhost.js +9 -3
- package/dist_ts/classes.processinspection.d.ts +8 -1
- package/dist_ts/classes.processinspection.js +92 -2
- package/dist_ts/classes.proxycontrol.js +6 -1
- package/dist_ts/classes.proxydaemon.d.ts +2 -2
- package/dist_ts/classes.proxydaemon.js +1 -1
- package/dist_ts/classes.proxystore.d.ts +2 -11
- package/dist_ts/classes.proxystore.js +3 -25
- package/dist_ts/classes.sessionfeed.d.ts +10 -1
- package/dist_ts/classes.sessionfeed.js +12 -2
- package/dist_ts/classes.tpmsecretcodec.d.ts +13 -0
- package/dist_ts/classes.tpmsecretcodec.js +28 -0
- package/dist_ts/classes.trustedproxysecrets.d.ts +91 -0
- package/dist_ts/classes.trustedproxysecrets.js +338 -0
- package/dist_ts/classes.upgradecoordinator.d.ts +14 -1
- package/dist_ts/classes.upgradecoordinator.js +21 -3
- package/dist_ts/classes.upgradetransaction.d.ts +32 -0
- package/dist_ts/classes.upgradetransaction.js +101 -4
- package/dist_ts/classes.validation.d.ts +2 -0
- package/dist_ts/classes.validation.js +2 -2
- package/dist_ts/functions.controlleradmission.d.ts +67 -0
- package/dist_ts/functions.controlleradmission.js +127 -0
- package/dist_ts/functions.deviceapi.d.ts +28 -0
- package/dist_ts/functions.deviceapi.js +246 -0
- package/dist_ts/functions.deviceproof.d.ts +33 -0
- package/dist_ts/functions.deviceproof.js +93 -0
- package/dist_ts/functions.remotecli.d.ts +27 -0
- package/dist_ts/functions.remotecli.js +241 -0
- package/dist_ts/functions.retiredenvironment.d.ts +11 -2
- package/dist_ts/functions.retiredenvironment.js +22 -5
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/interfaces.auth.d.ts +29 -4
- package/dist_ts/interfaces.auth.js +10 -1
- package/dist_ts/interfaces.config.d.ts +14 -0
- package/dist_ts/interfaces.config.js +9 -2
- package/dist_ts/interfaces.lifecycle.d.ts +3 -0
- package/dist_ts_authswitch/classes.authoritydaemon.js +6 -1
- package/dist_ts_interfaces/devices.d.ts +331 -0
- package/dist_ts_interfaces/devices.js +34 -0
- package/dist_ts_interfaces/index.d.ts +2 -0
- package/dist_ts_interfaces/index.js +3 -1
- package/dist_ts_interfaces/interfaces.d.ts +5 -3
- package/dist_ts_interfaces/interfaces.js +3 -2
- package/dist_ts_interfaces/management.d.ts +2 -2
- package/dist_ts_interfaces/management.js +2 -2
- package/dist_ts_interfaces/mcprequests.d.ts +1 -1
- package/dist_ts_interfaces/requests.d.ts +2 -2
- package/dist_ts_interfaces/requests.devices.d.ts +89 -0
- package/dist_ts_interfaces/requests.devices.js +2 -0
- package/dist_ts_interfaces/requests.upgrade.d.ts +0 -12
- package/package.json +12 -11
- package/readme.md +116 -24
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +3 -3
- package/ts/classes.authmodels.ts +68 -25
- package/ts/classes.authstore.ts +183 -24
- package/ts/classes.cli.ts +38 -61
- package/ts/classes.config.ts +70 -21
- package/ts/classes.controller.ts +746 -329
- package/ts/classes.controllerdevices.ts +469 -0
- package/ts/classes.controllermanagement.ts +123 -49
- package/ts/classes.controllerservice.ts +3 -56
- package/ts/classes.mcpcontrollerhost.ts +10 -5
- package/ts/classes.processinspection.ts +84 -3
- package/ts/classes.proxycontrol.ts +2 -0
- package/ts/classes.proxydaemon.ts +3 -2
- package/ts/classes.proxystore.ts +4 -25
- package/ts/classes.sessionfeed.ts +13 -1
- package/ts/classes.tpmsecretcodec.ts +26 -0
- package/ts/classes.trustedproxysecrets.ts +317 -0
- package/ts/classes.upgradecoordinator.ts +33 -3
- package/ts/classes.upgradetransaction.ts +130 -1
- package/ts/classes.validation.ts +1 -1
- package/ts/functions.controlleradmission.ts +168 -0
- package/ts/functions.deviceapi.ts +295 -0
- package/ts/functions.deviceproof.ts +118 -0
- package/ts/functions.remotecli.ts +270 -0
- package/ts/functions.retiredenvironment.ts +25 -3
- package/ts/index.ts +1 -0
- package/ts/interfaces.auth.ts +41 -3
- package/ts/interfaces.config.ts +15 -0
- package/ts/interfaces.lifecycle.ts +3 -0
- package/ts_authswitch/classes.authoritydaemon.ts +2 -0
- package/ts_interfaces/devices.schema.json +890 -0
- package/ts_interfaces/devices.ts +392 -0
- package/ts_interfaces/index.ts +2 -0
- package/ts_interfaces/interfaces.ts +5 -2
- package/ts_interfaces/management.ts +2 -2
- package/ts_interfaces/mcprequests.ts +1 -1
- package/ts_interfaces/requests.devices.ts +95 -0
- package/ts_interfaces/requests.ts +10 -10
- package/ts_interfaces/requests.upgrade.ts +0 -16
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/classes.controllersocketclient.ts +27 -0
- package/ts_web/elements.devices.ts +752 -0
- package/ts_web/elements.harnesscontrollerapp.ts +18 -1
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/** Seals a secret for this user and machine under a name it is bound to; only its ciphertext is stored. */
|
|
2
|
+
export interface ITpmSecretCodec {
|
|
3
|
+
seal(nameArg: string, plaintextArg: Uint8Array): Promise<string>;
|
|
4
|
+
unseal(nameArg: string, ciphertextArg: string): Promise<Uint8Array>;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* TPM2-sealed secrets through `systemd-creds`, bound to their name: the inference proxy's client credentials and
|
|
8
|
+
* signature key, and the controller's trusted-proxy secret.
|
|
9
|
+
*/
|
|
10
|
+
export declare class TpmSecretCodec implements ITpmSecretCodec {
|
|
11
|
+
seal(nameArg: string, plaintextArg: Uint8Array): Promise<string>;
|
|
12
|
+
unseal(nameArg: string, ciphertextArg: string): Promise<Uint8Array>;
|
|
13
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* TPM2-sealed secrets through `systemd-creds`, bound to their name: the inference proxy's client credentials and
|
|
4
|
+
* signature key, and the controller's trusted-proxy secret.
|
|
5
|
+
*/
|
|
6
|
+
export class TpmSecretCodec {
|
|
7
|
+
async seal(nameArg, plaintextArg) {
|
|
8
|
+
const ciphertext = await plugins.smartsecret.sealSmartSecretTpm2Credential(nameArg, plaintextArg);
|
|
9
|
+
try {
|
|
10
|
+
return Buffer.from(ciphertext).toString('base64url');
|
|
11
|
+
}
|
|
12
|
+
finally {
|
|
13
|
+
ciphertext.fill(0);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
async unseal(nameArg, ciphertextArg) {
|
|
17
|
+
if (!/^[A-Za-z0-9_-]{1,131072}$/.test(ciphertextArg))
|
|
18
|
+
throw new Error('Invalid sealed secret.');
|
|
19
|
+
const bytes = Buffer.from(ciphertextArg, 'base64url');
|
|
20
|
+
try {
|
|
21
|
+
return await plugins.smartsecret.unsealSmartSecretTpm2Credential(nameArg, bytes);
|
|
22
|
+
}
|
|
23
|
+
finally {
|
|
24
|
+
bytes.fill(0);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy50cG1zZWNyZXRjb2RlYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2NsYXNzZXMudHBtc2VjcmV0Y29kZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFReEM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGNBQWM7SUFDbEIsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFlLEVBQUUsWUFBd0I7UUFDekQsTUFBTSxVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsV0FBVyxDQUFDLDZCQUE2QixDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztRQUNsRyxJQUFJLENBQUM7WUFBQyxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQUMsQ0FBQztnQkFDckQsQ0FBQztZQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFBQyxDQUFDO0lBQ2pDLENBQUM7SUFFTSxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQWUsRUFBRSxhQUFxQjtRQUN4RCxJQUFJLENBQUMsMkJBQTJCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUNoRyxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUN0RCxJQUFJLENBQUM7WUFBQyxPQUFPLE1BQU0sT0FBTyxDQUFDLFdBQVcsQ0FBQywrQkFBK0IsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFBQyxDQUFDO2dCQUNqRixDQUFDO1lBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUFDLENBQUM7SUFDNUIsQ0FBQztDQUNGIn0=
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import type { ITpmSecretCodec } from './classes.tpmsecretcodec.js';
|
|
3
|
+
/** One sealed generation of a controller's trusted-proxy secret. */
|
|
4
|
+
export interface IControllerTrustedProxySealedSecret {
|
|
5
|
+
/** Grows with every rotation and import; the secret is sealed under a name that binds it. */
|
|
6
|
+
generation: number;
|
|
7
|
+
/** TPM2-sealed (`TpmSecretCodec`); the plaintext exists only in the running controller and its gateway's route. */
|
|
8
|
+
ciphertext: string;
|
|
9
|
+
}
|
|
10
|
+
export interface IControllerTrustedProxySecretDocument {
|
|
11
|
+
/** The controller's id, `controller:<port>`. */
|
|
12
|
+
id: string;
|
|
13
|
+
/** The secret the controller accepts and its reverse proxy injects. */
|
|
14
|
+
active: IControllerTrustedProxySealedSecret;
|
|
15
|
+
/**
|
|
16
|
+
* A rotation its gateway's route does not carry yet: accepted beside `active` until `confirm` makes it the active
|
|
17
|
+
* one. Present only while a rotation is in progress.
|
|
18
|
+
*/
|
|
19
|
+
next?: IControllerTrustedProxySealedSecret;
|
|
20
|
+
}
|
|
21
|
+
export declare class ControllerTrustedProxySecretModel extends plugins.nosqldb.SmartDataDbDoc<ControllerTrustedProxySecretModel, IControllerTrustedProxySecretDocument> {
|
|
22
|
+
static exact: plugins.nosqldb.TExact<ControllerTrustedProxySecretModel>;
|
|
23
|
+
id: string;
|
|
24
|
+
active: IControllerTrustedProxySealedSecret;
|
|
25
|
+
next?: IControllerTrustedProxySealedSecret;
|
|
26
|
+
}
|
|
27
|
+
/** The bytes a well-formed secret encodes; refused, naming the format but never the value, otherwise. */
|
|
28
|
+
export declare const decodeTrustedProxySecret: (valueArg: string) => Buffer;
|
|
29
|
+
export interface IControllerTrustedProxySecretsOptions {
|
|
30
|
+
/** `controller:<port>`. */
|
|
31
|
+
controllerId: string;
|
|
32
|
+
/** The controller database's issuer id: the secret is sealed under a name bound to it. */
|
|
33
|
+
issuerId: string;
|
|
34
|
+
codec: ITpmSecretCodec;
|
|
35
|
+
}
|
|
36
|
+
/** The secret a gateway's route must carry, and the generation `confirm` names once the route carries it. */
|
|
37
|
+
export interface IControllerTrustedProxyRouteSecret {
|
|
38
|
+
secret: string;
|
|
39
|
+
generation: number;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* The trusted-proxy secret of a controller in TLS-proxy mode: AGL generates it, keeps it TPM2-sealed in the
|
|
43
|
+
* controller's database and hands it only to its own gateway's route (or an operator imports it for another reverse
|
|
44
|
+
* proxy). Admission accepts the active secret and, while a rotation is in progress, the next one: a rotation keeps
|
|
45
|
+
* the previous secret valid until the route carrying the new one is confirmed. One running controller owns the
|
|
46
|
+
* record; the offline `agl remote` commands write it only while that controller is stopped.
|
|
47
|
+
*/
|
|
48
|
+
export declare class ControllerTrustedProxySecrets {
|
|
49
|
+
private readonly options;
|
|
50
|
+
private active;
|
|
51
|
+
private next;
|
|
52
|
+
private mutationTail;
|
|
53
|
+
private closed;
|
|
54
|
+
private constructor();
|
|
55
|
+
/** Opens the record of `controllerId`, generating and sealing the first secret when it has none. */
|
|
56
|
+
static open(optionsArg: IControllerTrustedProxySecretsOptions): Promise<ControllerTrustedProxySecrets>;
|
|
57
|
+
/** Whether a request's header value is the active secret or the rotation's; constant time per secret. */
|
|
58
|
+
accepts(valueArg: string | null): boolean;
|
|
59
|
+
/** The secret the gateway's route must carry: the rotation's while one is in progress, else the active one. */
|
|
60
|
+
routeSecret(): IControllerTrustedProxyRouteSecret;
|
|
61
|
+
/**
|
|
62
|
+
* Starts a rotation: a new secret, accepted beside the active one from now on, which the route must carry next.
|
|
63
|
+
* A rotation already in progress is returned again, so a sync that failed is retried with the same secret.
|
|
64
|
+
*/
|
|
65
|
+
rotate(): Promise<IControllerTrustedProxyRouteSecret>;
|
|
66
|
+
/**
|
|
67
|
+
* Ends a rotation once the route carries generation `generationArg`: it becomes the active secret and the previous
|
|
68
|
+
* one is refused from then on. Confirming the active generation again changes nothing; any other is refused.
|
|
69
|
+
*/
|
|
70
|
+
confirm(generationArg: number): Promise<void>;
|
|
71
|
+
/**
|
|
72
|
+
* Forgets the secrets in memory; the record stays. A rotation or confirmation still running fails, and what it
|
|
73
|
+
* stored meanwhile is not installed: the next open resumes the rotation or loads the confirmed secret.
|
|
74
|
+
*/
|
|
75
|
+
close(): void;
|
|
76
|
+
private assertOpen;
|
|
77
|
+
private mutate;
|
|
78
|
+
/** The stored record, which must still hold exactly what this controller opened or wrote. */
|
|
79
|
+
private readOwnRecord;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Replaces a stopped controller's trusted-proxy secret with one an operator chose for another reverse proxy; a
|
|
83
|
+
* rotation in progress ends with it. Returns the new generation. The secret is never logged or echoed.
|
|
84
|
+
*/
|
|
85
|
+
export declare const importControllerTrustedProxySecret: (optionsArg: IControllerTrustedProxySecretsOptions & {
|
|
86
|
+
secret: string;
|
|
87
|
+
}) => Promise<{
|
|
88
|
+
generation: number;
|
|
89
|
+
}>;
|
|
90
|
+
/** Removes a stopped controller's trusted-proxy secret; whether there was one. */
|
|
91
|
+
export declare const removeControllerTrustedProxySecret: (controllerIdArg: string) => Promise<boolean>;
|
|
@@ -0,0 +1,338 @@
|
|
|
1
|
+
var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
|
|
2
|
+
function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
|
|
3
|
+
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
|
|
4
|
+
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
|
|
5
|
+
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
|
|
6
|
+
var _, done = false;
|
|
7
|
+
for (var i = decorators.length - 1; i >= 0; i--) {
|
|
8
|
+
var context = {};
|
|
9
|
+
for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
|
|
10
|
+
for (var p in contextIn.access) context.access[p] = contextIn.access[p];
|
|
11
|
+
context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
|
|
12
|
+
var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
|
|
13
|
+
if (kind === "accessor") {
|
|
14
|
+
if (result === void 0) continue;
|
|
15
|
+
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
|
|
16
|
+
if (_ = accept(result.get)) descriptor.get = _;
|
|
17
|
+
if (_ = accept(result.set)) descriptor.set = _;
|
|
18
|
+
if (_ = accept(result.init)) initializers.unshift(_);
|
|
19
|
+
}
|
|
20
|
+
else if (_ = accept(result)) {
|
|
21
|
+
if (kind === "field") initializers.unshift(_);
|
|
22
|
+
else descriptor[key] = _;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
26
|
+
done = true;
|
|
27
|
+
};
|
|
28
|
+
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
|
|
29
|
+
var useValue = arguments.length > 2;
|
|
30
|
+
for (var i = 0; i < initializers.length; i++) {
|
|
31
|
+
value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
|
|
32
|
+
}
|
|
33
|
+
return useValue ? value : void 0;
|
|
34
|
+
};
|
|
35
|
+
import * as plugins from './plugins.js';
|
|
36
|
+
const isSealedSecret = (valueArg) => {
|
|
37
|
+
const value = valueArg;
|
|
38
|
+
return !!value && typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 2
|
|
39
|
+
&& Number.isSafeInteger(value.generation) && value.generation >= 1
|
|
40
|
+
&& typeof value.ciphertext === 'string' && /^[A-Za-z0-9_-]{1,131072}$/u.test(value.ciphertext);
|
|
41
|
+
};
|
|
42
|
+
const assertDocument = (valueArg) => {
|
|
43
|
+
const value = valueArg;
|
|
44
|
+
if (!value || typeof value !== 'object'
|
|
45
|
+
|| Object.keys(value).length !== (Object.hasOwn(value, 'next') ? 3 : 2)
|
|
46
|
+
|| typeof value.id !== 'string' || !/^controller:[1-9][0-9]{0,4}$/u.test(value.id)
|
|
47
|
+
|| !isSealedSecret(value.active)
|
|
48
|
+
|| (Object.hasOwn(value, 'next') && (!isSealedSecret(value.next) || value.next.generation !== value.active.generation + 1))) {
|
|
49
|
+
throw new Error('Invalid trusted-proxy secret record.');
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
let ControllerTrustedProxySecretModel = (() => {
|
|
53
|
+
let _classDecorators = [plugins.nosqldb.managed({ collectionName: 'agl_controller_trusted_proxy_secrets' }), plugins.nosqldb.exactPersistence({ assertDocument })];
|
|
54
|
+
let _classDescriptor;
|
|
55
|
+
let _classExtraInitializers = [];
|
|
56
|
+
let _classThis;
|
|
57
|
+
let _classSuper = plugins.nosqldb.SmartDataDbDoc;
|
|
58
|
+
let _id_decorators;
|
|
59
|
+
let _id_initializers = [];
|
|
60
|
+
let _id_extraInitializers = [];
|
|
61
|
+
let _active_decorators;
|
|
62
|
+
let _active_initializers = [];
|
|
63
|
+
let _active_extraInitializers = [];
|
|
64
|
+
let _next_decorators;
|
|
65
|
+
let _next_initializers = [];
|
|
66
|
+
let _next_extraInitializers = [];
|
|
67
|
+
var ControllerTrustedProxySecretModel = class extends _classSuper {
|
|
68
|
+
static { _classThis = this; }
|
|
69
|
+
static {
|
|
70
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
71
|
+
_id_decorators = [plugins.nosqldb.unI()];
|
|
72
|
+
_active_decorators = [plugins.nosqldb.svDb()];
|
|
73
|
+
_next_decorators = [plugins.nosqldb.svDb()];
|
|
74
|
+
__esDecorate(null, null, _id_decorators, { kind: "field", name: "id", static: false, private: false, access: { has: obj => "id" in obj, get: obj => obj.id, set: (obj, value) => { obj.id = value; } }, metadata: _metadata }, _id_initializers, _id_extraInitializers);
|
|
75
|
+
__esDecorate(null, null, _active_decorators, { kind: "field", name: "active", static: false, private: false, access: { has: obj => "active" in obj, get: obj => obj.active, set: (obj, value) => { obj.active = value; } }, metadata: _metadata }, _active_initializers, _active_extraInitializers);
|
|
76
|
+
__esDecorate(null, null, _next_decorators, { kind: "field", name: "next", static: false, private: false, access: { has: obj => "next" in obj, get: obj => obj.next, set: (obj, value) => { obj.next = value; } }, metadata: _metadata }, _next_initializers, _next_extraInitializers);
|
|
77
|
+
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
78
|
+
ControllerTrustedProxySecretModel = _classThis = _classDescriptor.value;
|
|
79
|
+
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
80
|
+
__runInitializers(_classThis, _classExtraInitializers);
|
|
81
|
+
}
|
|
82
|
+
id = __runInitializers(this, _id_initializers, void 0);
|
|
83
|
+
active = (__runInitializers(this, _id_extraInitializers), __runInitializers(this, _active_initializers, void 0));
|
|
84
|
+
next = (__runInitializers(this, _active_extraInitializers), __runInitializers(this, _next_initializers, void 0));
|
|
85
|
+
constructor() {
|
|
86
|
+
super(...arguments);
|
|
87
|
+
__runInitializers(this, _next_extraInitializers);
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
return ControllerTrustedProxySecretModel = _classThis;
|
|
91
|
+
})();
|
|
92
|
+
export { ControllerTrustedProxySecretModel };
|
|
93
|
+
/** What a reverse proxy injects as `X-Harness-Controller-Proxy-Secret`: 32 random bytes, base64url (43 characters). */
|
|
94
|
+
const trustedProxySecretPattern = /^[A-Za-z0-9_-]{43}$/u;
|
|
95
|
+
/** The bytes a well-formed secret encodes; refused, naming the format but never the value, otherwise. */
|
|
96
|
+
export const decodeTrustedProxySecret = (valueArg) => {
|
|
97
|
+
const refusal = 'A trusted-proxy secret is 32 bytes, base64url-encoded (43 characters).';
|
|
98
|
+
if (!trustedProxySecretPattern.test(valueArg))
|
|
99
|
+
throw new Error(refusal);
|
|
100
|
+
const bytes = Buffer.from(valueArg, 'base64url');
|
|
101
|
+
if (bytes.byteLength !== 32 || bytes.toString('base64url') !== valueArg) {
|
|
102
|
+
bytes.fill(0);
|
|
103
|
+
throw new Error(refusal);
|
|
104
|
+
}
|
|
105
|
+
return bytes;
|
|
106
|
+
};
|
|
107
|
+
const sealName = (optionsArg, generationArg) => `agl-controller.${optionsArg.issuerId.slice(0, 22)}.${optionsArg.controllerId.replace(':', '-')}.trusted-proxy.${generationArg}`;
|
|
108
|
+
const sealSecret = async (optionsArg, generationArg, bytesArg) => ({
|
|
109
|
+
generation: generationArg,
|
|
110
|
+
ciphertext: await optionsArg.codec.seal(sealName(optionsArg, generationArg), bytesArg),
|
|
111
|
+
});
|
|
112
|
+
const unsealSecret = async (optionsArg, sealedArg) => {
|
|
113
|
+
let bytes;
|
|
114
|
+
try {
|
|
115
|
+
bytes = await optionsArg.codec.unseal(sealName(optionsArg, sealedArg.generation), sealedArg.ciphertext);
|
|
116
|
+
}
|
|
117
|
+
catch (errorArg) {
|
|
118
|
+
throw new Error(`The trusted-proxy secret of ${optionsArg.controllerId} cannot be unsealed on this machine. Stop `
|
|
119
|
+
+ 'the controller and import a secret with `agl remote secret import`.', { cause: errorArg });
|
|
120
|
+
}
|
|
121
|
+
try {
|
|
122
|
+
if (bytes.byteLength !== 32)
|
|
123
|
+
throw new Error(`The sealed trusted-proxy secret of ${optionsArg.controllerId} is invalid.`);
|
|
124
|
+
return { generation: sealedArg.generation, text: Buffer.from(Buffer.from(bytes).toString('base64url'), 'utf8') };
|
|
125
|
+
}
|
|
126
|
+
finally {
|
|
127
|
+
bytes.fill(0);
|
|
128
|
+
}
|
|
129
|
+
};
|
|
130
|
+
const readRecord = (controllerIdArg) => ControllerTrustedProxySecretModel.exact.findStoredOne({ id: controllerIdArg });
|
|
131
|
+
/**
|
|
132
|
+
* The trusted-proxy secret of a controller in TLS-proxy mode: AGL generates it, keeps it TPM2-sealed in the
|
|
133
|
+
* controller's database and hands it only to its own gateway's route (or an operator imports it for another reverse
|
|
134
|
+
* proxy). Admission accepts the active secret and, while a rotation is in progress, the next one: a rotation keeps
|
|
135
|
+
* the previous secret valid until the route carrying the new one is confirmed. One running controller owns the
|
|
136
|
+
* record; the offline `agl remote` commands write it only while that controller is stopped.
|
|
137
|
+
*/
|
|
138
|
+
export class ControllerTrustedProxySecrets {
|
|
139
|
+
options;
|
|
140
|
+
active;
|
|
141
|
+
next;
|
|
142
|
+
mutationTail = Promise.resolve();
|
|
143
|
+
closed = false;
|
|
144
|
+
constructor(options, active, next) {
|
|
145
|
+
this.options = options;
|
|
146
|
+
this.active = active;
|
|
147
|
+
this.next = next;
|
|
148
|
+
}
|
|
149
|
+
/** Opens the record of `controllerId`, generating and sealing the first secret when it has none. */
|
|
150
|
+
static async open(optionsArg) {
|
|
151
|
+
let stored = await readRecord(optionsArg.controllerId);
|
|
152
|
+
if (!stored) {
|
|
153
|
+
const bytes = plugins.crypto.randomBytes(32);
|
|
154
|
+
let active;
|
|
155
|
+
try {
|
|
156
|
+
active = await sealSecret(optionsArg, 1, bytes);
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
bytes.fill(0);
|
|
160
|
+
}
|
|
161
|
+
const inserted = await ControllerTrustedProxySecretModel.exact.insert({ id: optionsArg.controllerId, active });
|
|
162
|
+
if (inserted.status !== 'inserted' && inserted.status !== 'already_committed' && inserted.status !== 'conflict') {
|
|
163
|
+
throw new Error('The trusted-proxy secret could not be stored.');
|
|
164
|
+
}
|
|
165
|
+
stored = await readRecord(optionsArg.controllerId);
|
|
166
|
+
if (!stored)
|
|
167
|
+
throw new Error('The trusted-proxy secret could not be read back.');
|
|
168
|
+
}
|
|
169
|
+
const record = ControllerTrustedProxySecretModel.exact.toPersisted(stored);
|
|
170
|
+
const active = await unsealSecret(optionsArg, record.active);
|
|
171
|
+
try {
|
|
172
|
+
const next = record.next ? await unsealSecret(optionsArg, record.next) : undefined;
|
|
173
|
+
return new ControllerTrustedProxySecrets(optionsArg, active, next);
|
|
174
|
+
}
|
|
175
|
+
catch (errorArg) {
|
|
176
|
+
active.text.fill(0);
|
|
177
|
+
throw errorArg;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
/** Whether a request's header value is the active secret or the rotation's; constant time per secret. */
|
|
181
|
+
accepts(valueArg) {
|
|
182
|
+
if (valueArg === null || this.closed)
|
|
183
|
+
return false;
|
|
184
|
+
const candidate = Buffer.from(valueArg, 'utf8');
|
|
185
|
+
let accepted = false;
|
|
186
|
+
for (const secret of [this.active, this.next]) {
|
|
187
|
+
if (secret && candidate.byteLength === secret.text.byteLength
|
|
188
|
+
&& plugins.crypto.timingSafeEqual(candidate, secret.text))
|
|
189
|
+
accepted = true;
|
|
190
|
+
}
|
|
191
|
+
return accepted;
|
|
192
|
+
}
|
|
193
|
+
/** The secret the gateway's route must carry: the rotation's while one is in progress, else the active one. */
|
|
194
|
+
routeSecret() {
|
|
195
|
+
this.assertOpen();
|
|
196
|
+
const secret = this.next ?? this.active;
|
|
197
|
+
return { secret: secret.text.toString('utf8'), generation: secret.generation };
|
|
198
|
+
}
|
|
199
|
+
/**
|
|
200
|
+
* Starts a rotation: a new secret, accepted beside the active one from now on, which the route must carry next.
|
|
201
|
+
* A rotation already in progress is returned again, so a sync that failed is retried with the same secret.
|
|
202
|
+
*/
|
|
203
|
+
rotate() {
|
|
204
|
+
return this.mutate(async () => {
|
|
205
|
+
if (this.next)
|
|
206
|
+
return { secret: this.next.text.toString('utf8'), generation: this.next.generation };
|
|
207
|
+
const current = await this.readOwnRecord();
|
|
208
|
+
const generation = this.active.generation + 1;
|
|
209
|
+
const bytes = plugins.crypto.randomBytes(32);
|
|
210
|
+
const text = Buffer.from(bytes.toString('base64url'), 'utf8');
|
|
211
|
+
let installed = false;
|
|
212
|
+
try {
|
|
213
|
+
let next;
|
|
214
|
+
try {
|
|
215
|
+
next = await sealSecret(this.options, generation, bytes);
|
|
216
|
+
}
|
|
217
|
+
finally {
|
|
218
|
+
bytes.fill(0);
|
|
219
|
+
}
|
|
220
|
+
this.assertOpen();
|
|
221
|
+
const result = await ControllerTrustedProxySecretModel.exact.transition({ current, change: (modelArg) => {
|
|
222
|
+
modelArg.next = next;
|
|
223
|
+
} });
|
|
224
|
+
if (result.status !== 'transitioned')
|
|
225
|
+
throw new Error('The trusted-proxy secret changed concurrently.');
|
|
226
|
+
// Closed while the rotation was being stored: it is not installed here; the next open resumes it.
|
|
227
|
+
this.assertOpen();
|
|
228
|
+
this.next = { generation, text };
|
|
229
|
+
installed = true;
|
|
230
|
+
return { secret: text.toString('utf8'), generation };
|
|
231
|
+
}
|
|
232
|
+
finally {
|
|
233
|
+
if (!installed)
|
|
234
|
+
text.fill(0);
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
/**
|
|
239
|
+
* Ends a rotation once the route carries generation `generationArg`: it becomes the active secret and the previous
|
|
240
|
+
* one is refused from then on. Confirming the active generation again changes nothing; any other is refused.
|
|
241
|
+
*/
|
|
242
|
+
confirm(generationArg) {
|
|
243
|
+
return this.mutate(async () => {
|
|
244
|
+
if (!this.next && this.active.generation === generationArg)
|
|
245
|
+
return;
|
|
246
|
+
if (!this.next || this.next.generation !== generationArg) {
|
|
247
|
+
throw new Error(`Generation ${generationArg} is not the trusted-proxy secret rotation in progress.`);
|
|
248
|
+
}
|
|
249
|
+
const current = await this.readOwnRecord();
|
|
250
|
+
const result = await ControllerTrustedProxySecretModel.exact.transition({ current, change: (modelArg) => {
|
|
251
|
+
modelArg.active = modelArg.next;
|
|
252
|
+
delete modelArg.next;
|
|
253
|
+
} });
|
|
254
|
+
if (result.status !== 'transitioned')
|
|
255
|
+
throw new Error('The trusted-proxy secret changed concurrently.');
|
|
256
|
+
// Closed while the confirmation was being stored: it stays stored, and the next open loads it as the active one.
|
|
257
|
+
this.assertOpen();
|
|
258
|
+
this.active.text.fill(0);
|
|
259
|
+
this.active = this.next;
|
|
260
|
+
this.next = undefined;
|
|
261
|
+
});
|
|
262
|
+
}
|
|
263
|
+
/**
|
|
264
|
+
* Forgets the secrets in memory; the record stays. A rotation or confirmation still running fails, and what it
|
|
265
|
+
* stored meanwhile is not installed: the next open resumes the rotation or loads the confirmed secret.
|
|
266
|
+
*/
|
|
267
|
+
close() {
|
|
268
|
+
this.closed = true;
|
|
269
|
+
this.active.text.fill(0);
|
|
270
|
+
this.next?.text.fill(0);
|
|
271
|
+
this.next = undefined;
|
|
272
|
+
}
|
|
273
|
+
assertOpen() {
|
|
274
|
+
if (this.closed)
|
|
275
|
+
throw new Error('The trusted-proxy secrets are closed.');
|
|
276
|
+
}
|
|
277
|
+
mutate(operationArg) {
|
|
278
|
+
if (this.closed)
|
|
279
|
+
return Promise.reject(new Error('The trusted-proxy secrets are closed.'));
|
|
280
|
+
const task = this.mutationTail.then(() => {
|
|
281
|
+
this.assertOpen();
|
|
282
|
+
return operationArg();
|
|
283
|
+
});
|
|
284
|
+
this.mutationTail = task.then(() => undefined, () => undefined);
|
|
285
|
+
return task;
|
|
286
|
+
}
|
|
287
|
+
/** The stored record, which must still hold exactly what this controller opened or wrote. */
|
|
288
|
+
async readOwnRecord() {
|
|
289
|
+
const stored = await readRecord(this.options.controllerId);
|
|
290
|
+
const record = stored ? ControllerTrustedProxySecretModel.exact.toPersisted(stored) : undefined;
|
|
291
|
+
if (!stored || record?.active.generation !== this.active.generation
|
|
292
|
+
|| record.next?.generation !== this.next?.generation) {
|
|
293
|
+
throw new Error('The trusted-proxy secret changed outside this controller.');
|
|
294
|
+
}
|
|
295
|
+
return stored;
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
/**
|
|
299
|
+
* Replaces a stopped controller's trusted-proxy secret with one an operator chose for another reverse proxy; a
|
|
300
|
+
* rotation in progress ends with it. Returns the new generation. The secret is never logged or echoed.
|
|
301
|
+
*/
|
|
302
|
+
export const importControllerTrustedProxySecret = async (optionsArg) => {
|
|
303
|
+
const bytes = decodeTrustedProxySecret(optionsArg.secret);
|
|
304
|
+
try {
|
|
305
|
+
const stored = await readRecord(optionsArg.controllerId);
|
|
306
|
+
const record = stored ? ControllerTrustedProxySecretModel.exact.toPersisted(stored) : undefined;
|
|
307
|
+
const generation = Math.max(record?.active.generation ?? 0, record?.next?.generation ?? 0) + 1;
|
|
308
|
+
const active = await sealSecret(optionsArg, generation, bytes);
|
|
309
|
+
if (!stored) {
|
|
310
|
+
const inserted = await ControllerTrustedProxySecretModel.exact.insert({ id: optionsArg.controllerId, active });
|
|
311
|
+
if (inserted.status !== 'inserted')
|
|
312
|
+
throw new Error('The trusted-proxy secret changed concurrently.');
|
|
313
|
+
return { generation };
|
|
314
|
+
}
|
|
315
|
+
const result = await ControllerTrustedProxySecretModel.exact.transition({ current: stored, change: (modelArg) => {
|
|
316
|
+
modelArg.active = active;
|
|
317
|
+
delete modelArg.next;
|
|
318
|
+
} });
|
|
319
|
+
if (result.status !== 'transitioned')
|
|
320
|
+
throw new Error('The trusted-proxy secret changed concurrently.');
|
|
321
|
+
return { generation };
|
|
322
|
+
}
|
|
323
|
+
finally {
|
|
324
|
+
bytes.fill(0);
|
|
325
|
+
}
|
|
326
|
+
};
|
|
327
|
+
/** Removes a stopped controller's trusted-proxy secret; whether there was one. */
|
|
328
|
+
export const removeControllerTrustedProxySecret = async (controllerIdArg) => {
|
|
329
|
+
const stored = await readRecord(controllerIdArg);
|
|
330
|
+
if (!stored)
|
|
331
|
+
return false;
|
|
332
|
+
const deleted = await ControllerTrustedProxySecretModel.exact.delete({ current: stored });
|
|
333
|
+
if (deleted.status !== 'deleted' && await readRecord(controllerIdArg)) {
|
|
334
|
+
throw new Error('The trusted-proxy secret could not be removed.');
|
|
335
|
+
}
|
|
336
|
+
return true;
|
|
337
|
+
};
|
|
338
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.trustedproxysecrets.js","sourceRoot":"","sources":["../../ts/classes.trustedproxysecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -140,6 +140,12 @@ export interface IUpgradeAuthorityHandoff {
|
|
|
140
140
|
export interface IUpgradeTransactionV2 extends IUpgradeTransactionBase {
|
|
141
141
|
version: typeof coordinationVersion;
|
|
142
142
|
sourceVersion: string;
|
|
143
|
+
/**
|
|
144
|
+
* What the source package declares about gateway sources (`controllerGatewaySourcesVersion` in its installed
|
|
145
|
+
* `package.json`), recorded by the CLI that creates the transaction and never changed afterwards. Absent when the
|
|
146
|
+
* source declares none, as every release before 42, whose CLI never writes it: absence means unsupported.
|
|
147
|
+
*/
|
|
148
|
+
sourceGatewaySourcesVersion?: number;
|
|
143
149
|
targetVersion?: string;
|
|
144
150
|
registryUrl?: string;
|
|
145
151
|
targetStartupInvoked?: true;
|
|
@@ -192,6 +198,11 @@ export declare const normalizeUpgradeRegistryUrl: (valueArg: unknown) => string;
|
|
|
192
198
|
* blockers with a `pauseState`; they are read as `settling` and the pause state is dropped.
|
|
193
199
|
*/
|
|
194
200
|
export declare const parseUpgradeBlockers: (valueArg: unknown) => IControllerUpgradeBlocker[];
|
|
201
|
+
/**
|
|
202
|
+
* A declared gateway-sources contract (`controllerGatewaySourcesVersion` in a package, `sourceGatewaySourcesVersion`
|
|
203
|
+
* in an upgrade transaction): a safe integer of 1 or more.
|
|
204
|
+
*/
|
|
205
|
+
export declare const isControllerGatewaySourcesVersion: (valueArg: unknown) => valueArg is number;
|
|
195
206
|
export declare const upgradeTransactionIsStalled: (transactionArg: TUpgradeTransaction, nowArg?: number) => boolean;
|
|
196
207
|
export declare const upgradeTransactionRequiresForwardRecovery: (transactionArg: TUpgradeTransaction) => boolean;
|
|
197
208
|
export declare const upgradeTransactionTargetVersion: (transactionArg: TUpgradeTransaction) => string | undefined;
|
|
@@ -261,7 +272,7 @@ export declare class UpgradeCoordinator {
|
|
|
261
272
|
token: string;
|
|
262
273
|
cliPath: string;
|
|
263
274
|
/** `__serve` is the service unit's controller starting without a CLI: after a failure, at login or at boot. */
|
|
264
|
-
command: 'start' | 'restart' | 'service' | 'foreground' | 'temp-password' | 'config' | '__serve';
|
|
275
|
+
command: 'start' | 'restart' | 'service' | 'foreground' | 'temp-password' | 'config' | 'remote' | '__serve';
|
|
265
276
|
upgradeToken?: string;
|
|
266
277
|
}): Promise<UpgradeStartLease>;
|
|
267
278
|
waitForStartLeasesToDrain(lockArg: UpgradeInstallationLock): Promise<void>;
|
|
@@ -275,6 +286,8 @@ export declare class UpgradeCoordinator {
|
|
|
275
286
|
token: string;
|
|
276
287
|
port: number;
|
|
277
288
|
sourceVersion: string;
|
|
289
|
+
/** The source package's `controllerGatewaySourcesVersion`, read from its installed `package.json`. */
|
|
290
|
+
sourceGatewaySourcesVersion?: number;
|
|
278
291
|
registryUrl?: string;
|
|
279
292
|
controllerWasRunning: boolean;
|
|
280
293
|
continueSessions: boolean;
|