@aeolus-fleet/trierarch-plugin 0.30.0 → 0.32.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/README.md +6 -3
- package/dist/adapters/fleet/core-version.d.ts +12 -3
- package/dist/adapters/fleet/core-version.js +22 -6
- package/dist/adapters/fleet/core-version.js.map +1 -1
- package/dist/adapters/fleet/rest-fleet-door.js +10 -0
- package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
- package/dist/adapters/prisma/enabled-models.d.ts +4 -0
- package/dist/adapters/prisma/enabled-models.js +14 -0
- package/dist/adapters/prisma/enabled-models.js.map +1 -0
- package/dist/adapters/prisma/fleet-forgetter.d.ts +1 -1
- package/dist/adapters/prisma/fleet-forgetter.js +2 -2
- package/dist/adapters/prisma/fleet-forgetter.js.map +1 -1
- package/dist/adapters/prisma/generated/browser.d.ts +7 -0
- package/dist/adapters/prisma/generated/client.d.ts +7 -0
- package/dist/adapters/prisma/generated/internal/class.d.ts +11 -0
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +82 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +6 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +6 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +6 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/EnabledModel.d.ts +920 -0
- package/dist/adapters/prisma/generated/models/EnabledModel.js +2 -0
- package/dist/adapters/prisma/generated/models/EnabledModel.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +1 -0
- package/dist/adapters/trpc/router.d.ts +125 -0
- package/dist/adapters/trpc/router.js +15 -1
- package/dist/adapters/trpc/router.js.map +1 -1
- package/dist/app.d.ts +3 -0
- package/dist/app.js +41 -4
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-trierarch-plugin.js +1 -0
- package/dist/bin/aeolus-trierarch-plugin.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.js +18 -0
- package/dist/config.js.map +1 -1
- package/dist/core/assignment/assign-crews.d.ts +4 -1
- package/dist/core/assignment/assign-crews.js +4 -2
- package/dist/core/assignment/assign-crews.js.map +1 -1
- package/dist/core/assignment/check-crew-settings.d.ts +4 -2
- package/dist/core/assignment/check-crew-settings.js +3 -3
- package/dist/core/assignment/check-crew-settings.js.map +1 -1
- package/dist/core/assignment/placement.d.ts +14 -3
- package/dist/core/assignment/placement.js +48 -11
- package/dist/core/assignment/placement.js.map +1 -1
- package/dist/core/connection/ports.d.ts +7 -0
- package/dist/core/installation/ports.d.ts +2 -1
- package/dist/core/machines/join-machine.d.ts +2 -1
- package/dist/core/machines/join-machine.js +4 -2
- package/dist/core/machines/join-machine.js.map +1 -1
- package/dist/core/models/list-enabled-models.d.ts +7 -0
- package/dist/core/models/list-enabled-models.js +5 -0
- package/dist/core/models/list-enabled-models.js.map +1 -0
- package/dist/core/models/ports.d.ts +11 -0
- package/dist/core/models/ports.js +2 -0
- package/dist/core/models/ports.js.map +1 -0
- package/dist/core/models/set-model-enabled.d.ts +15 -0
- package/dist/core/models/set-model-enabled.js +12 -0
- package/dist/core/models/set-model-enabled.js.map +1 -0
- package/dist/core/operator/authenticate-operator.d.ts +2 -2
- package/dist/core/operator/ports.d.ts +2 -2
- package/dist/core/repositories/resend-trusted-repositories.d.ts +15 -0
- package/dist/core/repositories/resend-trusted-repositories.js +19 -0
- package/dist/core/repositories/resend-trusted-repositories.js.map +1 -0
- package/dist/core/repositories/share-trusted-repositories.d.ts +25 -0
- package/dist/core/repositories/share-trusted-repositories.js +45 -0
- package/dist/core/repositories/share-trusted-repositories.js.map +1 -0
- package/dist/core/repositories/trusted-repositories.d.ts +22 -0
- package/dist/core/repositories/trusted-repositories.js +91 -0
- package/dist/core/repositories/trusted-repositories.js.map +1 -0
- package/package.json +3 -3
- package/src/adapters/prisma/migrations/20261025100000_enabled_models/migration.sql +7 -0
- package/src/adapters/prisma/schema.prisma +13 -1
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The trusted repositories (aeolus-fleet#384): the one list, in the trierarch
|
|
3
|
+
* plugin's configuration, of the repositories a trierarch may clone on demand,
|
|
4
|
+
* each by the name a crew request's workspace gives it and its git URL. It is
|
|
5
|
+
* true across all trierarchs. A URL never holds a credential: a clone uses the
|
|
6
|
+
* access the machine holds.
|
|
7
|
+
*/
|
|
8
|
+
import { PAYLOAD_MAX_BYTES, payloadBytes, trierarchNameSchema } from '@aeolus-fleet/common';
|
|
9
|
+
import { z } from 'zod';
|
|
10
|
+
import { err, ok } from '../shared/result.js';
|
|
11
|
+
/** The content type of the message that carries the list to a trierarch. */
|
|
12
|
+
export const TRUSTED_REPOSITORIES_CONTENT_TYPE = 'application/vnd.aeolus.trierarch.trusted-repositories+json';
|
|
13
|
+
/** The content type of the message a trierarch asks for the list again with, as it starts knowing the trierarch plugin's ship. */
|
|
14
|
+
export const TRUSTED_REPOSITORIES_REQUEST_CONTENT_TYPE = 'application/vnd.aeolus.trierarch.trusted-repositories-request+json';
|
|
15
|
+
const BYTES_PER_KB = 1024;
|
|
16
|
+
const URL_REFUSED = 'a trusted repository is an https:// or ssh URL, never a path, a file URL or a credential';
|
|
17
|
+
/**
|
|
18
|
+
* git's scp-like ssh form, `user@host:path`. Neither user, host nor path may
|
|
19
|
+
* start with `-`, which ssh would read as an option.
|
|
20
|
+
*/
|
|
21
|
+
const SCP_LIKE = /^[A-Za-z0-9_][A-Za-z0-9._-]*@[A-Za-z0-9][A-Za-z0-9.-]*:[^\s-]\S*$/;
|
|
22
|
+
/** Whether the URL's user reads as an ssh option once decoded; a user that does not decode is no user git can take either. */
|
|
23
|
+
function isOptionUser(username) {
|
|
24
|
+
try {
|
|
25
|
+
return decodeURIComponent(username).startsWith('-');
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Whether git may clone from the URL with the machine's own access: https
|
|
33
|
+
* with no user (a user there is a token), or ssh with no password and no user
|
|
34
|
+
* or host that reads as an option. Never a path, a file URL or a remote helper
|
|
35
|
+
* such as `ext::`, which runs a command.
|
|
36
|
+
*/
|
|
37
|
+
function isCloneable(url) {
|
|
38
|
+
if (/\s/.test(url)) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
if (SCP_LIKE.test(url)) {
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
44
|
+
if (!URL.canParse(url)) {
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
const parsed = new URL(url);
|
|
48
|
+
const hasRepository = parsed.pathname.length > 1;
|
|
49
|
+
const hasSafeHost = parsed.hostname !== '' && !parsed.hostname.startsWith('-');
|
|
50
|
+
if (parsed.protocol === 'https:') {
|
|
51
|
+
return hasRepository && hasSafeHost && parsed.username === '' && parsed.password === '';
|
|
52
|
+
}
|
|
53
|
+
if (parsed.protocol === 'ssh:') {
|
|
54
|
+
return hasRepository && hasSafeHost && parsed.password === '' && !isOptionUser(parsed.username);
|
|
55
|
+
}
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
const listedSchema = z.record(z.string(), z.unknown());
|
|
59
|
+
/**
|
|
60
|
+
* The list from the configuration's object of names to git URLs, or why not:
|
|
61
|
+
* each name a trierarch name, each URL one git clones with the machine's
|
|
62
|
+
* access, and the whole small enough to reach a trierarch in one message.
|
|
63
|
+
*/
|
|
64
|
+
export function readTrustedRepositories(listed) {
|
|
65
|
+
const object = listedSchema.safeParse(listed);
|
|
66
|
+
if (!object.success || Array.isArray(listed)) {
|
|
67
|
+
return err({ reason: 'the trusted repositories are an object of names to git URLs' });
|
|
68
|
+
}
|
|
69
|
+
const repositories = [];
|
|
70
|
+
for (const [name, url] of Object.entries(object.data)) {
|
|
71
|
+
const named = trierarchNameSchema.safeParse(name);
|
|
72
|
+
if (!named.success) {
|
|
73
|
+
return err({ reason: `${name}: ${named.error.issues[0]?.message ?? 'not a name'}` });
|
|
74
|
+
}
|
|
75
|
+
if (typeof url !== 'string' || !isCloneable(url)) {
|
|
76
|
+
return err({ reason: `${name}: ${URL_REFUSED}` });
|
|
77
|
+
}
|
|
78
|
+
repositories.push({ name, url });
|
|
79
|
+
}
|
|
80
|
+
repositories.sort((first, second) => first.name.localeCompare(second.name));
|
|
81
|
+
const list = { repositories };
|
|
82
|
+
if (payloadBytes(trustedRepositoriesPayload(list)) > PAYLOAD_MAX_BYTES) {
|
|
83
|
+
return err({ reason: `the trusted repositories do not fit one message of ${String(PAYLOAD_MAX_BYTES / BYTES_PER_KB)} KB` });
|
|
84
|
+
}
|
|
85
|
+
return ok(list);
|
|
86
|
+
}
|
|
87
|
+
/** The list as a trierarch receives it: `{ "repositories": [{ "name", "url" }] }`. */
|
|
88
|
+
export function trustedRepositoriesPayload(list) {
|
|
89
|
+
return JSON.stringify({ repositories: list.repositories });
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=trusted-repositories.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trusted-repositories.js","sourceRoot":"","sources":["../../../src/core/repositories/trusted-repositories.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aeolus-fleet/trierarch-plugin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.32.0",
|
|
4
4
|
"description": "Brings your machines into an Aeolus fleet and places crew requests on them.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aeolus",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"postpack": "rm LICENSE"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@aeolus-fleet/common": "^0.
|
|
52
|
+
"@aeolus-fleet/common": "^0.32.0",
|
|
53
53
|
"@prisma/adapter-pg": "^7.10.0",
|
|
54
54
|
"@prisma/client": "^7.10.0",
|
|
55
55
|
"@trpc/server": "^11.19.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"zod": "^4.6.5"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@aeolus-fleet/core": "^0.
|
|
61
|
+
"@aeolus-fleet/core": "^0.32.0",
|
|
62
62
|
"@testcontainers/postgresql": "^12.2.0"
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// The trierarch plugin's tables, in its own small database (decision 0030): per
|
|
2
|
-
// fleet only its connection
|
|
2
|
+
// fleet only its connection, its switch and its enabled models (decision 0063),
|
|
3
|
+
// and the installation's requests.
|
|
3
4
|
// Everything else (crew requests, statuses, machines) lives in the fleet, which
|
|
4
5
|
// it reaches only through its public API, as the ship it crews.
|
|
5
6
|
//
|
|
@@ -56,3 +57,14 @@ model InstallationRequest {
|
|
|
56
57
|
@@index([fleetId])
|
|
57
58
|
@@map("installation_requests")
|
|
58
59
|
}
|
|
60
|
+
|
|
61
|
+
/// The models each fleet's agent ships may be crewed with (decision 0063): exact
|
|
62
|
+
/// model ids, one row each. None is no rule. Forgotten with the fleet; switching
|
|
63
|
+
/// the trierarch plugin off keeps them.
|
|
64
|
+
model EnabledModel {
|
|
65
|
+
fleetId String @map("fleet_id")
|
|
66
|
+
model String
|
|
67
|
+
|
|
68
|
+
@@id([fleetId, model])
|
|
69
|
+
@@map("enabled_models")
|
|
70
|
+
}
|