Implements Spec 118 baseline drift engine improvements: - Resumable, budget-aware evidence capture for baseline capture/compare runs (resume token + UI action) - “Why no findings?” reason-code driven explanations and richer run context panels - Baseline Snapshot resource (list/detail) with fidelity visibility - Retention command + schedule for pruning baseline-purpose PolicyVersions - i18n strings for Baseline Compare landing Verification: - `vendor/bin/sail bin pint --dirty --format agent` - `vendor/bin/sail artisan test --compact --filter=Baseline` (159 passed) Note: - `docs/audits/redaction-audit-2026-03-04.md` left untracked (not part of PR). Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #143
200 lines
7.9 KiB
PHP
200 lines
7.9 KiB
PHP
<?php
|
|
|
|
use App\Jobs\CompareBaselineToTenantJob;
|
|
use App\Models\BaselineProfile;
|
|
use App\Models\BaselineSnapshot;
|
|
use App\Models\BaselineSnapshotItem;
|
|
use App\Models\InventoryItem;
|
|
use App\Models\Policy;
|
|
use App\Services\Baselines\BaselineContentCapturePhase;
|
|
use App\Services\Baselines\BaselineSnapshotIdentity;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\Intune\PolicyCaptureOrchestrator;
|
|
use App\Services\OperationRunService;
|
|
use App\Support\Baselines\BaselineCaptureMode;
|
|
use App\Support\Baselines\BaselineSubjectKey;
|
|
use App\Support\Baselines\PolicyVersionCapturePurpose;
|
|
use App\Support\OperationRunType;
|
|
|
|
it('resumes full-content compare deterministically without re-capturing already-captured subjects', function (): void {
|
|
config()->set('tenantpilot.baselines.full_content_capture.enabled', true);
|
|
config()->set('tenantpilot.baselines.full_content_capture.max_items_per_run', 1);
|
|
config()->set('tenantpilot.baselines.full_content_capture.max_concurrency', 1);
|
|
config()->set('tenantpilot.baselines.full_content_capture.max_retries', 0);
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'capture_mode' => BaselineCaptureMode::FullContent->value,
|
|
'scope_jsonb' => ['policy_types' => ['deviceConfiguration'], 'foundation_types' => []],
|
|
]);
|
|
|
|
$snapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
'captured_at' => now()->subMinute(),
|
|
]);
|
|
|
|
$profile->update(['active_snapshot_id' => (int) $snapshot->getKey()]);
|
|
|
|
$displayNames = ['Resume Idempotent A', 'Resume Idempotent B'];
|
|
|
|
foreach ($displayNames as $displayName) {
|
|
$subjectKey = BaselineSubjectKey::fromDisplayName($displayName);
|
|
expect($subjectKey)->not->toBeNull();
|
|
|
|
BaselineSnapshotItem::factory()->create([
|
|
'baseline_snapshot_id' => (int) $snapshot->getKey(),
|
|
'subject_type' => 'policy',
|
|
'subject_external_id' => BaselineSubjectKey::workspaceSafeSubjectExternalId('deviceConfiguration', (string) $subjectKey),
|
|
'subject_key' => (string) $subjectKey,
|
|
'policy_type' => 'deviceConfiguration',
|
|
'baseline_hash' => hash('sha256', 'baseline'),
|
|
'meta_jsonb' => [
|
|
'display_name' => $displayName,
|
|
'evidence' => [
|
|
'fidelity' => 'content',
|
|
'source' => 'policy_version',
|
|
'observed_at' => now()->toIso8601String(),
|
|
],
|
|
],
|
|
]);
|
|
}
|
|
|
|
$policies = [];
|
|
|
|
foreach ($displayNames as $i => $displayName) {
|
|
$policies[] = Policy::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'policy_type' => 'deviceConfiguration',
|
|
'external_id' => $i === 0 ? 'resume-idem-a' : 'resume-idem-b',
|
|
'platform' => 'windows',
|
|
'display_name' => $displayName,
|
|
]);
|
|
}
|
|
|
|
$inventorySyncRun = createInventorySyncOperationRunWithCoverage(
|
|
tenant: $tenant,
|
|
statusByType: ['deviceConfiguration' => 'succeeded'],
|
|
);
|
|
|
|
foreach ($policies as $policy) {
|
|
InventoryItem::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'external_id' => (string) $policy->external_id,
|
|
'policy_type' => (string) $policy->policy_type,
|
|
'display_name' => (string) $policy->display_name,
|
|
'meta_jsonb' => ['odata_type' => '#microsoft.graph.deviceConfiguration', 'etag' => fake()->uuid()],
|
|
'last_seen_operation_run_id' => (int) $inventorySyncRun->getKey(),
|
|
'last_seen_at' => now(),
|
|
]);
|
|
}
|
|
|
|
$fakeOrchestrator = new class extends PolicyCaptureOrchestrator
|
|
{
|
|
public array $capturedExternalIds = [];
|
|
|
|
public function __construct() {}
|
|
|
|
public function capture(
|
|
Policy $policy,
|
|
\App\Models\Tenant $tenant,
|
|
bool $includeAssignments = false,
|
|
bool $includeScopeTags = false,
|
|
?string $createdBy = null,
|
|
array $metadata = [],
|
|
PolicyVersionCapturePurpose $capturePurpose = PolicyVersionCapturePurpose::Backup,
|
|
?int $operationRunId = null,
|
|
?int $baselineProfileId = null,
|
|
): array {
|
|
$this->capturedExternalIds[] = (string) $policy->external_id;
|
|
|
|
$version = \App\Models\PolicyVersion::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'policy_id' => (int) $policy->getKey(),
|
|
'policy_type' => (string) $policy->policy_type,
|
|
'platform' => (string) $policy->platform,
|
|
'captured_at' => now(),
|
|
'snapshot' => ['settings' => [['key' => 'k', 'value' => 1]]],
|
|
'assignments' => [],
|
|
'scope_tags' => [],
|
|
'capture_purpose' => $capturePurpose,
|
|
'operation_run_id' => $operationRunId,
|
|
'baseline_profile_id' => $baselineProfileId,
|
|
]);
|
|
|
|
return [
|
|
'version' => $version,
|
|
'captured' => [
|
|
'payload' => $version->snapshot,
|
|
'assignments' => [],
|
|
'scope_tags' => [],
|
|
],
|
|
];
|
|
}
|
|
};
|
|
|
|
$contentCapturePhase = new BaselineContentCapturePhase($fakeOrchestrator);
|
|
|
|
$opService = app(OperationRunService::class);
|
|
|
|
$firstRun = $opService->ensureRunWithIdentity(
|
|
tenant: $tenant,
|
|
type: OperationRunType::BaselineCompare->value,
|
|
identityInputs: ['baseline_profile_id' => (int) $profile->getKey()],
|
|
context: [
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
'baseline_snapshot_id' => (int) $snapshot->getKey(),
|
|
'effective_scope' => ['policy_types' => ['deviceConfiguration'], 'foundation_types' => []],
|
|
'capture_mode' => BaselineCaptureMode::FullContent->value,
|
|
],
|
|
initiator: $user,
|
|
);
|
|
|
|
(new CompareBaselineToTenantJob($firstRun))->handle(
|
|
app(BaselineSnapshotIdentity::class),
|
|
app(AuditLogger::class),
|
|
$opService,
|
|
contentCapturePhase: $contentCapturePhase,
|
|
);
|
|
|
|
$firstRun->refresh();
|
|
$firstContext = is_array($firstRun->context) ? $firstRun->context : [];
|
|
$resumeToken = $firstContext['baseline_compare']['resume_token'] ?? null;
|
|
expect($resumeToken)->toBeString();
|
|
|
|
expect($fakeOrchestrator->capturedExternalIds)->toHaveCount(1);
|
|
expect($fakeOrchestrator->capturedExternalIds[0])->toBe('resume-idem-a');
|
|
|
|
$secondRun = $opService->ensureRunWithIdentity(
|
|
tenant: $tenant,
|
|
type: OperationRunType::BaselineCompare->value,
|
|
identityInputs: ['baseline_profile_id' => (int) $profile->getKey()],
|
|
context: [
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
'baseline_snapshot_id' => (int) $snapshot->getKey(),
|
|
'effective_scope' => ['policy_types' => ['deviceConfiguration'], 'foundation_types' => []],
|
|
'capture_mode' => BaselineCaptureMode::FullContent->value,
|
|
'baseline_compare' => [
|
|
'resume_token' => (string) $resumeToken,
|
|
],
|
|
],
|
|
initiator: $user,
|
|
);
|
|
|
|
(new CompareBaselineToTenantJob($secondRun))->handle(
|
|
app(BaselineSnapshotIdentity::class),
|
|
app(AuditLogger::class),
|
|
$opService,
|
|
contentCapturePhase: $contentCapturePhase,
|
|
);
|
|
|
|
$secondRun->refresh();
|
|
$secondContext = is_array($secondRun->context) ? $secondRun->context : [];
|
|
expect($secondContext['baseline_compare']['resume_token'] ?? null)->toBeNull();
|
|
|
|
expect($fakeOrchestrator->capturedExternalIds)->toBe(['resume-idem-a', 'resume-idem-b']);
|
|
});
|