@aeolus-fleet/core 0.33.0 → 0.34.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 +24 -0
- package/dist/adapters/cli/fleet-api.d.ts +33 -0
- package/dist/adapters/cli/fleet-api.js +64 -0
- package/dist/adapters/cli/fleet-api.js.map +1 -0
- package/dist/adapters/cli/fleet-recover-keys.d.ts +22 -0
- package/dist/adapters/cli/fleet-recover-keys.js +81 -0
- package/dist/adapters/cli/fleet-recover-keys.js.map +1 -0
- package/dist/adapters/cli/run.js +1 -1
- package/dist/adapters/cli/run.js.map +1 -1
- package/dist/adapters/crypto/age-recovery-identity.d.ts +9 -0
- package/dist/adapters/crypto/age-recovery-identity.js +45 -0
- package/dist/adapters/crypto/age-recovery-identity.js.map +1 -0
- package/dist/adapters/crypto/age-recovery-keys.d.ts +2 -0
- package/dist/adapters/crypto/age-recovery-keys.js +36 -0
- package/dist/adapters/crypto/age-recovery-keys.js.map +1 -0
- package/dist/adapters/crypto/payload-sealer.d.ts +2 -0
- package/dist/adapters/crypto/payload-sealer.js +48 -0
- package/dist/adapters/crypto/payload-sealer.js.map +1 -0
- package/dist/adapters/kms/aws-kms-key-vault.d.ts +13 -0
- package/dist/adapters/kms/aws-kms-key-vault.js +98 -0
- package/dist/adapters/kms/aws-kms-key-vault.js.map +1 -0
- package/dist/adapters/kms/company-key-vault.d.ts +9 -0
- package/dist/adapters/kms/company-key-vault.js +14 -0
- package/dist/adapters/kms/company-key-vault.js.map +1 -0
- package/dist/adapters/kms/no-key-vault.d.ts +7 -0
- package/dist/adapters/kms/no-key-vault.js +11 -0
- package/dist/adapters/kms/no-key-vault.js.map +1 -0
- package/dist/adapters/prisma/feature-flags.d.ts +7 -0
- package/dist/adapters/prisma/feature-flags.js +29 -0
- package/dist/adapters/prisma/feature-flags.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +16 -1
- package/dist/adapters/prisma/generated/client.d.ts +16 -1
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +187 -97
- package/dist/adapters/prisma/generated/enums.d.ts +5 -0
- package/dist/adapters/prisma/generated/enums.js +4 -0
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +22 -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 +203 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +36 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +36 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +36 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/DataKey.d.ts +1503 -0
- package/dist/adapters/prisma/generated/models/DataKey.js +2 -0
- package/dist/adapters/prisma/generated/models/DataKey.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +2475 -2
- package/dist/adapters/prisma/generated/models/FleetFeatureFlag.d.ts +1117 -0
- package/dist/adapters/prisma/generated/models/FleetFeatureFlag.js +2 -0
- package/dist/adapters/prisma/generated/models/FleetFeatureFlag.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Lease.d.ts +0 -7
- package/dist/adapters/prisma/generated/models/Message.d.ts +728 -62
- package/dist/adapters/prisma/generated/models/MessageDay.d.ts +1 -5
- package/dist/adapters/prisma/generated/models/Schedule.d.ts +657 -50
- package/dist/adapters/prisma/generated/models/Ship.d.ts +0 -3
- package/dist/adapters/prisma/generated/models.d.ts +2 -0
- package/dist/adapters/prisma/history-pruner.js +3 -2
- package/dist/adapters/prisma/history-pruner.js.map +1 -1
- package/dist/adapters/prisma/history.d.ts +2 -2
- package/dist/adapters/prisma/history.js +5 -7
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/installation.js +14 -3
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/messaging.js +5 -3
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.js +2 -0
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.d.ts +11 -0
- package/dist/adapters/prisma/rows.js +25 -2
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/schedules.d.ts +3 -0
- package/dist/adapters/prisma/schedules.js +5 -4
- package/dist/adapters/prisma/schedules.js.map +1 -1
- package/dist/adapters/prisma/sealings.d.ts +4 -0
- package/dist/adapters/prisma/sealings.js +211 -0
- package/dist/adapters/prisma/sealings.js.map +1 -0
- package/dist/adapters/prisma/unit-of-work.d.ts +4 -2
- package/dist/adapters/prisma/unit-of-work.js +4 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +13 -1
- package/dist/adapters/trpc/console.js +6 -3
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +16 -0
- package/dist/adapters/trpc/fleet.d.ts +150 -3
- package/dist/adapters/trpc/fleet.js +113 -11
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +138 -2
- package/dist/adapters/trpc/installation.js +19 -3
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/listed-payload.d.ts +9 -0
- package/dist/adapters/trpc/listed-payload.js +8 -0
- package/dist/adapters/trpc/listed-payload.js.map +1 -0
- package/dist/adapters/trpc/router.d.ts +290 -3
- package/dist/adapters/trpc/ship-contract.js +1 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +11 -0
- package/dist/adapters/trpc/ship.js +3 -2
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/starting-prompt-text.js +2 -1
- package/dist/adapters/trpc/starting-prompt-text.js.map +1 -1
- package/dist/adapters/trpc/system.d.ts +10 -0
- package/dist/adapters/trpc/trpc.d.ts +15 -3
- package/dist/adapters/trpc/trpc.js +31 -6
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +3 -0
- package/dist/app.js +11 -1
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-core.js +8 -1
- package/dist/bin/aeolus-core.js.map +1 -1
- package/dist/config.d.ts +11 -0
- package/dist/config.js +8 -2
- package/dist/config.js.map +1 -1
- package/dist/domain/messaging/add-to-meeting.d.ts +6 -2
- package/dist/domain/messaging/add-to-meeting.js +7 -4
- package/dist/domain/messaging/add-to-meeting.js.map +1 -1
- package/dist/domain/messaging/change-company-key.d.ts +46 -0
- package/dist/domain/messaging/change-company-key.js +74 -0
- package/dist/domain/messaging/change-company-key.js.map +1 -0
- package/dist/domain/messaging/change-meeting.d.ts +6 -2
- package/dist/domain/messaging/change-meeting.js +6 -4
- package/dist/domain/messaging/change-meeting.js.map +1 -1
- package/dist/domain/messaging/change-mic.d.ts +6 -1
- package/dist/domain/messaging/change-mic.js +6 -3
- package/dist/domain/messaging/change-mic.js.map +1 -1
- package/dist/domain/messaging/change-recovery-key.d.ts +45 -0
- package/dist/domain/messaging/change-recovery-key.js +68 -0
- package/dist/domain/messaging/change-recovery-key.js.map +1 -0
- package/dist/domain/messaging/company-key-check.d.ts +20 -0
- package/dist/domain/messaging/company-key-check.js +31 -0
- package/dist/domain/messaging/company-key-check.js.map +1 -0
- package/dist/domain/messaging/data-keys.d.ts +165 -0
- package/dist/domain/messaging/data-keys.js +275 -0
- package/dist/domain/messaging/data-keys.js.map +1 -0
- package/dist/domain/messaging/fleet-sealing.d.ts +75 -0
- package/dist/domain/messaging/fleet-sealing.js +21 -0
- package/dist/domain/messaging/fleet-sealing.js.map +1 -0
- package/dist/domain/messaging/key-unavailable.d.ts +5 -0
- package/dist/domain/messaging/key-unavailable.js +14 -0
- package/dist/domain/messaging/key-unavailable.js.map +1 -0
- package/dist/domain/messaging/key-vault.d.ts +61 -0
- package/dist/domain/messaging/key-vault.js +2 -0
- package/dist/domain/messaging/key-vault.js.map +1 -0
- package/dist/domain/messaging/meeting-notice.d.ts +15 -13
- package/dist/domain/messaging/meeting-notice.js +12 -3
- package/dist/domain/messaging/meeting-notice.js.map +1 -1
- package/dist/domain/messaging/message.d.ts +17 -4
- package/dist/domain/messaging/message.js +19 -5
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/open-meeting.d.ts +8 -2
- package/dist/domain/messaging/open-meeting.js +6 -1
- package/dist/domain/messaging/open-meeting.js.map +1 -1
- package/dist/domain/messaging/payload-sealer.d.ts +39 -0
- package/dist/domain/messaging/payload-sealer.js +2 -0
- package/dist/domain/messaging/payload-sealer.js.map +1 -0
- package/dist/domain/messaging/ping-ship.d.ts +4 -1
- package/dist/domain/messaging/ping-ship.js +6 -4
- package/dist/domain/messaging/ping-ship.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +98 -1
- package/dist/domain/messaging/public.d.ts +4 -1
- package/dist/domain/messaging/public.js +2 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -0
- package/dist/domain/messaging/push-receive-deliveries.js +8 -2
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/read-delivery.d.ts +6 -2
- package/dist/domain/messaging/read-delivery.js +7 -4
- package/dist/domain/messaging/read-delivery.js.map +1 -1
- package/dist/domain/messaging/read-meeting.d.ts +9 -3
- package/dist/domain/messaging/read-meeting.js +11 -4
- package/dist/domain/messaging/read-meeting.js.map +1 -1
- package/dist/domain/messaging/read-recovery-set.d.ts +34 -0
- package/dist/domain/messaging/read-recovery-set.js +43 -0
- package/dist/domain/messaging/read-recovery-set.js.map +1 -0
- package/dist/domain/messaging/read-sealing.d.ts +30 -0
- package/dist/domain/messaging/read-sealing.js +28 -0
- package/dist/domain/messaging/read-sealing.js.map +1 -0
- package/dist/domain/messaging/receive-deliveries.d.ts +18 -6
- package/dist/domain/messaging/receive-deliveries.js +18 -6
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/receive-reply.d.ts +2 -0
- package/dist/domain/messaging/receive-reply.js +2 -1
- package/dist/domain/messaging/receive-reply.js.map +1 -1
- package/dist/domain/messaging/recover-keys.d.ts +56 -0
- package/dist/domain/messaging/recover-keys.js +83 -0
- package/dist/domain/messaging/recover-keys.js.map +1 -0
- package/dist/domain/messaging/recovery-key.d.ts +25 -0
- package/dist/domain/messaging/recovery-key.js +14 -0
- package/dist/domain/messaging/recovery-key.js.map +1 -0
- package/dist/domain/messaging/reply-to-message.d.ts +2 -0
- package/dist/domain/messaging/reply-to-message.js +4 -3
- package/dist/domain/messaging/reply-to-message.js.map +1 -1
- package/dist/domain/messaging/resend-delivery.d.ts +9 -2
- package/dist/domain/messaging/resend-delivery.js +26 -6
- package/dist/domain/messaging/resend-delivery.js.map +1 -1
- package/dist/domain/messaging/retired-participant.d.ts +5 -2
- package/dist/domain/messaging/retired-participant.js +2 -1
- package/dist/domain/messaging/retired-participant.js.map +1 -1
- package/dist/domain/messaging/rotate-data-keys.d.ts +33 -0
- package/dist/domain/messaging/rotate-data-keys.js +52 -0
- package/dist/domain/messaging/rotate-data-keys.js.map +1 -0
- package/dist/domain/messaging/schedule-message.d.ts +10 -2
- package/dist/domain/messaging/schedule-message.js +43 -15
- package/dist/domain/messaging/schedule-message.js.map +1 -1
- package/dist/domain/messaging/schedule.d.ts +18 -1
- package/dist/domain/messaging/schedule.js +15 -0
- package/dist/domain/messaging/schedule.js.map +1 -1
- package/dist/domain/messaging/seal-stored-payloads.d.ts +45 -0
- package/dist/domain/messaging/seal-stored-payloads.js +122 -0
- package/dist/domain/messaging/seal-stored-payloads.js.map +1 -0
- package/dist/domain/messaging/sealed-payload.d.ts +9 -0
- package/dist/domain/messaging/sealed-payload.js +15 -0
- package/dist/domain/messaging/sealed-payload.js.map +1 -0
- package/dist/domain/messaging/send-due-schedules.d.ts +6 -0
- package/dist/domain/messaging/send-due-schedules.js +63 -16
- package/dist/domain/messaging/send-due-schedules.js.map +1 -1
- package/dist/domain/messaging/send-message.d.ts +20 -6
- package/dist/domain/messaging/send-message.js +51 -18
- package/dist/domain/messaging/send-message.js.map +1 -1
- package/dist/domain/messaging/send-request.d.ts +4 -2
- package/dist/domain/messaging/send-request.js +3 -2
- package/dist/domain/messaging/send-request.js.map +1 -1
- package/dist/domain/messaging/turn-on-sealing.d.ts +61 -0
- package/dist/domain/messaging/turn-on-sealing.js +76 -0
- package/dist/domain/messaging/turn-on-sealing.js.map +1 -0
- package/dist/domain/registry/create-fleet.d.ts +7 -3
- package/dist/domain/registry/create-fleet.js +9 -2
- package/dist/domain/registry/create-fleet.js.map +1 -1
- package/dist/domain/registry/feature-flag.d.ts +66 -0
- package/dist/domain/registry/feature-flag.js +56 -0
- package/dist/domain/registry/feature-flag.js.map +1 -0
- package/dist/domain/registry/get-ship.d.ts +2 -0
- package/dist/domain/registry/get-ship.js +1 -0
- package/dist/domain/registry/get-ship.js.map +1 -1
- package/dist/domain/registry/installation-fleet.d.ts +3 -1
- package/dist/domain/registry/installation-fleet.js +3 -1
- package/dist/domain/registry/installation-fleet.js.map +1 -1
- package/dist/domain/registry/lease.d.ts +1 -1
- package/dist/domain/registry/lease.js +1 -1
- package/dist/domain/registry/ports.d.ts +15 -1
- package/dist/domain/registry/public.d.ts +2 -0
- package/dist/domain/registry/public.js +1 -0
- package/dist/domain/registry/public.js.map +1 -1
- package/dist/domain/registry/read-feature-flags.d.ts +16 -0
- package/dist/domain/registry/read-feature-flags.js +11 -0
- package/dist/domain/registry/read-feature-flags.js.map +1 -0
- package/dist/domain/registry/retire-ship.d.ts +6 -2
- package/dist/domain/registry/retire-ship.js +7 -4
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/set-feature-flag.d.ts +34 -0
- package/dist/domain/registry/set-feature-flag.js +37 -0
- package/dist/domain/registry/set-feature-flag.js.map +1 -0
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/history.d.ts +22 -21
- package/dist/domain/shared/plain-history.d.ts +45 -0
- package/dist/domain/shared/plain-history.js +35 -0
- package/dist/domain/shared/plain-history.js.map +1 -0
- package/dist/domain/shared/read-health.d.ts +14 -3
- package/dist/domain/shared/read-health.js +8 -4
- package/dist/domain/shared/read-health.js.map +1 -1
- package/dist/domain/shared/read-inbox-message.d.ts +7 -2
- package/dist/domain/shared/read-inbox-message.js +5 -1
- package/dist/domain/shared/read-inbox-message.js.map +1 -1
- package/dist/domain/shared/read-inbox-withdrawals.d.ts +9 -3
- package/dist/domain/shared/read-inbox-withdrawals.js +7 -3
- package/dist/domain/shared/read-inbox-withdrawals.js.map +1 -1
- package/dist/domain/shared/read-inbox.d.ts +14 -4
- package/dist/domain/shared/read-inbox.js +7 -3
- package/dist/domain/shared/read-inbox.js.map +1 -1
- package/dist/domain/shared/read-message.d.ts +11 -2
- package/dist/domain/shared/read-message.js +6 -2
- package/dist/domain/shared/read-message.js.map +1 -1
- package/dist/domain/shared/read-needs-attention.d.ts +6 -2
- package/dist/domain/shared/read-needs-attention.js +7 -5
- package/dist/domain/shared/read-needs-attention.js.map +1 -1
- package/dist/domain/shared/read-ship-messages.d.ts +10 -1
- package/dist/domain/shared/read-ship-messages.js +9 -3
- package/dist/domain/shared/read-ship-messages.js.map +1 -1
- package/dist/start.js +2 -0
- package/dist/start.js.map +1 -1
- package/dist/testing/container-images.d.ts +13 -6
- package/dist/testing/container-images.js +14 -7
- package/dist/testing/container-images.js.map +1 -1
- package/dist/wiring.d.ts +26 -0
- package/dist/wiring.js +57 -20
- package/dist/wiring.js.map +1 -1
- package/package.json +4 -2
- package/src/adapters/prisma/migrations/20261029120000_data_keys/migration.sql +23 -0
- package/src/adapters/prisma/migrations/20261029180000_sealed_messages/migration.sql +42 -0
- package/src/adapters/prisma/migrations/20261029200000_sealed_schedules/migration.sql +20 -0
- package/src/adapters/prisma/migrations/20261030090000_key_availability/migration.sql +18 -0
- package/src/adapters/prisma/migrations/20261030120000_keys_scope/migration.sql +64 -0
- package/src/adapters/prisma/migrations/20261031090000_recovery_key/migration.sql +11 -0
- package/src/adapters/prisma/migrations/20261101090000_sealing_progress/migration.sql +16 -0
- package/src/adapters/prisma/migrations/20261102090000_feature_flags/migration.sql +17 -0
- package/src/adapters/prisma/schema.prisma +104 -23
|
@@ -6,15 +6,18 @@ import { ok } from '../shared/result.js';
|
|
|
6
6
|
import { withinDailyMessageLimit } from './daily-message-limit.js';
|
|
7
7
|
import { addToMeeting } from './meeting-life.js';
|
|
8
8
|
import { addedNoticeOf, tellParticipant } from './meeting-notice.js';
|
|
9
|
+
import { withDataKeys } from './data-keys.js';
|
|
9
10
|
/**
|
|
10
11
|
* Use case: the owner adds ships to its open meeting later (decision 0061,
|
|
11
12
|
* M5, M6, M13), named as an open names them. It must reach each ship it adds
|
|
12
13
|
* by send, or nothing is added and the refusal is recorded. Each added ship
|
|
13
14
|
* gets the added notice from the owner, from joining on its deliveries, and
|
|
14
|
-
* the meeting so far to read. A ship present already stays as it is.
|
|
15
|
+
* the meeting so far to read. A ship present already stays as it is. In a
|
|
16
|
+
* sealed fleet the added notices are sealed with data keys unwrapped before
|
|
17
|
+
* the unit of work (decision 0068, B17).
|
|
15
18
|
*/
|
|
16
19
|
export function createAddToMeeting(deps) {
|
|
17
|
-
return (caller, input) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
20
|
+
return (caller, input) => withDataKeys({ sealing: deps.sealing, fleetId: caller.fleetId }, (held) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
18
21
|
const { fleetId } = caller;
|
|
19
22
|
const at = deps.clock.now();
|
|
20
23
|
const meeting = await tx.meetings.findForUpdate(fleetId, input.meetingId);
|
|
@@ -55,7 +58,7 @@ export function createAddToMeeting(deps) {
|
|
|
55
58
|
const payload = JSON.stringify(await addedNoticeOf(tx, added.value.meeting));
|
|
56
59
|
for (const shipId of added.value.added) {
|
|
57
60
|
// The added notice (M11): from the owner, who reached the ship just now.
|
|
58
|
-
const told = await tellParticipant({ tx, ids: deps.ids, hasher: deps.hasher }, {
|
|
61
|
+
const told = await tellParticipant({ tx, ids: deps.ids, hasher: deps.hasher, held }, {
|
|
59
62
|
meeting: added.value.meeting,
|
|
60
63
|
senderShipId: caller.shipId,
|
|
61
64
|
senderKind: caller.kind,
|
|
@@ -71,6 +74,6 @@ export function createAddToMeeting(deps) {
|
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
76
|
return ok(undefined);
|
|
74
|
-
});
|
|
77
|
+
}));
|
|
75
78
|
}
|
|
76
79
|
//# sourceMappingURL=add-to-meeting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-to-meeting.js","sourceRoot":"","sources":["../../../src/domain/messaging/add-to-meeting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAuD,MAAM,sBAAsB,CAAC;AAEvH,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,eAAe,EAAyG,MAAM,uBAAuB,CAAC;AAGhM,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,uBAAuB,EAA4B,MAAM,0BAA0B,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"add-to-meeting.js","sourceRoot":"","sources":["../../../src/domain/messaging/add-to-meeting.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import { type FeatureFlagReads } from '../registry/public.js';
|
|
3
|
+
import { type Caller } from '../shared/caller.js';
|
|
4
|
+
import type { Clock } from '../shared/clock.js';
|
|
5
|
+
import { type DomainError } from '../shared/errors.js';
|
|
6
|
+
import { type EventLog } from '../shared/events.js';
|
|
7
|
+
import { type Result } from '../shared/result.js';
|
|
8
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
9
|
+
import type { CompanyKeyReference, KeyVault } from './key-vault.js';
|
|
10
|
+
import type { PayloadSealer } from './payload-sealer.js';
|
|
11
|
+
import type { FleetSealingRepository } from './ports.js';
|
|
12
|
+
export interface ChangeCompanyKeyTx {
|
|
13
|
+
sealings: FleetSealingRepository;
|
|
14
|
+
events: EventLog;
|
|
15
|
+
}
|
|
16
|
+
export interface CompanyKeyChanged {
|
|
17
|
+
companyKey: CompanyKeyReference;
|
|
18
|
+
}
|
|
19
|
+
export type ChangeCompanyKeyRefusal = DomainError<'FORBIDDEN' | 'FEATURE_FLAG_OFF' | 'FLEET_NOT_SEALED' | 'KEY_UNAVAILABLE' | 'KEY_NOT_BOUND_TO_FLEET'>;
|
|
20
|
+
export type ChangeCompanyKey = (caller: Caller, input: {
|
|
21
|
+
companyKey: CompanyKeyReference;
|
|
22
|
+
}) => Promise<Result<CompanyKeyChanged, ChangeCompanyKeyRefusal>>;
|
|
23
|
+
/**
|
|
24
|
+
* Use case: changing a sealed fleet's company key (decision 0068, B13c), by
|
|
25
|
+
* an actor holding `fleet:keys`. The new key is checked as at turning sealing
|
|
26
|
+
* on (B4); then every data key is rewrapped from the old company key to the
|
|
27
|
+
* new one inside the key vault, outside every unit of work, so no data key
|
|
28
|
+
* leaves it. An old key that is not reachable refuses KEY_UNAVAILABLE:
|
|
29
|
+
* recovery is the way then (B15). Then one unit of work holds the fleet's
|
|
30
|
+
* sealing lock, so no rotation adds a key meanwhile, finds the same company
|
|
31
|
+
* key and data keys it rewrapped, and swaps every wrap and the reference,
|
|
32
|
+
* FleetCompanyKeyChanged naming both; a key rotated in between rewraps them
|
|
33
|
+
* again. Rolled back, every wrap and the reference stay as they were. No
|
|
34
|
+
* payload is sealed again.
|
|
35
|
+
*/
|
|
36
|
+
export declare function createChangeCompanyKey(deps: {
|
|
37
|
+
uow: UnitOfWork<ChangeCompanyKeyTx>;
|
|
38
|
+
clock: Clock;
|
|
39
|
+
ids: IdGenerator;
|
|
40
|
+
vault: KeyVault;
|
|
41
|
+
sealer: PayloadSealer;
|
|
42
|
+
/** The fleets' sealing and data keys, read outside the unit of work. */
|
|
43
|
+
sealings: FleetSealingRepository;
|
|
44
|
+
/** The fleets' feature flags: sealing's procedures refuse a fleet whose sealing flag is off (decision 0069). */
|
|
45
|
+
featureFlags: FeatureFlagReads;
|
|
46
|
+
}): ChangeCompanyKey;
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { checkFeatureFlag } from '../registry/public.js';
|
|
2
|
+
import { actorOf, hasScope } from '../shared/caller.js';
|
|
3
|
+
import { refuse } from '../shared/errors.js';
|
|
4
|
+
import { recordEvent } from '../shared/events.js';
|
|
5
|
+
import { err, ok } from '../shared/result.js';
|
|
6
|
+
import { checkCompanyKey } from './company-key-check.js';
|
|
7
|
+
import { keyUnavailable } from './key-unavailable.js';
|
|
8
|
+
/** How often the rewrap runs again for data keys rotated while it ran, before the change is refused. */
|
|
9
|
+
const MAX_RUNS = 3;
|
|
10
|
+
/**
|
|
11
|
+
* Use case: changing a sealed fleet's company key (decision 0068, B13c), by
|
|
12
|
+
* an actor holding `fleet:keys`. The new key is checked as at turning sealing
|
|
13
|
+
* on (B4); then every data key is rewrapped from the old company key to the
|
|
14
|
+
* new one inside the key vault, outside every unit of work, so no data key
|
|
15
|
+
* leaves it. An old key that is not reachable refuses KEY_UNAVAILABLE:
|
|
16
|
+
* recovery is the way then (B15). Then one unit of work holds the fleet's
|
|
17
|
+
* sealing lock, so no rotation adds a key meanwhile, finds the same company
|
|
18
|
+
* key and data keys it rewrapped, and swaps every wrap and the reference,
|
|
19
|
+
* FleetCompanyKeyChanged naming both; a key rotated in between rewraps them
|
|
20
|
+
* again. Rolled back, every wrap and the reference stay as they were. No
|
|
21
|
+
* payload is sealed again.
|
|
22
|
+
*/
|
|
23
|
+
export function createChangeCompanyKey(deps) {
|
|
24
|
+
return async (caller, { companyKey: to }) => {
|
|
25
|
+
if (!hasScope(caller, 'fleet:keys')) {
|
|
26
|
+
return refuse('FORBIDDEN', 'Changing the company key needs the fleet:keys scope');
|
|
27
|
+
}
|
|
28
|
+
const { fleetId } = caller;
|
|
29
|
+
const offered = await checkFeatureFlag(deps.featureFlags, { fleetId, flag: 'sealing' });
|
|
30
|
+
if (!offered.isOk) {
|
|
31
|
+
return offered;
|
|
32
|
+
}
|
|
33
|
+
if ((await deps.sealings.find(fleetId)) === undefined) {
|
|
34
|
+
return refuse('FLEET_NOT_SEALED', `Fleet ${fleetId} is not sealed: turn sealing on with the company key instead`);
|
|
35
|
+
}
|
|
36
|
+
const checked = await checkCompanyKey(deps, { fleetId, companyKey: to });
|
|
37
|
+
if (!checked.isOk) {
|
|
38
|
+
return checked;
|
|
39
|
+
}
|
|
40
|
+
for (let run = 1; run <= MAX_RUNS; run += 1) {
|
|
41
|
+
const ages = await deps.sealings.dataKeyAges(fleetId);
|
|
42
|
+
const wrapped = await deps.sealings.wrappedDataKeys(fleetId, ages.map(({ id }) => id));
|
|
43
|
+
if (wrapped === undefined) {
|
|
44
|
+
return refuse('FLEET_NOT_SEALED', `Fleet ${fleetId} is not sealed`);
|
|
45
|
+
}
|
|
46
|
+
const from = wrapped.companyKey;
|
|
47
|
+
const rewrapped = [];
|
|
48
|
+
for (const dataKey of wrapped.dataKeys) {
|
|
49
|
+
const moved = await deps.vault.rewrap({ fleetId, from, to }, dataKey.wrappedByCompanyKey);
|
|
50
|
+
if (!moved.isOk) {
|
|
51
|
+
const { message } = keyUnavailable(moved.error).error;
|
|
52
|
+
return refuse('KEY_UNAVAILABLE', `${message}. The old company key must be reachable to change it; without it, recovery with the recovery key is the way`);
|
|
53
|
+
}
|
|
54
|
+
rewrapped.push({ id: dataKey.id, wrappedByCompanyKey: moved.value });
|
|
55
|
+
}
|
|
56
|
+
const swapped = await deps.uow.run(async (tx) => {
|
|
57
|
+
await tx.sealings.lockSealing(fleetId);
|
|
58
|
+
const sealing = await tx.sealings.find(fleetId);
|
|
59
|
+
const ids = new Set((await tx.sealings.dataKeyAges(fleetId)).map(({ id }) => id));
|
|
60
|
+
if (sealing?.companyKey !== from || ids.size !== rewrapped.length || rewrapped.some(({ id }) => !ids.has(id))) {
|
|
61
|
+
return err({ kind: 'keysChanged' });
|
|
62
|
+
}
|
|
63
|
+
await tx.sealings.changeCompanyKey(fleetId, { companyKey: to, dataKeys: rewrapped });
|
|
64
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, { fleetId, type: 'FleetCompanyKeyChanged', occurredAt: deps.clock.now(), actor: actorOf(caller), details: { from, to } });
|
|
65
|
+
return ok({ companyKey: to });
|
|
66
|
+
});
|
|
67
|
+
if (swapped.isOk) {
|
|
68
|
+
return swapped;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return refuse('KEY_UNAVAILABLE', "The fleet's data keys changed while this call ran: call again");
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=change-company-key.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"change-company-key.js","sourceRoot":"","sources":["../../../src/domain/messaging/change-company-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAyB,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAe,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAkBtD,wGAAwG;AACxG,MAAM,QAAQ,GAAG,CAAC,CAAC;AAanB;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAUtC;IACC,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC,WAAW,EAAE,qDAAqD,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC,kBAAkB,EAAE,SAAS,OAAO,8DAA8D,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,QAAQ,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACvF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC,kBAAkB,EAAE,SAAS,OAAO,gBAAgB,CAAC,CAAC;YACtE,CAAC;YACD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;YAChC,MAAM,SAAS,GAAgB,EAAE,CAAC;YAClC,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBAC1F,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAChB,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;oBACtD,OAAO,MAAM,CAAC,iBAAiB,EAAE,GAAG,OAAO,6GAA6G,CAAC,CAAC;gBAC5J,CAAC;gBACD,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,mBAAmB,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YACvE,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAmD,EAAE;gBAC/F,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAClF,IAAI,OAAO,EAAE,UAAU,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC9G,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;gBACtC,CAAC;gBACD,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;gBACrF,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClL,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC,iBAAiB,EAAE,+DAA+D,CAAC,CAAC;IACpG,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -2,16 +2,18 @@ import type { IdGenerator, MeetingId } from '@aeolus-fleet/common';
|
|
|
2
2
|
import { type CheckReachTx, type NotReachable } from '../registry/public.js';
|
|
3
3
|
import type { ShipCaller } from '../shared/caller.js';
|
|
4
4
|
import type { Clock } from '../shared/clock.js';
|
|
5
|
+
import type { DomainError } from '../shared/errors.js';
|
|
5
6
|
import type { Result } from '../shared/result.js';
|
|
6
7
|
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
7
8
|
import { type MeetingChange, type MeetingChangeRefusal } from './meeting-life.js';
|
|
9
|
+
import { type PayloadSealing } from './data-keys.js';
|
|
8
10
|
import { type MeetingNoticeTx } from './meeting-notice.js';
|
|
9
11
|
import type { AcceptRefusal } from './message.js';
|
|
10
12
|
import type { MeetingRepository, RequestHasher } from './ports.js';
|
|
11
13
|
export interface ChangeMeetingTx extends MeetingNoticeTx, CheckReachTx {
|
|
12
14
|
meetings: Pick<MeetingRepository, 'findForUpdate' | 'save'>;
|
|
13
15
|
}
|
|
14
|
-
export type ChangeMeetingFailure = MeetingChangeRefusal | NotReachable | AcceptRefusal
|
|
16
|
+
export type ChangeMeetingFailure = MeetingChangeRefusal | NotReachable | AcceptRefusal | DomainError<'KEY_UNAVAILABLE'>;
|
|
15
17
|
export type ChangeMeeting = (caller: ShipCaller, input: {
|
|
16
18
|
meetingId: MeetingId;
|
|
17
19
|
change: MeetingChange;
|
|
@@ -22,11 +24,13 @@ export type ChangeMeeting = (caller: ShipCaller, input: {
|
|
|
22
24
|
* its moderator, or, as its owner or moderator, ends it. A rejoin is checked
|
|
23
25
|
* on the owner's reach of the ship, as when it was added (M5), a refusal
|
|
24
26
|
* recorded. One unit of work with its events and notices, the meeting held
|
|
25
|
-
* for update.
|
|
27
|
+
* for update. In a sealed fleet its notices are sealed with data keys
|
|
28
|
+
* unwrapped before the unit of work (decision 0068, B17).
|
|
26
29
|
*/
|
|
27
30
|
export declare function createChangeMeeting(deps: {
|
|
28
31
|
uow: UnitOfWork<ChangeMeetingTx>;
|
|
29
32
|
clock: Clock;
|
|
30
33
|
ids: IdGenerator;
|
|
31
34
|
hasher: RequestHasher;
|
|
35
|
+
sealing: PayloadSealing;
|
|
32
36
|
}): ChangeMeeting;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { checkReach, keepingReachRefusal } from '../registry/public.js';
|
|
2
2
|
import { recordEvent } from '../shared/events.js';
|
|
3
3
|
import { changeMeeting } from './meeting-life.js';
|
|
4
|
+
import { withDataKeys } from './data-keys.js';
|
|
4
5
|
import { tellOfChange } from './meeting-notice.js';
|
|
5
6
|
/**
|
|
6
7
|
* Changes a meeting the caller takes part in (decision 0061): it leaves or
|
|
@@ -8,10 +9,11 @@ import { tellOfChange } from './meeting-notice.js';
|
|
|
8
9
|
* its moderator, or, as its owner or moderator, ends it. A rejoin is checked
|
|
9
10
|
* on the owner's reach of the ship, as when it was added (M5), a refusal
|
|
10
11
|
* recorded. One unit of work with its events and notices, the meeting held
|
|
11
|
-
* for update.
|
|
12
|
+
* for update. In a sealed fleet its notices are sealed with data keys
|
|
13
|
+
* unwrapped before the unit of work (decision 0068, B17).
|
|
12
14
|
*/
|
|
13
15
|
export function createChangeMeeting(deps) {
|
|
14
|
-
return (caller, input) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
16
|
+
return (caller, input) => withDataKeys({ sealing: deps.sealing, fleetId: caller.fleetId }, (held) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
15
17
|
const { fleetId } = caller;
|
|
16
18
|
const at = deps.clock.now();
|
|
17
19
|
const changed = changeMeeting(await tx.meetings.findForUpdate(fleetId, input.meetingId), { meetingId: input.meetingId, by: caller.shipId, change: input.change, at });
|
|
@@ -29,7 +31,7 @@ export function createChangeMeeting(deps) {
|
|
|
29
31
|
for (const event of events) {
|
|
30
32
|
await recordEvent({ events: tx.events, ids: deps.ids }, event);
|
|
31
33
|
}
|
|
32
|
-
return tellOfChange({ tx, ids: deps.ids, hasher: deps.hasher }, { meeting, micGivenTo, endedBy: hasEnded ? caller.shipId : null, at });
|
|
33
|
-
});
|
|
34
|
+
return tellOfChange({ tx, ids: deps.ids, hasher: deps.hasher, held }, { meeting, micGivenTo, endedBy: hasEnded ? caller.shipId : null, at });
|
|
35
|
+
}));
|
|
34
36
|
}
|
|
35
37
|
//# sourceMappingURL=change-meeting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-meeting.js","sourceRoot":"","sources":["../../../src/domain/messaging/change-meeting.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAwC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"change-meeting.js","sourceRoot":"","sources":["../../../src/domain/messaging/change-meeting.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAwC,MAAM,uBAAuB,CAAC;AAI9G,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAiD,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,YAAY,EAA4C,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,YAAY,EAAwB,MAAM,qBAAqB,CAAC;AAYzE;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAA0H;IAC5J,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACvB,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAqE,EAAE;QACvL,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACtK,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAChE,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACvL,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChB,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,YAAY,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/I,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}
|
|
@@ -2,8 +2,10 @@ import type { IdGenerator, MeetingId } from '@aeolus-fleet/common';
|
|
|
2
2
|
import type { ShipRepository } from '../registry/public.js';
|
|
3
3
|
import type { ShipCaller } from '../shared/caller.js';
|
|
4
4
|
import type { Clock } from '../shared/clock.js';
|
|
5
|
+
import type { DomainError } from '../shared/errors.js';
|
|
5
6
|
import { type Result } from '../shared/result.js';
|
|
6
7
|
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
8
|
+
import { type PayloadSealing } from './data-keys.js';
|
|
7
9
|
import { type MeetingNoticeTx } from './meeting-notice.js';
|
|
8
10
|
import type { AcceptRefusal } from './message.js';
|
|
9
11
|
import { type MicChange, type MicRefusal } from './mic.js';
|
|
@@ -13,7 +15,7 @@ export interface ChangeMicTx extends MeetingNoticeTx {
|
|
|
13
15
|
meetings: Pick<MeetingRepository, 'findForUpdate' | 'save'>;
|
|
14
16
|
ships: Pick<ShipRepository, 'findMany'>;
|
|
15
17
|
}
|
|
16
|
-
export type ChangeMicFailure = MicRefusal | AcceptRefusal
|
|
18
|
+
export type ChangeMicFailure = MicRefusal | AcceptRefusal | DomainError<'KEY_UNAVAILABLE'>;
|
|
17
19
|
export interface RequestMicResponse {
|
|
18
20
|
mic: MicRead;
|
|
19
21
|
caller: {
|
|
@@ -33,10 +35,13 @@ export type ChangeMic = (caller: ShipCaller, input: {
|
|
|
33
35
|
* so mic changes take turns and a contribution in flight finishes first. The
|
|
34
36
|
* ship that gets the mic is told by a message from the moderator, which states
|
|
35
37
|
* no model: the change may be another ship's, as a release under first in line.
|
|
38
|
+
* In a sealed fleet that notice is sealed with data keys unwrapped before the
|
|
39
|
+
* unit of work (decision 0068, B17).
|
|
36
40
|
*/
|
|
37
41
|
export declare function createChangeMic(deps: {
|
|
38
42
|
uow: UnitOfWork<ChangeMicTx>;
|
|
39
43
|
clock: Clock;
|
|
40
44
|
ids: IdGenerator;
|
|
41
45
|
hasher: RequestHasher;
|
|
46
|
+
sealing: PayloadSealing;
|
|
42
47
|
}): ChangeMic;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { recordEvent } from '../shared/events.js';
|
|
2
2
|
import { ok } from '../shared/result.js';
|
|
3
|
+
import { withDataKeys } from './data-keys.js';
|
|
3
4
|
import { tellOfChange } from './meeting-notice.js';
|
|
4
5
|
import { changeMic } from './mic.js';
|
|
5
6
|
/**
|
|
@@ -8,9 +9,11 @@ import { changeMic } from './mic.js';
|
|
|
8
9
|
* so mic changes take turns and a contribution in flight finishes first. The
|
|
9
10
|
* ship that gets the mic is told by a message from the moderator, which states
|
|
10
11
|
* no model: the change may be another ship's, as a release under first in line.
|
|
12
|
+
* In a sealed fleet that notice is sealed with data keys unwrapped before the
|
|
13
|
+
* unit of work (decision 0068, B17).
|
|
11
14
|
*/
|
|
12
15
|
export function createChangeMic(deps) {
|
|
13
|
-
return (caller, input) => deps.uow.run(async (tx) => {
|
|
16
|
+
return (caller, input) => withDataKeys({ sealing: deps.sealing, fleetId: caller.fleetId }, (held) => deps.uow.run(async (tx) => {
|
|
14
17
|
const { fleetId } = caller;
|
|
15
18
|
const at = deps.clock.now();
|
|
16
19
|
const changed = changeMic(await tx.meetings.findForUpdate(fleetId, input.meetingId), { meetingId: input.meetingId, by: caller.shipId, change: input.change, at });
|
|
@@ -22,12 +25,12 @@ export function createChangeMic(deps) {
|
|
|
22
25
|
for (const event of events) {
|
|
23
26
|
await recordEvent({ events: tx.events, ids: deps.ids }, event);
|
|
24
27
|
}
|
|
25
|
-
const told = await tellOfChange({ tx, ids: deps.ids, hasher: deps.hasher }, { meeting, micGivenTo: givenTo, endedBy: null, at });
|
|
28
|
+
const told = await tellOfChange({ tx, ids: deps.ids, hasher: deps.hasher, held }, { meeting, micGivenTo: givenTo, endedBy: null, at });
|
|
26
29
|
if (!told.isOk) {
|
|
27
30
|
return told;
|
|
28
31
|
}
|
|
29
32
|
return input.change.kind === 'request' ? ok(await requestResponse(tx, { meeting, callerShipId: caller.shipId })) : ok(undefined);
|
|
30
|
-
});
|
|
33
|
+
}));
|
|
31
34
|
}
|
|
32
35
|
async function requestResponse(tx, { meeting, callerShipId }) {
|
|
33
36
|
// One read for the holder and the whole queue: a ship waits once, so the ids are as many as the meeting has participants.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-mic.js","sourceRoot":"","sources":["../../../src/domain/messaging/change-mic.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"change-mic.js","sourceRoot":"","sources":["../../../src/domain/messaging/change-mic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import { type FeatureFlagReads } from '../registry/public.js';
|
|
3
|
+
import { type Caller } from '../shared/caller.js';
|
|
4
|
+
import type { Clock } from '../shared/clock.js';
|
|
5
|
+
import { type DomainError } from '../shared/errors.js';
|
|
6
|
+
import { type EventLog } from '../shared/events.js';
|
|
7
|
+
import { type Result } from '../shared/result.js';
|
|
8
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
9
|
+
import type { PayloadSealing } from './data-keys.js';
|
|
10
|
+
import type { FleetSealingRepository } from './ports.js';
|
|
11
|
+
import { type RecoveryKeys } from './recovery-key.js';
|
|
12
|
+
export interface ChangeRecoveryKeyTx {
|
|
13
|
+
sealings: FleetSealingRepository;
|
|
14
|
+
events: EventLog;
|
|
15
|
+
}
|
|
16
|
+
export interface RecoveryKeyChanged {
|
|
17
|
+
recoveryKeyFingerprint: string;
|
|
18
|
+
}
|
|
19
|
+
export type ChangeRecoveryKeyRefusal = DomainError<'FORBIDDEN' | 'FEATURE_FLAG_OFF' | 'FLEET_NOT_SEALED' | 'INVALID_RECOVERY_KEY' | 'KEY_UNAVAILABLE'>;
|
|
20
|
+
export type ChangeRecoveryKey = (caller: Caller, input: {
|
|
21
|
+
recoveryKey: string;
|
|
22
|
+
}) => Promise<Result<RecoveryKeyChanged, ChangeRecoveryKeyRefusal>>;
|
|
23
|
+
/**
|
|
24
|
+
* Use case: changing a sealed fleet's recovery key (decision 0068, B13d), by
|
|
25
|
+
* an actor holding `fleet:keys`, or setting one on a fleet sealed without.
|
|
26
|
+
* Every data key is unwrapped through the company key, as a read unwraps it,
|
|
27
|
+
* and wrapped to the new recovery key, outside every unit of work; a company
|
|
28
|
+
* key that is not reachable refuses KEY_UNAVAILABLE. Then one unit of work
|
|
29
|
+
* holds the fleet's sealing lock, so no rotation adds a key meanwhile, finds
|
|
30
|
+
* the same data keys it wrapped, and swaps every recovery wrap and the
|
|
31
|
+
* recovery key, FleetRecoveryKeyChanged naming both fingerprints; a key
|
|
32
|
+
* rotated in between is wrapped again. Rolled back, every wrap stays as it
|
|
33
|
+
* was. No payload is sealed again.
|
|
34
|
+
*/
|
|
35
|
+
export declare function createChangeRecoveryKey(deps: {
|
|
36
|
+
uow: UnitOfWork<ChangeRecoveryKeyTx>;
|
|
37
|
+
clock: Clock;
|
|
38
|
+
ids: IdGenerator;
|
|
39
|
+
recoveryKeys: RecoveryKeys;
|
|
40
|
+
sealing: PayloadSealing;
|
|
41
|
+
/** The fleets' sealing and data keys, read outside the unit of work. */
|
|
42
|
+
sealings: FleetSealingRepository;
|
|
43
|
+
/** The fleets' feature flags: sealing's procedures refuse a fleet whose sealing flag is off (decision 0069). */
|
|
44
|
+
featureFlags: FeatureFlagReads;
|
|
45
|
+
}): ChangeRecoveryKey;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { checkFeatureFlag } from '../registry/public.js';
|
|
2
|
+
import { actorOf, hasScope } from '../shared/caller.js';
|
|
3
|
+
import { refuse } from '../shared/errors.js';
|
|
4
|
+
import { recordEvent } from '../shared/events.js';
|
|
5
|
+
import { err, ok } from '../shared/result.js';
|
|
6
|
+
import { keyUnavailable } from './key-unavailable.js';
|
|
7
|
+
import { recoveryKey as recoveryKeyOf } from './recovery-key.js';
|
|
8
|
+
/** How often the wrapping runs again for data keys rotated while it ran, before the change is refused. */
|
|
9
|
+
const MAX_RUNS = 3;
|
|
10
|
+
/**
|
|
11
|
+
* Use case: changing a sealed fleet's recovery key (decision 0068, B13d), by
|
|
12
|
+
* an actor holding `fleet:keys`, or setting one on a fleet sealed without.
|
|
13
|
+
* Every data key is unwrapped through the company key, as a read unwraps it,
|
|
14
|
+
* and wrapped to the new recovery key, outside every unit of work; a company
|
|
15
|
+
* key that is not reachable refuses KEY_UNAVAILABLE. Then one unit of work
|
|
16
|
+
* holds the fleet's sealing lock, so no rotation adds a key meanwhile, finds
|
|
17
|
+
* the same data keys it wrapped, and swaps every recovery wrap and the
|
|
18
|
+
* recovery key, FleetRecoveryKeyChanged naming both fingerprints; a key
|
|
19
|
+
* rotated in between is wrapped again. Rolled back, every wrap stays as it
|
|
20
|
+
* was. No payload is sealed again.
|
|
21
|
+
*/
|
|
22
|
+
export function createChangeRecoveryKey(deps) {
|
|
23
|
+
return async (caller, input) => {
|
|
24
|
+
if (!hasScope(caller, 'fleet:keys')) {
|
|
25
|
+
return refuse('FORBIDDEN', 'Changing the recovery key needs the fleet:keys scope');
|
|
26
|
+
}
|
|
27
|
+
const to = recoveryKeyOf(deps.recoveryKeys, input.recoveryKey);
|
|
28
|
+
if (!to.isOk) {
|
|
29
|
+
return to;
|
|
30
|
+
}
|
|
31
|
+
const { fleetId } = caller;
|
|
32
|
+
const offered = await checkFeatureFlag(deps.featureFlags, { fleetId, flag: 'sealing' });
|
|
33
|
+
if (!offered.isOk) {
|
|
34
|
+
return offered;
|
|
35
|
+
}
|
|
36
|
+
if ((await deps.sealings.find(fleetId)) === undefined) {
|
|
37
|
+
return refuse('FLEET_NOT_SEALED', `Fleet ${fleetId} is not sealed: turn sealing on with the recovery key instead`);
|
|
38
|
+
}
|
|
39
|
+
for (let run = 1; run <= MAX_RUNS; run += 1) {
|
|
40
|
+
const dataKeyIds = (await deps.sealings.dataKeyAges(fleetId)).map(({ id }) => id);
|
|
41
|
+
const unwrapped = await deps.sealing.dataKeys.unwrap(fleetId, dataKeyIds);
|
|
42
|
+
if (!unwrapped.isOk) {
|
|
43
|
+
return keyUnavailable(unwrapped.error);
|
|
44
|
+
}
|
|
45
|
+
const rewrapped = [];
|
|
46
|
+
for (const dataKey of unwrapped.value) {
|
|
47
|
+
rewrapped.push({ id: dataKey.id, wrappedByRecoveryKey: await deps.recoveryKeys.wrap(to.value, dataKey.material) });
|
|
48
|
+
}
|
|
49
|
+
const swapped = await deps.uow.run(async (tx) => {
|
|
50
|
+
await tx.sealings.lockSealing(fleetId);
|
|
51
|
+
const sealing = await tx.sealings.find(fleetId);
|
|
52
|
+
const ids = new Set((await tx.sealings.dataKeyAges(fleetId)).map(({ id }) => id));
|
|
53
|
+
if (sealing === undefined || ids.size !== rewrapped.length || rewrapped.some(({ id }) => !ids.has(id))) {
|
|
54
|
+
return err({ kind: 'keysChanged' });
|
|
55
|
+
}
|
|
56
|
+
await tx.sealings.changeRecoveryKey(fleetId, { recoveryKey: to.value, dataKeys: rewrapped });
|
|
57
|
+
const details = { from: sealing.recoveryKey?.fingerprint ?? null, to: to.value.fingerprint };
|
|
58
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, { fleetId, type: 'FleetRecoveryKeyChanged', occurredAt: deps.clock.now(), actor: actorOf(caller), details });
|
|
59
|
+
return ok({ recoveryKeyFingerprint: to.value.fingerprint });
|
|
60
|
+
});
|
|
61
|
+
if (swapped.isOk) {
|
|
62
|
+
return swapped;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return refuse('KEY_UNAVAILABLE', "The fleet's data keys changed while this call ran: call again");
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=change-recovery-key.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"change-recovery-key.js","sourceRoot":"","sources":["../../../src/domain/messaging/change-recovery-key.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import { type DomainError } from '../shared/errors.js';
|
|
3
|
+
import { type Result } from '../shared/result.js';
|
|
4
|
+
import type { CompanyKeyUse, DataKeyMaterial, KeyVault, MadeDataKey } from './key-vault.js';
|
|
5
|
+
export type CompanyKeyRefusal = DomainError<'KEY_UNAVAILABLE' | 'KEY_NOT_BOUND_TO_FLEET'>;
|
|
6
|
+
/**
|
|
7
|
+
* Checks a company key for a fleet (decision 0068, B4), before a fleet is
|
|
8
|
+
* sealed under it or moves to it (B13c): the key vault makes a data key
|
|
9
|
+
* under it for this fleet's context and unwraps it again, and refuses one for
|
|
10
|
+
* another fleet's context, so a key whose policy has no fleet condition,
|
|
11
|
+
* which one tenant could point at another's key with, is refused
|
|
12
|
+
* KEY_NOT_BOUND_TO_FLEET. A refusal or no answer is KEY_UNAVAILABLE with its
|
|
13
|
+
* reason. Answers the data key it made, wrapped and unwrapped.
|
|
14
|
+
*/
|
|
15
|
+
export declare function checkCompanyKey(deps: {
|
|
16
|
+
vault: KeyVault;
|
|
17
|
+
ids: IdGenerator;
|
|
18
|
+
}, use: CompanyKeyUse): Promise<Result<MadeDataKey & {
|
|
19
|
+
unwrapped: DataKeyMaterial;
|
|
20
|
+
}, CompanyKeyRefusal>>;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { refuse } from '../shared/errors.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
import { keyUnavailable } from './key-unavailable.js';
|
|
4
|
+
/**
|
|
5
|
+
* Checks a company key for a fleet (decision 0068, B4), before a fleet is
|
|
6
|
+
* sealed under it or moves to it (B13c): the key vault makes a data key
|
|
7
|
+
* under it for this fleet's context and unwraps it again, and refuses one for
|
|
8
|
+
* another fleet's context, so a key whose policy has no fleet condition,
|
|
9
|
+
* which one tenant could point at another's key with, is refused
|
|
10
|
+
* KEY_NOT_BOUND_TO_FLEET. A refusal or no answer is KEY_UNAVAILABLE with its
|
|
11
|
+
* reason. Answers the data key it made, wrapped and unwrapped.
|
|
12
|
+
*/
|
|
13
|
+
export async function checkCompanyKey(deps, use) {
|
|
14
|
+
const made = await deps.vault.makeDataKey(use);
|
|
15
|
+
if (!made.isOk) {
|
|
16
|
+
return keyUnavailable(made.error);
|
|
17
|
+
}
|
|
18
|
+
const unwrapped = await deps.vault.unwrap(use, made.value.wrapped);
|
|
19
|
+
if (!unwrapped.isOk) {
|
|
20
|
+
return keyUnavailable(unwrapped.error);
|
|
21
|
+
}
|
|
22
|
+
const otherFleet = await deps.vault.makeDataKey({ fleetId: deps.ids('fleet'), companyKey: use.companyKey });
|
|
23
|
+
if (otherFleet.isOk) {
|
|
24
|
+
return refuse('KEY_NOT_BOUND_TO_FLEET', `The key policy of ${use.companyKey} grants it for any fleet: grant it with a condition naming fleet ${use.fleetId}`);
|
|
25
|
+
}
|
|
26
|
+
if (otherFleet.error.reason !== 'accessDenied') {
|
|
27
|
+
return keyUnavailable(otherFleet.error);
|
|
28
|
+
}
|
|
29
|
+
return ok({ ...made.value, unwrapped: unwrapped.value });
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=company-key-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"company-key-check.js","sourceRoot":"","sources":["../../../src/domain/messaging/company-key-check.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAA2C,EAAE,GAAkB;IACnG,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpB,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5G,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,wBAAwB,EAAE,qBAAqB,GAAG,CAAC,UAAU,oEAAoE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAChK,CAAC;IACD,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;QAC/C,OAAO,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;AAC3D,CAAC"}
|