## 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
74 lines
2.3 KiB
PHP
74 lines
2.3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Support\Baselines;
|
|
|
|
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
|
|
|
final class BaselineSubjectKey
|
|
{
|
|
public static function forPolicy(string $policyType, ?string $displayName = null, ?string $subjectExternalId = null): ?string
|
|
{
|
|
return match (InventoryPolicyTypeMeta::baselineCompareIdentityStrategy($policyType)) {
|
|
'external_id' => self::fromExternalId($policyType, $subjectExternalId),
|
|
default => self::fromDisplayName($displayName),
|
|
};
|
|
}
|
|
|
|
public static function fromDisplayName(?string $displayName): ?string
|
|
{
|
|
if (! is_string($displayName)) {
|
|
return null;
|
|
}
|
|
|
|
$trimmed = trim($displayName);
|
|
|
|
if ($trimmed === '') {
|
|
return null;
|
|
}
|
|
|
|
$collapsed = preg_replace('/\\s+/u', ' ', $trimmed);
|
|
$collapsed = is_string($collapsed) ? $collapsed : $trimmed;
|
|
|
|
$normalized = mb_strtolower($collapsed);
|
|
$normalized = trim($normalized);
|
|
|
|
return $normalized !== '' ? $normalized : null;
|
|
}
|
|
|
|
public static function fromExternalId(string $policyType, ?string $subjectExternalId): ?string
|
|
{
|
|
if (! is_string($subjectExternalId)) {
|
|
return null;
|
|
}
|
|
|
|
$normalizedId = trim(mb_strtolower($subjectExternalId));
|
|
|
|
if ($normalizedId === '') {
|
|
return null;
|
|
}
|
|
|
|
return hash('sha256', trim(mb_strtolower($policyType)).'|'.$normalizedId);
|
|
}
|
|
|
|
public static function workspaceSafeSubjectExternalId(string $policyType, string $subjectKey): string
|
|
{
|
|
return hash('sha256', $policyType.'|'.$subjectKey);
|
|
}
|
|
|
|
public static function workspaceSafeSubjectExternalIdForPolicy(string $policyType, ?string $displayName = null, ?string $subjectExternalId = null): ?string
|
|
{
|
|
$identityInput = match (InventoryPolicyTypeMeta::baselineCompareIdentityStrategy($policyType)) {
|
|
'external_id' => is_string($subjectExternalId) ? trim(mb_strtolower($subjectExternalId)) : null,
|
|
default => self::fromDisplayName($displayName),
|
|
};
|
|
|
|
if (! is_string($identityInput) || $identityInput === '') {
|
|
return null;
|
|
}
|
|
|
|
return self::workspaceSafeSubjectExternalId($policyType, $identityInput);
|
|
}
|
|
}
|