## Summary - add Intune RBAC Role Definition baseline scope support, capture references, compare classification, findings evidence, and landing/detail UI labels - keep Intune Role Assignments explicitly excluded from baseline compare scope, summaries, findings, and restore messaging - add focused Pest coverage for baseline scope selection, capture, compare behavior, recurrence, isolation, findings rendering, inventory anchoring, and RBAC summaries ## Verification - `vendor/bin/sail bin pint --dirty --format agent` - `vendor/bin/sail artisan test --compact tests/Unit/Inventory/InventoryPolicyTypeMetaBaselineSupportTest.php tests/Unit/Baselines/BaselinePolicyVersionResolverTest.php tests/Unit/Baselines/BaselineScopeTest.php tests/Unit/IntuneRoleDefinitionNormalizerTest.php tests/Feature/Baselines/BaselineCaptureRbacRoleDefinitionsTest.php tests/Feature/Baselines/BaselineCompareRbacRoleDefinitionsTest.php tests/Feature/Baselines/BaselineCompareDriftEvidenceContractRbacTest.php tests/Feature/Baselines/BaselineCompareCoverageGuardTest.php tests/Feature/Baselines/BaselineCompareCrossTenantMatchTest.php tests/Feature/Baselines/BaselineCompareFindingRecurrenceKeyTest.php tests/Feature/Baselines/BaselineCompareWhyNoFindingsReasonCodeTest.php tests/Feature/Filament/BaselineProfileFoundationScopeTest.php tests/Feature/Filament/BaselineSnapshotRbacRoleDefinitionsTest.php tests/Feature/Filament/BaselineCompareLandingRbacLabelsTest.php tests/Feature/Filament/FindingViewRbacEvidenceTest.php tests/Feature/Findings/FindingRecurrenceTest.php tests/Feature/Findings/DriftStaleAutoResolveTest.php tests/Feature/Inventory/InventorySyncButtonTest.php tests/Feature/Inventory/InventorySyncServiceTest.php tests/Feature/RunAuthorizationTenantIsolationTest.php` - result: `71 passed (467 assertions)` ## Filament / Platform Notes - Livewire compliance: unchanged and compatible with Livewire v4.0+ - Provider registration: no panel/provider changes; `bootstrap/providers.php` remains the registration location - Global search: no new globally searchable resource added; existing global search behavior is unchanged - Destructive actions: no new destructive actions introduced; existing confirmed actions remain unchanged - Assets: no new Filament assets introduced; deploy asset handling remains unchanged, including `php artisan filament:assets` - Testing plan covered: baseline profile scope, snapshot detail, compare job, findings recurrence, findings detail, compare landing labels, inventory sync anchoring, and tenant isolation Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #156
132 lines
4.5 KiB
PHP
132 lines
4.5 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\BaselineProfile;
|
|
use App\Models\Finding;
|
|
use App\Models\OperationRun;
|
|
use App\Services\Baselines\BaselineAutoCloseService;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
afterEach(function (): void {
|
|
CarbonImmutable::setTestNow();
|
|
});
|
|
|
|
it('auto-resolves open baseline compare drift findings not detected in the latest run as no_longer_drifting', function (): void {
|
|
[, $tenant] = createUserWithTenant(role: 'manager');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
]);
|
|
|
|
$scopeKey = 'baseline_profile:'.$profile->getKey();
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'type' => 'baseline_compare',
|
|
]);
|
|
|
|
$observedAt = CarbonImmutable::parse('2026-02-25T00:00:00Z');
|
|
CarbonImmutable::setTestNow($observedAt);
|
|
|
|
$staleFinding = Finding::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'finding_type' => Finding::FINDING_TYPE_DRIFT,
|
|
'source' => 'baseline.compare',
|
|
'scope_key' => $scopeKey,
|
|
'fingerprint' => 'drift-stale',
|
|
'recurrence_key' => 'drift-stale',
|
|
'status' => Finding::STATUS_NEW,
|
|
'resolved_at' => null,
|
|
'resolved_reason' => null,
|
|
]);
|
|
|
|
$seenFinding = Finding::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'finding_type' => Finding::FINDING_TYPE_DRIFT,
|
|
'source' => 'baseline.compare',
|
|
'scope_key' => $scopeKey,
|
|
'fingerprint' => 'drift-seen',
|
|
'recurrence_key' => 'drift-seen',
|
|
'status' => Finding::STATUS_NEW,
|
|
]);
|
|
|
|
$resolvedCount = app(BaselineAutoCloseService::class)->resolveStaleFindings(
|
|
tenant: $tenant,
|
|
baselineProfileId: (int) $profile->getKey(),
|
|
seenFingerprints: ['drift-seen'],
|
|
currentOperationRunId: (int) $run->getKey(),
|
|
);
|
|
|
|
expect($resolvedCount)->toBe(1);
|
|
|
|
$staleFinding->refresh();
|
|
$seenFinding->refresh();
|
|
|
|
expect($staleFinding->status)->toBe(Finding::STATUS_RESOLVED)
|
|
->and($staleFinding->resolved_reason)->toBe('no_longer_drifting')
|
|
->and($staleFinding->resolved_at?->toIso8601String())->toBe($observedAt->toIso8601String())
|
|
->and((int) $staleFinding->current_operation_run_id)->toBe((int) $run->getKey());
|
|
|
|
expect($seenFinding->status)->toBe(Finding::STATUS_NEW);
|
|
});
|
|
|
|
it('auto-resolves stale intune role definition drift findings with the shared baseline auto-close flow', function (): void {
|
|
[, $tenant] = createUserWithTenant(role: 'manager');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
]);
|
|
|
|
$scopeKey = 'baseline_profile:'.$profile->getKey();
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'type' => 'baseline_compare',
|
|
]);
|
|
|
|
$observedAt = CarbonImmutable::parse('2026-02-26T00:00:00Z');
|
|
CarbonImmutable::setTestNow($observedAt);
|
|
|
|
$staleFinding = Finding::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'finding_type' => Finding::FINDING_TYPE_DRIFT,
|
|
'source' => 'baseline.compare',
|
|
'scope_key' => $scopeKey,
|
|
'fingerprint' => 'rbac-stale',
|
|
'recurrence_key' => 'rbac-stale',
|
|
'status' => Finding::STATUS_NEW,
|
|
'severity' => Finding::SEVERITY_HIGH,
|
|
'subject_type' => 'policy',
|
|
'subject_external_id' => 'rbac-role-stale',
|
|
'evidence_jsonb' => [
|
|
'change_type' => 'missing_policy',
|
|
'policy_type' => 'intuneRoleDefinition',
|
|
'subject_key' => 'rbac-role-stale',
|
|
'summary' => [
|
|
'kind' => 'rbac_role_definition',
|
|
],
|
|
],
|
|
]);
|
|
|
|
$resolvedCount = app(BaselineAutoCloseService::class)->resolveStaleFindings(
|
|
tenant: $tenant,
|
|
baselineProfileId: (int) $profile->getKey(),
|
|
seenFingerprints: [],
|
|
currentOperationRunId: (int) $run->getKey(),
|
|
);
|
|
|
|
expect($resolvedCount)->toBe(1);
|
|
|
|
$staleFinding->refresh();
|
|
|
|
expect($staleFinding->status)->toBe(Finding::STATUS_RESOLVED)
|
|
->and($staleFinding->resolved_reason)->toBe('no_longer_drifting')
|
|
->and($staleFinding->resolved_at?->toIso8601String())->toBe($observedAt->toIso8601String());
|
|
});
|