diff --git a/web/app/Services/Cloud/CloudTemplateImportCancellation.php b/web/app/Services/Cloud/CloudTemplateImportCancellation.php index 58a23593..6d47a49a 100644 --- a/web/app/Services/Cloud/CloudTemplateImportCancellation.php +++ b/web/app/Services/Cloud/CloudTemplateImportCancellation.php @@ -14,7 +14,7 @@ final class CloudTemplateImportCancellation extends CloudTemplateImportModule ): array { CloudAccess::manage($actor); return $this->cancelIntent( - self::intentId($id), + CloudTemplateImportId::parse($id), $client ?? new CloudObjectStorageS3Client(), false ); @@ -160,7 +160,7 @@ final class CloudTemplateImportCancellation extends CloudTemplateImportModule /** @var CloudTemplateImportIntent $intent */ $intent = $prepared['intent']; if (($prepared['done'] ?? false) === true) { - return self::dto($intent); + return CloudTemplateImportReadModel::project($intent); } if (($prepared['reconcile_first'] ?? false) === true) { $evidence = $this->cancellationEvidence($intent, $client); @@ -249,7 +249,7 @@ final class CloudTemplateImportCancellation extends CloudTemplateImportModule $intent->completed_at = $now; $intent->updated_at = $now; $intent->save(); - return self::dto($intent); + return CloudTemplateImportReadModel::project($intent); }, 3); } diff --git a/web/app/Services/Cloud/CloudTemplateImportId.php b/web/app/Services/Cloud/CloudTemplateImportId.php new file mode 100644 index 00000000..58939e3b --- /dev/null +++ b/web/app/Services/Cloud/CloudTemplateImportId.php @@ -0,0 +1,15 @@ +where('intent_id', (string) $intent->id) - ->orderBy('part_number')->get()->map( - static fn (CloudTemplateImportPart $part): array => [ - 'part_number' => (int) $part->part_number, - 'size_bytes' => (int) $part->size_bytes, - ] - )->all(); - $uploadedParts = count($parts); - $uploadedBytes = array_sum(array_column($parts, 'size_bytes')); - $state = (string) $intent->state; - $capabilities = CloudTemplateImportStateMachine::capabilities($intent); - return [ - 'id' => (string) $intent->id, - 'source_kind' => (string) $intent->source_kind, - 'name' => (string) $intent->name, - 'os_family' => (string) $intent->os_family, - 'os_version' => (string) $intent->os_version, - 'source_filename' => (string) $intent->source_filename, - 'source_size_bytes' => (int) $intent->source_size_bytes, - 'source_last_modified' => (int) $intent->source_last_modified, - 'source_sha256' => (string) $intent->source_sha256, - 'template_id' => (string) $intent->template_id, - 'state' => $state, - 'uploaded_parts' => $uploadedParts, - 'uploaded_bytes' => $uploadedBytes, - 'parts' => $parts, - 'part_count' => (int) $intent->multipart_part_count, - 'part_size_bytes' => (int) $intent->multipart_part_size_bytes, - 'can_resume' => $capabilities['can_resume'], - 'can_cancel' => $capabilities['can_cancel'], - 'task_id' => $intent->active_job_id === null - ? null : (int) $intent->active_job_id, - 'error_code' => (string) $intent->error_code, - 'expires_at' => (int) $intent->expires_at, - 'completed_at' => $intent->completed_at === null - ? null : (int) $intent->completed_at, - 'created_at' => (int) $intent->created_at, - 'updated_at' => (int) $intent->updated_at, - ]; - } - - protected static function assertAdministrator(array $actor): void - { - if (($actor['is_admin'] ?? false) !== true) { - throw new CloudError('需要管理员权限', 403); - } - } - protected static function requestKey(array $actor): string { $key = $actor['request_idempotency_key'] ?? null; @@ -139,14 +87,6 @@ abstract class CloudTemplateImportModule return $key; } - protected static function intentId(string $id): string - { - if (preg_match('/^[a-f0-9]{32}$/D', $id) !== 1) { - throw new CloudError('云镜像导入标识无效', 422); - } - return $id; - } - protected static function fingerprint(array $canonical): string { ksort($canonical, SORT_STRING); diff --git a/web/app/Services/Cloud/CloudTemplateImportReadModel.php b/web/app/Services/Cloud/CloudTemplateImportReadModel.php index e0487599..1992ccd4 100644 --- a/web/app/Services/Cloud/CloudTemplateImportReadModel.php +++ b/web/app/Services/Cloud/CloudTemplateImportReadModel.php @@ -3,9 +3,10 @@ namespace App\Services\Cloud; use App\Models\CloudTemplateImportIntent; +use App\Models\CloudTemplateImportPart; /** Provides administrator-safe projections of import intent state. */ -final class CloudTemplateImportReadModel extends CloudTemplateImportModule +final class CloudTemplateImportReadModel { public function active(array $actor): array { @@ -14,24 +15,67 @@ final class CloudTemplateImportReadModel extends CloudTemplateImportModule ->whereNotIn('state', ['ready', 'cancelled']) ->orderByDesc('created_at')->limit(50)->get(); return ['intents' => $rows->map( - static fn (CloudTemplateImportIntent $row): array => self::dto($row) + static fn (CloudTemplateImportIntent $row): array => self::project($row) )->all()]; } public function one(string $id, array $actor): array { self::assertAdministrator($actor); - $id = self::intentId($id); + $id = CloudTemplateImportId::parse($id); $intent = CloudTemplateImportIntent::find($id); if ($intent === null) { throw new CloudError('云镜像导入记录不存在', 404); } - return ['intent' => self::dto($intent)]; + return ['intent' => self::project($intent)]; } /** @return array */ public static function project(CloudTemplateImportIntent $intent): array { - return self::dto($intent); + $parts = CloudTemplateImportPart::query() + ->where('intent_id', (string) $intent->id) + ->orderBy('part_number')->get()->map( + static fn (CloudTemplateImportPart $part): array => [ + 'part_number' => (int) $part->part_number, + 'size_bytes' => (int) $part->size_bytes, + ] + )->all(); + $capabilities = CloudTemplateImportStateMachine::capabilities($intent); + return [ + 'id' => (string) $intent->id, + 'source_kind' => (string) $intent->source_kind, + 'name' => (string) $intent->name, + 'os_family' => (string) $intent->os_family, + 'os_version' => (string) $intent->os_version, + 'source_filename' => (string) $intent->source_filename, + 'source_size_bytes' => (int) $intent->source_size_bytes, + 'source_last_modified' => (int) $intent->source_last_modified, + 'source_sha256' => (string) $intent->source_sha256, + 'template_id' => (string) $intent->template_id, + 'state' => (string) $intent->state, + 'uploaded_parts' => count($parts), + 'uploaded_bytes' => array_sum(array_column($parts, 'size_bytes')), + 'parts' => $parts, + 'part_count' => (int) $intent->multipart_part_count, + 'part_size_bytes' => (int) $intent->multipart_part_size_bytes, + 'can_resume' => $capabilities['can_resume'], + 'can_cancel' => $capabilities['can_cancel'], + 'task_id' => $intent->active_job_id === null + ? null : (int) $intent->active_job_id, + 'error_code' => (string) $intent->error_code, + 'expires_at' => (int) $intent->expires_at, + 'completed_at' => $intent->completed_at === null + ? null : (int) $intent->completed_at, + 'created_at' => (int) $intent->created_at, + 'updated_at' => (int) $intent->updated_at, + ]; + } + + private static function assertAdministrator(array $actor): void + { + if (($actor['is_admin'] ?? false) !== true) { + throw new CloudError('需要管理员权限', 403); + } } } diff --git a/web/app/Services/Cloud/CloudTemplateImportReservation.php b/web/app/Services/Cloud/CloudTemplateImportReservation.php index b1733292..8590d3e0 100644 --- a/web/app/Services/Cloud/CloudTemplateImportReservation.php +++ b/web/app/Services/Cloud/CloudTemplateImportReservation.php @@ -70,7 +70,7 @@ final class CloudTemplateImportReservation extends CloudTemplateImportModule throw $error; } self::assertReplay($prior, $fingerprint); - return ['created' => false, 'intent' => self::dto($prior)]; + return ['created' => false, 'intent' => CloudTemplateImportReadModel::project($prior)]; } } @@ -129,7 +129,7 @@ final class CloudTemplateImportReservation extends CloudTemplateImportModule self::assertReplay($prior, $fingerprint); return [ 'created' => false, - 'intent' => self::dto($prior), + 'intent' => CloudTemplateImportReadModel::project($prior), ]; } $generation = bin2hex(random_bytes(16)); @@ -182,7 +182,7 @@ final class CloudTemplateImportReservation extends CloudTemplateImportModule $intent->save(); return [ 'created' => true, - 'intent' => self::dto($intent), + 'intent' => CloudTemplateImportReadModel::project($intent), ]; }, 3); } catch (QueryException $error) { @@ -193,7 +193,7 @@ final class CloudTemplateImportReservation extends CloudTemplateImportModule throw $error; } self::assertReplay($prior, $fingerprint); - return ['created' => false, 'intent' => self::dto($prior)]; + return ['created' => false, 'intent' => CloudTemplateImportReadModel::project($prior)]; } } @@ -222,7 +222,7 @@ final class CloudTemplateImportReservation extends CloudTemplateImportModule ->lockForUpdate()->first(); if ($prior !== null) { self::assertReplay($prior, $fingerprint); - return ['created' => false, 'intent' => self::dto($prior)]; + return ['created' => false, 'intent' => CloudTemplateImportReadModel::project($prior)]; } $generation = bin2hex(random_bytes(16)); @@ -281,7 +281,7 @@ final class CloudTemplateImportReservation extends CloudTemplateImportModule $intent->completed_at = null; $intent->created_at = $intent->updated_at = $now; $intent->save(); - return ['created' => true, 'intent' => self::dto($intent)]; + return ['created' => true, 'intent' => CloudTemplateImportReadModel::project($intent)]; }, 3); } diff --git a/web/app/Services/Cloud/CloudTemplateMultipartAcquisition.php b/web/app/Services/Cloud/CloudTemplateMultipartAcquisition.php index e5166c72..5316f5f9 100644 --- a/web/app/Services/Cloud/CloudTemplateMultipartAcquisition.php +++ b/web/app/Services/Cloud/CloudTemplateMultipartAcquisition.php @@ -25,7 +25,7 @@ final class CloudTemplateMultipartAcquisition extends CloudTemplateImportModule ?CloudObjectStorageS3Client $client = null ): array { CloudAccess::manage($actor); - $id = self::intentId($id); + $id = CloudTemplateImportId::parse($id); $client ??= new CloudObjectStorageS3Client(); $now = ($this->clock)(); $connection = (new CloudTemplateImportIntent())->getConnection(); @@ -141,7 +141,7 @@ final class CloudTemplateMultipartAcquisition extends CloudTemplateImportModule ): array { CloudAccess::manage($actor); CloudInput::only($input, ['size_bytes', 'etag']); - $id = self::intentId($id); + $id = CloudTemplateImportId::parse($id); $size = self::integer( $input['size_bytes'] ?? null, 1, @@ -192,7 +192,7 @@ final class CloudTemplateMultipartAcquisition extends CloudTemplateImportModule $intent->save(); return [ 'part_number' => $partNumber, - 'intent' => self::dto($intent), + 'intent' => CloudTemplateImportReadModel::project($intent), ]; }, 3); } @@ -205,7 +205,7 @@ final class CloudTemplateMultipartAcquisition extends CloudTemplateImportModule ): array { CloudAccess::manage($actor); CloudInput::only($input, ['sha256']); - $id = self::intentId($id); + $id = CloudTemplateImportId::parse($id); $sha256 = strtolower(trim((string) ($input['sha256'] ?? ''))); if (preg_match('/^[a-f0-9]{64}$/D', $sha256) !== 1) { throw new CloudError('请提供完整的云镜像 SHA-256', 422); @@ -574,7 +574,7 @@ final class CloudTemplateMultipartAcquisition extends CloudTemplateImportModule throw new CloudError('对象存储上传计划无效', 502); } return [ - 'intent' => self::dto($intent), + 'intent' => CloudTemplateImportReadModel::project($intent), 'part_size_bytes' => (int) $intent->multipart_part_size_bytes, 'part_count' => (int) $intent->multipart_part_count, 'part_urls' => array_values($urls), diff --git a/web/app/Services/Cloud/CloudTemplateRemoteAcquisition.php b/web/app/Services/Cloud/CloudTemplateRemoteAcquisition.php index e322ac7e..efdf5443 100644 --- a/web/app/Services/Cloud/CloudTemplateRemoteAcquisition.php +++ b/web/app/Services/Cloud/CloudTemplateRemoteAcquisition.php @@ -30,7 +30,7 @@ final class CloudTemplateRemoteAcquisition extends CloudTemplateImportModule ): array { CloudAccess::manage($actor); return $this->acquireRemote( - self::intentId($id), + CloudTemplateImportId::parse($id), $actor, $fetcher ?? new CloudTemplateRemoteFetcher(), $client ?? new CloudObjectStorageS3Client() diff --git a/web/tests/CloudTemplateImportIntentTest.php b/web/tests/CloudTemplateImportIntentTest.php index 832e202e..6d7999ca 100644 --- a/web/tests/CloudTemplateImportIntentTest.php +++ b/web/tests/CloudTemplateImportIntentTest.php @@ -103,10 +103,7 @@ namespace { static fn (): array => $runtime, static fn (): int => 2000000000 ); - $readModel = new CloudTemplateImportReadModel( - static fn (): array => $runtime, - static fn (): int => 2000000000 - ); + $readModel = new CloudTemplateImportReadModel(); $actor = [ 'user_id' => 7, 'is_admin' => true, @@ -159,6 +156,21 @@ namespace { $assert(count($listed['intents']) === 1 && $one['intent']['id'] === (string) $stored->id, 'A refreshed administrator page cannot recover the active intent.'); + $originalKey = Config::$key; + Config::$key = ''; + $assert($readModel->one((string) $stored->id, ['is_admin' => true]) === $one, + 'Reading an intent unexpectedly depends on storage credentials or execution runtime.'); + Config::$key = $originalKey; + foreach ([['id' => (string) $stored->id, 'actor' => [], 'status' => 403], + ['id' => 'invalid', 'actor' => $actor, 'status' => 422], + ['id' => str_repeat('f', 32), 'actor' => $actor, 'status' => 404]] as $case) { + try { + $readModel->one($case['id'], $case['actor']); + throw new RuntimeException('An invalid import read was accepted.'); + } catch (CloudError $error) { + $assert($error->httpStatus === $case['status'], 'Import read error semantics changed.'); + } + } CloudTemplateImportStateMachine::assertIntegrity(); $definitions = CloudTemplateImportStateMachine::definitions();