@aeolus-fleet/core 0.32.4 → 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
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import type { DataKeyId, 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, WrappedDataKey } from './key-vault.js';
|
|
10
|
+
import type { PayloadSealer } from './payload-sealer.js';
|
|
11
|
+
import type { FleetSealingRepository } from './ports.js';
|
|
12
|
+
export interface RecoverKeysTx {
|
|
13
|
+
sealings: FleetSealingRepository;
|
|
14
|
+
events: EventLog;
|
|
15
|
+
}
|
|
16
|
+
/** A data key as the recovery command uploads it: wrapped under the new company key for this fleet. */
|
|
17
|
+
export interface RecoveredDataKey {
|
|
18
|
+
readonly id: DataKeyId;
|
|
19
|
+
readonly wrappedByCompanyKey: WrappedDataKey;
|
|
20
|
+
}
|
|
21
|
+
export interface KeysRecovered {
|
|
22
|
+
companyKey: CompanyKeyReference;
|
|
23
|
+
}
|
|
24
|
+
export type RecoverKeysRefusal = DomainError<'FORBIDDEN' | 'FEATURE_FLAG_OFF' | 'FLEET_NOT_SEALED' | 'NO_RECOVERY_KEY' | 'RECOVERY_KEYS_MISMATCH' | 'KEY_UNAVAILABLE' | 'KEY_NOT_BOUND_TO_FLEET'>;
|
|
25
|
+
export type RecoverKeys = (caller: Caller, input: {
|
|
26
|
+
companyKey: CompanyKeyReference;
|
|
27
|
+
dataKeys: readonly RecoveredDataKey[];
|
|
28
|
+
}) => Promise<Result<KeysRecovered, RecoverKeysRefusal>>;
|
|
29
|
+
/**
|
|
30
|
+
* Use case: recovering a sealed fleet's data keys under a new company key
|
|
31
|
+
* (decision 0068, B15), by an actor holding `fleet:keys`, when the company
|
|
32
|
+
* key is lost and the fleet has a recovery key. The recovery command opened
|
|
33
|
+
* each data key with the offline recovery key on the company's computer and
|
|
34
|
+
* wrapped it under the new company key in the company's KMS; no plain data
|
|
35
|
+
* key reaches core. The new key is checked as at turning sealing on (B4).
|
|
36
|
+
* The upload must name exactly the fleet's data keys, and each wrap must open
|
|
37
|
+
* through the installation's grant on the new key to the key its check value
|
|
38
|
+
* names; one that does not refuses the whole upload RECOVERY_KEYS_MISMATCH.
|
|
39
|
+
* Every key vault call runs outside the unit of work. Then one unit of work
|
|
40
|
+
* holds the fleet's sealing lock, finds the same company key and data keys,
|
|
41
|
+
* and swaps every wrap and the reference, FleetKeysRecovered naming the new
|
|
42
|
+
* key; a key rotated in between refuses KEY_UNAVAILABLE, to run again.
|
|
43
|
+
* Rolled back, every wrap and the reference stay as they were. No payload is
|
|
44
|
+
* sealed again.
|
|
45
|
+
*/
|
|
46
|
+
export declare function createRecoverKeys(deps: {
|
|
47
|
+
uow: UnitOfWork<RecoverKeysTx>;
|
|
48
|
+
clock: Clock;
|
|
49
|
+
ids: IdGenerator;
|
|
50
|
+
vault: KeyVault;
|
|
51
|
+
sealer: PayloadSealer;
|
|
52
|
+
/** The fleets' sealing and data keys, read outside the unit of work. */
|
|
53
|
+
sealings: FleetSealingRepository;
|
|
54
|
+
/** The fleets' feature flags: sealing's procedures refuse a fleet whose sealing flag is off (decision 0069). */
|
|
55
|
+
featureFlags: FeatureFlagReads;
|
|
56
|
+
}): RecoverKeys;
|
|
@@ -0,0 +1,83 @@
|
|
|
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
|
+
const MISMATCH_HINT = 'Nothing changed: run the recovery command again';
|
|
9
|
+
/**
|
|
10
|
+
* Use case: recovering a sealed fleet's data keys under a new company key
|
|
11
|
+
* (decision 0068, B15), by an actor holding `fleet:keys`, when the company
|
|
12
|
+
* key is lost and the fleet has a recovery key. The recovery command opened
|
|
13
|
+
* each data key with the offline recovery key on the company's computer and
|
|
14
|
+
* wrapped it under the new company key in the company's KMS; no plain data
|
|
15
|
+
* key reaches core. The new key is checked as at turning sealing on (B4).
|
|
16
|
+
* The upload must name exactly the fleet's data keys, and each wrap must open
|
|
17
|
+
* through the installation's grant on the new key to the key its check value
|
|
18
|
+
* names; one that does not refuses the whole upload RECOVERY_KEYS_MISMATCH.
|
|
19
|
+
* Every key vault call runs outside the unit of work. Then one unit of work
|
|
20
|
+
* holds the fleet's sealing lock, finds the same company key and data keys,
|
|
21
|
+
* and swaps every wrap and the reference, FleetKeysRecovered naming the new
|
|
22
|
+
* key; a key rotated in between refuses KEY_UNAVAILABLE, to run again.
|
|
23
|
+
* Rolled back, every wrap and the reference stay as they were. No payload is
|
|
24
|
+
* sealed again.
|
|
25
|
+
*/
|
|
26
|
+
export function createRecoverKeys(deps) {
|
|
27
|
+
return async (caller, { companyKey: to, dataKeys: uploaded }) => {
|
|
28
|
+
if (!hasScope(caller, 'fleet:keys')) {
|
|
29
|
+
return refuse('FORBIDDEN', 'Recovering the data keys needs the fleet:keys scope');
|
|
30
|
+
}
|
|
31
|
+
const { fleetId } = caller;
|
|
32
|
+
const offered = await checkFeatureFlag(deps.featureFlags, { fleetId, flag: 'sealing' });
|
|
33
|
+
if (!offered.isOk) {
|
|
34
|
+
return offered;
|
|
35
|
+
}
|
|
36
|
+
const ages = await deps.sealings.dataKeyAges(fleetId);
|
|
37
|
+
const stored = await deps.sealings.wrappedDataKeys(fleetId, ages.map(({ id }) => id));
|
|
38
|
+
if (stored === undefined) {
|
|
39
|
+
return refuse('FLEET_NOT_SEALED', `Fleet ${fleetId} is not sealed`);
|
|
40
|
+
}
|
|
41
|
+
if (stored.recoveryKey === null) {
|
|
42
|
+
return refuse('NO_RECOVERY_KEY', `Fleet ${fleetId} was sealed without a recovery key: recovery is the company's KMS's own`);
|
|
43
|
+
}
|
|
44
|
+
const uploadedIds = new Set(uploaded.map(({ id }) => id));
|
|
45
|
+
if (uploadedIds.size !== uploaded.length || uploadedIds.size !== stored.dataKeys.length || stored.dataKeys.some(({ id }) => !uploadedIds.has(id))) {
|
|
46
|
+
return refuse('RECOVERY_KEYS_MISMATCH', `The upload must name each of the fleet's ${stored.dataKeys.length} data keys once. ${MISMATCH_HINT}`);
|
|
47
|
+
}
|
|
48
|
+
const checked = await checkCompanyKey(deps, { fleetId, companyKey: to });
|
|
49
|
+
if (!checked.isOk) {
|
|
50
|
+
return checked;
|
|
51
|
+
}
|
|
52
|
+
for (const { id, wrappedByCompanyKey } of uploaded) {
|
|
53
|
+
const material = await deps.vault.unwrap({ fleetId, companyKey: to }, wrappedByCompanyKey);
|
|
54
|
+
if (!material.isOk) {
|
|
55
|
+
if (material.error.reason === 'invalidWrap') {
|
|
56
|
+
return refuse('RECOVERY_KEYS_MISMATCH', `The wrap of data key ${id} does not open under ${to} for fleet ${fleetId}. ${MISMATCH_HINT}`);
|
|
57
|
+
}
|
|
58
|
+
return keyUnavailable(material.error);
|
|
59
|
+
}
|
|
60
|
+
const checkValue = stored.dataKeys.find((dataKey) => dataKey.id === id)?.checkValue;
|
|
61
|
+
if (checkValue === undefined || !Buffer.from(deps.sealer.checkValue(material.value)).equals(checkValue)) {
|
|
62
|
+
return refuse('RECOVERY_KEYS_MISMATCH', `The wrap of data key ${id} opens to another key than its check value names. ${MISMATCH_HINT}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const from = stored.companyKey;
|
|
66
|
+
const swapped = await deps.uow.run(async (tx) => {
|
|
67
|
+
await tx.sealings.lockSealing(fleetId);
|
|
68
|
+
const sealing = await tx.sealings.find(fleetId);
|
|
69
|
+
const ids = new Set((await tx.sealings.dataKeyAges(fleetId)).map(({ id }) => id));
|
|
70
|
+
if (sealing?.companyKey !== from || ids.size !== uploadedIds.size || [...uploadedIds].some((id) => !ids.has(id))) {
|
|
71
|
+
return err({ kind: 'keysChanged' });
|
|
72
|
+
}
|
|
73
|
+
await tx.sealings.changeCompanyKey(fleetId, { companyKey: to, dataKeys: uploaded });
|
|
74
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, { fleetId, type: 'FleetKeysRecovered', occurredAt: deps.clock.now(), actor: actorOf(caller), details: { companyKey: to } });
|
|
75
|
+
return ok({ companyKey: to });
|
|
76
|
+
});
|
|
77
|
+
if (!swapped.isOk) {
|
|
78
|
+
return refuse('KEY_UNAVAILABLE', "The fleet's data keys or company key changed while this call ran: run the recovery command again");
|
|
79
|
+
}
|
|
80
|
+
return swapped;
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=recover-keys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recover-keys.js","sourceRoot":"","sources":["../../../src/domain/messaging/recover-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A sealed fleet's recovery key (decision 0068, B6, B15): an optional offline
|
|
3
|
+
* key pair the company makes and keeps. Core holds only its public half, an
|
|
4
|
+
* `age` X25519 recipient, and wraps each data key to it too, so the company
|
|
5
|
+
* can open its data keys on its own computer when its company key is lost.
|
|
6
|
+
*/
|
|
7
|
+
import { type DomainError } from '../shared/errors.js';
|
|
8
|
+
import { type Result } from '../shared/result.js';
|
|
9
|
+
import type { DataKeyMaterial, WrappedDataKey } from './key-vault.js';
|
|
10
|
+
/** The recovery key by its public half, and the fingerprint the fleet shows it by. */
|
|
11
|
+
export interface RecoveryKey {
|
|
12
|
+
/** The `age` X25519 recipient (`age1...`): public, never the private half. */
|
|
13
|
+
readonly recipient: string;
|
|
14
|
+
/** `SHA256:` and the unpadded base64 of the SHA-256 of the recipient's text. */
|
|
15
|
+
readonly fingerprint: string;
|
|
16
|
+
}
|
|
17
|
+
/** Outbound port: reads and wraps to a recovery key. */
|
|
18
|
+
export interface RecoveryKeys {
|
|
19
|
+
/** The recovery key an `age` X25519 recipient names; none for any other text. */
|
|
20
|
+
recoveryKeyOf(recipient: string): RecoveryKey | undefined;
|
|
21
|
+
/** The data key wrapped to the recovery key: only its private half, offline at the company, opens it. */
|
|
22
|
+
wrap(recoveryKey: RecoveryKey, material: DataKeyMaterial): Promise<WrappedDataKey>;
|
|
23
|
+
}
|
|
24
|
+
/** The recovery key the given text names, or refused INVALID_RECOVERY_KEY. */
|
|
25
|
+
export declare function recoveryKey(recoveryKeys: RecoveryKeys, recipient: string): Result<RecoveryKey, DomainError<'INVALID_RECOVERY_KEY'>>;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A sealed fleet's recovery key (decision 0068, B6, B15): an optional offline
|
|
3
|
+
* key pair the company makes and keeps. Core holds only its public half, an
|
|
4
|
+
* `age` X25519 recipient, and wraps each data key to it too, so the company
|
|
5
|
+
* can open its data keys on its own computer when its company key is lost.
|
|
6
|
+
*/
|
|
7
|
+
import { refuse } from '../shared/errors.js';
|
|
8
|
+
import { ok } from '../shared/result.js';
|
|
9
|
+
/** The recovery key the given text names, or refused INVALID_RECOVERY_KEY. */
|
|
10
|
+
export function recoveryKey(recoveryKeys, recipient) {
|
|
11
|
+
const parsed = recoveryKeys.recoveryKeyOf(recipient);
|
|
12
|
+
return parsed === undefined ? refuse('INVALID_RECOVERY_KEY', 'A recovery key is the public half of an age X25519 key pair: a recipient starting age1') : ok(parsed);
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=recovery-key.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recovery-key.js","sourceRoot":"","sources":["../../../src/domain/messaging/recovery-key.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAmBtD,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,YAA0B,EAAE,SAAiB;IACvE,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACrD,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,sBAAsB,EAAE,wFAAwF,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AACtK,CAAC"}
|
|
@@ -6,6 +6,7 @@ import { type Result } from '../shared/result.js';
|
|
|
6
6
|
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
7
7
|
import { type MarkDoneTx, type MarkDoneUseCaseRefusal } from './mark-done.js';
|
|
8
8
|
import type { RequestHasher } from './ports.js';
|
|
9
|
+
import { type PayloadSealing } from './data-keys.js';
|
|
9
10
|
import { type SendMessageRefusal, type SendMessageTx } from './send-message.js';
|
|
10
11
|
export type ReplyToMessageTx = SendMessageTx & MarkDoneTx;
|
|
11
12
|
export type ReplyToMessageRefusal = DomainError<'DELIVERY_NOT_FOUND' | 'NOT_THE_OPERATOR_SHIP'> | SendMessageRefusal | MarkDoneUseCaseRefusal;
|
|
@@ -34,4 +35,5 @@ export declare function createReplyToMessage(deps: {
|
|
|
34
35
|
clock: Clock;
|
|
35
36
|
ids: IdGenerator;
|
|
36
37
|
hasher: RequestHasher;
|
|
38
|
+
sealing: PayloadSealing;
|
|
37
39
|
}): ReplyToMessage;
|
|
@@ -2,6 +2,7 @@ import { refuse } from '../shared/errors.js';
|
|
|
2
2
|
import { ok } from '../shared/result.js';
|
|
3
3
|
import { isInInboxOf } from './delivery.js';
|
|
4
4
|
import { markDoneWithin } from './mark-done.js';
|
|
5
|
+
import { withDataKeys } from './data-keys.js';
|
|
5
6
|
import { checkedSend, sendWithin } from './send-message.js';
|
|
6
7
|
/**
|
|
7
8
|
* Use case: argo replies to a message to it from the operator inbox
|
|
@@ -20,7 +21,7 @@ export function createReplyToMessage(deps) {
|
|
|
20
21
|
if (crew.kind !== 'operator') {
|
|
21
22
|
return refuse('NOT_THE_OPERATOR_SHIP', 'Only argo replies from the operator inbox; a ship sends its answer');
|
|
22
23
|
}
|
|
23
|
-
return deps.uow.run(async (tx) => {
|
|
24
|
+
return withDataKeys({ sealing: deps.sealing, fleetId: crew.fleetId }, (held) => deps.uow.run(async (tx) => {
|
|
24
25
|
const { fleetId } = crew;
|
|
25
26
|
const delivery = await tx.deliveries.findForUpdate(fleetId, input.deliveryId);
|
|
26
27
|
const asked = delivery && (await tx.messages.find(fleetId, delivery.messageId));
|
|
@@ -37,14 +38,14 @@ export function createReplyToMessage(deps) {
|
|
|
37
38
|
if (!request.isOk) {
|
|
38
39
|
return request;
|
|
39
40
|
}
|
|
40
|
-
const inTx = { tx, clock: deps.clock, ids: deps.ids };
|
|
41
|
+
const inTx = { tx, clock: deps.clock, ids: deps.ids, held };
|
|
41
42
|
const sent = await sendWithin(inTx, { caller: crew, request: request.value });
|
|
42
43
|
if (!sent.isOk) {
|
|
43
44
|
return sent;
|
|
44
45
|
}
|
|
45
46
|
const done = await markDoneWithin(inTx, { crew, deliveryId: delivery.id, reply: sent.value.messageId });
|
|
46
47
|
return done.isOk ? ok(sent.value) : done;
|
|
47
|
-
});
|
|
48
|
+
}));
|
|
48
49
|
};
|
|
49
50
|
}
|
|
50
51
|
//# sourceMappingURL=reply-to-message.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-to-message.js","sourceRoot":"","sources":["../../../src/domain/messaging/reply-to-message.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAgD,MAAM,gBAAgB,CAAC;AAE9F,OAAO,EAAE,WAAW,EAAE,UAAU,EAA+C,MAAM,mBAAmB,CAAC;AAWzG;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"reply-to-message.js","sourceRoot":"","sources":["../../../src/domain/messaging/reply-to-message.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAgD,MAAM,gBAAgB,CAAC;AAE9F,OAAO,EAAE,YAAY,EAA4C,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,UAAU,EAA+C,MAAM,mBAAmB,CAAC;AAWzG;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAMpC;IACC,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC7B,OAAO,MAAM,CAAC,uBAAuB,EAAE,oEAAoE,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAqF,EAAE;YAC3L,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;YACzB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9E,MAAM,KAAK,GAAG,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YAChF,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBAClD,OAAO,MAAM,CAAC,oBAAoB,EAAE,YAAY,KAAK,CAAC,UAAU,uBAAuB,CAAC,CAAC;YAC3F,CAAC;YACD,MAAM,OAAO,GAAG,WAAW,CACzB;gBACE,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,YAAY,EAAE;gBACtD,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,YAAY;gBAC9C,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,SAAS,EAAE,KAAK,CAAC,EAAE;aACpB,EACD,IAAI,CAAC,MAAM,CACZ,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9E,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;YACxG,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3C,CAAC,CAAC,CAAC,CAAC;IACN,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -10,15 +10,17 @@ import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
|
10
10
|
import { type DailyMessageLimitTx } from './daily-message-limit.js';
|
|
11
11
|
import { type DismissRefusal } from './delivery.js';
|
|
12
12
|
import { type AcceptRefusal, type RepeatRefusal } from './message.js';
|
|
13
|
-
import type { DeliveryRepository, MessageRepository, RequestHasher } from './ports.js';
|
|
13
|
+
import type { DeliveryRepository, FleetSealingRepository, MessageRepository, RequestHasher } from './ports.js';
|
|
14
|
+
import { type PayloadSealing } from './data-keys.js';
|
|
14
15
|
export interface ResendDeliveryTx extends Omit<ResolveSelectorTx, 'ships'>, Omit<CheckReachTx, 'ships'>, DailyMessageLimitTx {
|
|
15
16
|
ships: ResolveSelectorTx['ships'] & CheckReachTx['ships'];
|
|
16
17
|
messages: MessageRepository;
|
|
17
18
|
deliveries: DeliveryRepository;
|
|
19
|
+
sealings: Pick<FleetSealingRepository, 'currentDataKeyId'>;
|
|
18
20
|
events: EventLog;
|
|
19
21
|
notifier: Notifier;
|
|
20
22
|
}
|
|
21
|
-
export type ResendDeliveryRefusal = DomainError<'DELIVERY_NOT_FOUND' | 'PING_NOT_RESENT'> | DismissRefusal | DomainError<'MESSAGE_LIMIT_REACHED'> | RepeatRefusal | UnresolvableSelector | NotReachable | AcceptRefusal;
|
|
23
|
+
export type ResendDeliveryRefusal = DomainError<'DELIVERY_NOT_FOUND' | 'PING_NOT_RESENT' | 'KEY_UNAVAILABLE'> | DismissRefusal | DomainError<'MESSAGE_LIMIT_REACHED'> | RepeatRefusal | UnresolvableSelector | NotReachable | AcceptRefusal;
|
|
22
24
|
export type ResendDelivery = (caller: Caller, input: {
|
|
23
25
|
deliveryId: DeliveryId;
|
|
24
26
|
}) => Promise<Result<{
|
|
@@ -48,6 +50,10 @@ export type ResendDelivery = (caller: Caller, input: {
|
|
|
48
50
|
* as the original sender sending (decision 0034): one no rule allows commits
|
|
49
51
|
* only its refusal's record and is refused, and the original stays
|
|
50
52
|
* undeliverable, for the operator to dismiss.
|
|
53
|
+
*
|
|
54
|
+
* In a sealed fleet (decision 0068, B17) the original's payload is unsealed
|
|
55
|
+
* and sealed again under the fleet's current data key for the new message's
|
|
56
|
+
* id, with its data keys unwrapped before the unit of work, never in it.
|
|
51
57
|
*/
|
|
52
58
|
export declare function createResendDelivery(deps: {
|
|
53
59
|
uow: UnitOfWork<ResendDeliveryTx>;
|
|
@@ -55,4 +61,5 @@ export declare function createResendDelivery(deps: {
|
|
|
55
61
|
ids: IdGenerator;
|
|
56
62
|
hasher: RequestHasher;
|
|
57
63
|
readReach: ReadReachOf;
|
|
64
|
+
sealing: PayloadSealing;
|
|
58
65
|
}): ResendDelivery;
|
|
@@ -8,6 +8,7 @@ import { isAnswerToSender } from './answer.js';
|
|
|
8
8
|
import { withinDailyMessageLimit } from './daily-message-limit.js';
|
|
9
9
|
import { dismissForResend } from './delivery.js';
|
|
10
10
|
import { acceptMessage, deliveredTo, repeatOf } from './message.js';
|
|
11
|
+
import { sealedMessage, unsealed, withDataKeys } from './data-keys.js';
|
|
11
12
|
import { sendRequestText } from './send-request.js';
|
|
12
13
|
/**
|
|
13
14
|
* The idempotency key of a delivery's resend, the original sender's: one
|
|
@@ -40,11 +41,15 @@ function resendKey(deliveryId) {
|
|
|
40
41
|
* as the original sender sending (decision 0034): one no rule allows commits
|
|
41
42
|
* only its refusal's record and is refused, and the original stays
|
|
42
43
|
* undeliverable, for the operator to dismiss.
|
|
44
|
+
*
|
|
45
|
+
* In a sealed fleet (decision 0068, B17) the original's payload is unsealed
|
|
46
|
+
* and sealed again under the fleet's current data key for the new message's
|
|
47
|
+
* id, with its data keys unwrapped before the unit of work, never in it.
|
|
43
48
|
*/
|
|
44
49
|
export function createResendDelivery(deps) {
|
|
45
50
|
return async (caller, input) => {
|
|
46
51
|
const readReach = await deps.readReach(caller);
|
|
47
|
-
const outcome = await deps.uow.run(async (tx) => {
|
|
52
|
+
const outcome = await withDataKeys({ sealing: deps.sealing, fleetId: caller.fleetId }, (held) => deps.uow.run(async (tx) => {
|
|
48
53
|
const { fleetId } = caller;
|
|
49
54
|
const delivery = await tx.deliveries.findForUpdate(fleetId, input.deliveryId);
|
|
50
55
|
const original = delivery && (await tx.messages.find(fleetId, delivery.messageId));
|
|
@@ -54,15 +59,25 @@ export function createResendDelivery(deps) {
|
|
|
54
59
|
if (isPingContentType(original.contentType)) {
|
|
55
60
|
return refuse('PING_NOT_RESENT', 'A ping is not resent: dismiss it, and ping the ship again');
|
|
56
61
|
}
|
|
62
|
+
const plain = unsealed(held, { row: { fleetId, rowId: original.id }, payload: original.payload });
|
|
63
|
+
if (!plain.isOk) {
|
|
64
|
+
return plain;
|
|
65
|
+
}
|
|
66
|
+
const payload = plain.value;
|
|
57
67
|
// A contribution's or a label send's undeliverable delivery is resent to its ship alone, as a message of its own.
|
|
58
68
|
const selector = deliveredTo(original, delivery);
|
|
59
69
|
const inReplyTo = original.inReplyToMessageId ?? undefined;
|
|
60
|
-
const requestHash = deps.hasher.hash(sendRequestText({ selector, payload
|
|
70
|
+
const requestHash = deps.hasher.hash(sendRequestText({ selector, payload, contentType: original.contentType, inReplyTo, isForced: false }));
|
|
71
|
+
const sealedRequestHash = deps.hasher.hash(sendRequestText({ selector, payload: undefined, contentType: original.contentType, inReplyTo, isForced: false }));
|
|
61
72
|
const senderKey = { fleetId, senderShipId: original.senderShipId, idempotencyKey: resendKey(delivery.id) };
|
|
62
73
|
await tx.messages.lockIdempotencyKey(senderKey);
|
|
63
74
|
const earlier = await tx.messages.findByIdempotencyKey(senderKey);
|
|
64
75
|
if (earlier) {
|
|
65
|
-
const
|
|
76
|
+
const earlierPayload = unsealed(held, { row: { fleetId, rowId: earlier.id }, payload: earlier.payload });
|
|
77
|
+
if (!earlierPayload.isOk) {
|
|
78
|
+
return earlierPayload;
|
|
79
|
+
}
|
|
80
|
+
const repeat = repeatOf({ message: earlier, plainPayload: earlierPayload.value }, { requestHash, sealedRequestHash, payload });
|
|
66
81
|
return repeat.isOk ? ok({ messageId: repeat.value }) : repeat;
|
|
67
82
|
}
|
|
68
83
|
const at = deps.clock.now();
|
|
@@ -96,7 +111,7 @@ export function createResendDelivery(deps) {
|
|
|
96
111
|
deliveryId: deps.ids('delivery'),
|
|
97
112
|
fleetId,
|
|
98
113
|
senderShipId: original.senderShipId,
|
|
99
|
-
payload
|
|
114
|
+
payload,
|
|
100
115
|
contentType: original.contentType,
|
|
101
116
|
model: original.model ?? undefined,
|
|
102
117
|
idempotencyKey: senderKey.idempotencyKey,
|
|
@@ -111,7 +126,12 @@ export function createResendDelivery(deps) {
|
|
|
111
126
|
if (!accepted.isOk) {
|
|
112
127
|
return accepted;
|
|
113
128
|
}
|
|
114
|
-
const {
|
|
129
|
+
const { delivery: resent, events } = accepted.value;
|
|
130
|
+
const sealed = await sealedMessage({ tx, held }, { message: accepted.value.message, sealedRequestHash });
|
|
131
|
+
if (!sealed.isOk) {
|
|
132
|
+
return sealed;
|
|
133
|
+
}
|
|
134
|
+
const message = sealed.value;
|
|
115
135
|
await tx.messages.create(message);
|
|
116
136
|
await tx.deliveries.create(resent);
|
|
117
137
|
await tx.deliveries.update(dismissed.value.delivery);
|
|
@@ -120,7 +140,7 @@ export function createResendDelivery(deps) {
|
|
|
120
140
|
}
|
|
121
141
|
await tx.notifier.deliveryPending({ fleetId, deliveryId: resent.id, recipient: resent.recipient });
|
|
122
142
|
return ok({ messageId: message.id });
|
|
123
|
-
});
|
|
143
|
+
}));
|
|
124
144
|
if (!outcome.isOk) {
|
|
125
145
|
return outcome;
|
|
126
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resend-delivery.js","sourceRoot":"","sources":["../../../src/domain/messaging/resend-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAqD,MAAM,sBAAsB,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAA6G,MAAM,uBAAuB,CAAC;AAC7L,OAAO,EAAE,OAAO,EAAE,YAAY,EAAe,MAAM,qBAAqB,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AAEjE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,uBAAuB,EAA4B,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAuB,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAA0C,MAAM,cAAc,CAAC;AAE5G,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"resend-delivery.js","sourceRoot":"","sources":["../../../src/domain/messaging/resend-delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { FleetId, IdGenerator, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type Actor } from '../shared/events.js';
|
|
3
3
|
import { type Result } from '../shared/result.js';
|
|
4
|
+
import type { DataKeysNeeded, HeldDataKeys } from './data-keys.js';
|
|
4
5
|
import type { Meeting } from './meeting.js';
|
|
5
6
|
import { type MeetingNoticeTx } from './meeting-notice.js';
|
|
6
7
|
import type { AcceptRefusal } from './message.js';
|
|
@@ -21,16 +22,18 @@ export declare function lockMeetingsOf(tx: Pick<RetiredParticipantTx, 'meetings'
|
|
|
21
22
|
* The meetings a retiring ship is present in, locked by `lockMeetingsOf`, changed within the retire's
|
|
22
23
|
* unit of work (decision 0061, M15, M17): it leaves each, off the mic, its
|
|
23
24
|
* moderatorship going to the owner; a meeting it owns ends, every other
|
|
24
|
-
* present participant told by a message from it
|
|
25
|
+
* present participant told by a message from it, sealed in a sealed fleet
|
|
26
|
+
* with the data keys held (decision 0068, B17). Its deliveries the retire
|
|
25
27
|
* abandons itself.
|
|
26
28
|
*/
|
|
27
29
|
export declare function leaveMeetingsOnRetire(deps: {
|
|
28
30
|
tx: RetiredParticipantTx;
|
|
29
31
|
ids: IdGenerator;
|
|
30
32
|
hasher: RequestHasher;
|
|
33
|
+
held: HeldDataKeys;
|
|
31
34
|
}, retire: {
|
|
32
35
|
meetings: readonly Meeting[];
|
|
33
36
|
shipId: ShipId;
|
|
34
37
|
actor: Actor;
|
|
35
38
|
at: Date;
|
|
36
|
-
}): Promise<Result<undefined, AcceptRefusal>>;
|
|
39
|
+
}): Promise<Result<undefined, AcceptRefusal | DataKeysNeeded>>;
|
|
@@ -14,7 +14,8 @@ export function lockMeetingsOf(tx, ship) {
|
|
|
14
14
|
* The meetings a retiring ship is present in, locked by `lockMeetingsOf`, changed within the retire's
|
|
15
15
|
* unit of work (decision 0061, M15, M17): it leaves each, off the mic, its
|
|
16
16
|
* moderatorship going to the owner; a meeting it owns ends, every other
|
|
17
|
-
* present participant told by a message from it
|
|
17
|
+
* present participant told by a message from it, sealed in a sealed fleet
|
|
18
|
+
* with the data keys held (decision 0068, B17). Its deliveries the retire
|
|
18
19
|
* abandons itself.
|
|
19
20
|
*/
|
|
20
21
|
export async function leaveMeetingsOnRetire(deps, retire) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retired-participant.js","sourceRoot":"","sources":["../../../src/domain/messaging/retired-participant.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAc,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"retired-participant.js","sourceRoot":"","sources":["../../../src/domain/messaging/retired-participant.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAc,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAwB,MAAM,qBAAqB,CAAC;AAQzE;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,EAA0C,EAAE,IAA0C;IACnH,OAAO,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAA+F,EAC/F,MAAgF;IAEhF,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC;IACrC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACxC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnC,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;YACvD,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACnJ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { FleetId, IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import type { Clock } from '../shared/clock.js';
|
|
3
|
+
import { type EventLog } from '../shared/events.js';
|
|
4
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
5
|
+
import type { FleetDataKeyMaker } from './data-keys.js';
|
|
6
|
+
import type { FleetSealingRepository } from './ports.js';
|
|
7
|
+
export interface RotateDataKeysTx {
|
|
8
|
+
sealings: FleetSealingRepository;
|
|
9
|
+
events: EventLog;
|
|
10
|
+
}
|
|
11
|
+
/** Makes a new data key current in every fleet whose current one is 30 days old; `onFleetError` (the pass always gives it) is told of a fleet whose rotation threw, and the pass goes on with the next fleet. */
|
|
12
|
+
export type RotateDataKeys = (onFleetError?: (fleetId: FleetId, error: unknown) => void) => Promise<void>;
|
|
13
|
+
/**
|
|
14
|
+
* Use case: data keys by age (decision 0068, B13a), run by core in the 30
|
|
15
|
+
* second pass, never through the API. Per sealed fleet whose current data key
|
|
16
|
+
* is 30 days old, a new one is made under its company key outside every unit
|
|
17
|
+
* of work; a key vault that refuses keeps the current key, its change of
|
|
18
|
+
* availability written as any unwrap's (B11), and the next pass tries again.
|
|
19
|
+
* Then one unit of work under the fleet's sealing lock taken with try (held:
|
|
20
|
+
* another server rotates it now): the current key read again, so a server
|
|
21
|
+
* that rotated it just before leaves it be, and the company key and the
|
|
22
|
+
* recovery key too, so a key made under or wrapped to one the fleet changed
|
|
23
|
+
* from meanwhile is dropped; the new key
|
|
24
|
+
* current, the old ones kept to unseal what they sealed, FleetDataKeyCreated.
|
|
25
|
+
* No payload is sealed again.
|
|
26
|
+
*/
|
|
27
|
+
export declare function createRotateDataKeys(deps: {
|
|
28
|
+
sealings: Pick<FleetSealingRepository, 'fleetsDueANewDataKey'>;
|
|
29
|
+
uow: UnitOfWork<RotateDataKeysTx>;
|
|
30
|
+
clock: Clock;
|
|
31
|
+
ids: IdGenerator;
|
|
32
|
+
dataKeys: FleetDataKeyMaker;
|
|
33
|
+
}): RotateDataKeys;
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { recordEvent, SYSTEM } from '../shared/events.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
import { dataKeyRotationCutoff, isDueANewDataKey } from './fleet-sealing.js';
|
|
4
|
+
/**
|
|
5
|
+
* Use case: data keys by age (decision 0068, B13a), run by core in the 30
|
|
6
|
+
* second pass, never through the API. Per sealed fleet whose current data key
|
|
7
|
+
* is 30 days old, a new one is made under its company key outside every unit
|
|
8
|
+
* of work; a key vault that refuses keeps the current key, its change of
|
|
9
|
+
* availability written as any unwrap's (B11), and the next pass tries again.
|
|
10
|
+
* Then one unit of work under the fleet's sealing lock taken with try (held:
|
|
11
|
+
* another server rotates it now): the current key read again, so a server
|
|
12
|
+
* that rotated it just before leaves it be, and the company key and the
|
|
13
|
+
* recovery key too, so a key made under or wrapped to one the fleet changed
|
|
14
|
+
* from meanwhile is dropped; the new key
|
|
15
|
+
* current, the old ones kept to unseal what they sealed, FleetDataKeyCreated.
|
|
16
|
+
* No payload is sealed again.
|
|
17
|
+
*/
|
|
18
|
+
export function createRotateDataKeys(deps) {
|
|
19
|
+
const rotate = async (fleetId) => {
|
|
20
|
+
const made = await deps.dataKeys.make(fleetId);
|
|
21
|
+
if (!made.isOk) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const { companyKey, wrappedByCompanyKey, recoveryKey, wrappedByRecoveryKey, checkValue } = made.value;
|
|
25
|
+
await deps.uow.run(async (tx) => {
|
|
26
|
+
const { sealings } = tx;
|
|
27
|
+
if (!(await sealings.tryLockSealing(fleetId))) {
|
|
28
|
+
return ok(undefined);
|
|
29
|
+
}
|
|
30
|
+
const now = deps.clock.now();
|
|
31
|
+
const sealing = await sealings.find(fleetId);
|
|
32
|
+
if (sealing?.companyKey !== companyKey || sealing.recoveryKey?.recipient !== recoveryKey?.recipient || !isDueANewDataKey(await sealings.dataKeyAges(fleetId), now)) {
|
|
33
|
+
return ok(undefined);
|
|
34
|
+
}
|
|
35
|
+
const dataKeyId = deps.ids('dataKey');
|
|
36
|
+
await sealings.addCurrentDataKey({ id: dataKeyId, fleetId, wrappedByCompanyKey, wrappedByRecoveryKey, checkValue, createdAt: now, isCurrent: true });
|
|
37
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, { fleetId, type: 'FleetDataKeyCreated', occurredAt: now, actor: SYSTEM, details: { dataKeyId } });
|
|
38
|
+
return ok(undefined);
|
|
39
|
+
});
|
|
40
|
+
};
|
|
41
|
+
return async (onFleetError) => {
|
|
42
|
+
for (const fleetId of await deps.sealings.fleetsDueANewDataKey(dataKeyRotationCutoff(deps.clock.now()))) {
|
|
43
|
+
try {
|
|
44
|
+
await rotate(fleetId);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
onFleetError?.(fleetId, error);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=rotate-data-keys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rotate-data-keys.js","sourceRoot":"","sources":["../../../src/domain/messaging/rotate-data-keys.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAGzC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAW7E;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAMpC;IACC,MAAM,MAAM,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAE,oBAAoB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBAC9C,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,OAAO,EAAE,UAAU,KAAK,UAAU,IAAI,OAAO,CAAC,WAAW,EAAE,SAAS,KAAK,WAAW,EAAE,SAAS,IAAI,CAAC,gBAAgB,CAAC,MAAM,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;gBACnK,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACrJ,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAC1J,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO,KAAK,EAAE,YAAY,EAAE,EAAE;QAC5B,KAAK,MAAM,OAAO,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;YACxG,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,YAAY,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -8,7 +8,8 @@ import { type Result } from '../shared/result.js';
|
|
|
8
8
|
import type { ScheduleSelector } from '../shared/selector.js';
|
|
9
9
|
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
10
10
|
import { type AcceptRefusal } from './message.js';
|
|
11
|
-
import type { DeliveryRepository, MessageRepository, RequestHasher, ScheduleNotifier, ScheduleRepository } from './ports.js';
|
|
11
|
+
import type { DeliveryRepository, FleetSealingRepository, MessageRepository, RequestHasher, ScheduleNotifier, ScheduleRepository } from './ports.js';
|
|
12
|
+
import { type PayloadSealing } from './data-keys.js';
|
|
12
13
|
import { type ScheduleRefusal, type ScheduleTimingInput } from './schedule.js';
|
|
13
14
|
import { type ScheduleLimitRefusal, type ScheduleLimitsTx } from './schedule-limits.js';
|
|
14
15
|
export interface ScheduleMessageTx extends Omit<ResolveSelectorTx, 'ships'>, Omit<CheckReachTx, 'ships'>, Omit<ScheduleLimitsTx, 'schedules'> {
|
|
@@ -17,6 +18,7 @@ export interface ScheduleMessageTx extends Omit<ResolveSelectorTx, 'ships'>, Omi
|
|
|
17
18
|
deliveries: Pick<DeliveryRepository, 'findOfMessageReaching'>;
|
|
18
19
|
schedules: ScheduleRepository;
|
|
19
20
|
scheduleNotifier: ScheduleNotifier;
|
|
21
|
+
sealings: Pick<FleetSealingRepository, 'currentDataKeyId'>;
|
|
20
22
|
events: EventLog;
|
|
21
23
|
}
|
|
22
24
|
/** What a ship schedules: a whole send input, its timing, what a refused send time does, and its key. */
|
|
@@ -39,7 +41,7 @@ export interface MessageToSchedule {
|
|
|
39
41
|
/** PT5M when the creator gives none. */
|
|
40
42
|
grace?: string;
|
|
41
43
|
}
|
|
42
|
-
export type ScheduleMessageRefusal = DomainError<'PAYLOAD_TOO_LARGE' | 'INVALID_CONTENT_TYPE' | 'INVALID_IDEMPOTENCY_KEY' | 'RESERVED_CONTENT_TYPE' | 'FORCE_NOT_ALLOWED' | 'IDEMPOTENCY_KEY_REUSED' | 'IN_REPLY_TO_NOT_FOUND'> | AcceptRefusal | ScheduleRefusal | ScheduleLimitRefusal | UnresolvableSelector | NotReachable;
|
|
44
|
+
export type ScheduleMessageRefusal = DomainError<'PAYLOAD_TOO_LARGE' | 'INVALID_CONTENT_TYPE' | 'INVALID_IDEMPOTENCY_KEY' | 'RESERVED_CONTENT_TYPE' | 'FORCE_NOT_ALLOWED' | 'IDEMPOTENCY_KEY_REUSED' | 'IN_REPLY_TO_NOT_FOUND' | 'KEY_UNAVAILABLE'> | AcceptRefusal | ScheduleRefusal | ScheduleLimitRefusal | UnresolvableSelector | NotReachable;
|
|
43
45
|
export type ScheduleMessage = (caller: ShipCaller, input: MessageToSchedule) => Promise<Result<{
|
|
44
46
|
scheduleId: ScheduleId;
|
|
45
47
|
}, ScheduleMessageRefusal>>;
|
|
@@ -56,10 +58,16 @@ export type ScheduleMessage = (caller: ShipCaller, input: MessageToSchedule) =>
|
|
|
56
58
|
* refusal is recorded and nothing else is stored. A reply names a message of
|
|
57
59
|
* the fleet. The schedule, ScheduleCreated and the notice that tells every
|
|
58
60
|
* server's timer when it is due are one unit of work.
|
|
61
|
+
*
|
|
62
|
+
* In a sealed fleet (decision 0068, B7) the payload is stored sealed under
|
|
63
|
+
* the fleet's current data key, bound to the schedule's id, and its request
|
|
64
|
+
* hash leaves the payload out; a repeat unseals the original's to compare.
|
|
65
|
+
* The data keys are unwrapped before the unit of work, never in it.
|
|
59
66
|
*/
|
|
60
67
|
export declare function createScheduleMessage(deps: {
|
|
61
68
|
uow: UnitOfWork<ScheduleMessageTx>;
|
|
62
69
|
clock: Clock;
|
|
63
70
|
ids: IdGenerator;
|
|
64
71
|
hasher: RequestHasher;
|
|
72
|
+
sealing: PayloadSealing;
|
|
65
73
|
}): ScheduleMessage;
|