tenantpilot.php/graph_contracts.php include the new policy type, Graph contract, and /assign assignment flow (deviceHealthScriptAssignments payload key). ScriptsPolicyNormalizer now supports deviceComplianceScript (more metadata + script display), and InteractsWithODataTypes knows the new type. UI diff view highlights detection-script changes (same logic as other script policies) once tenantpilot.display.show_script_content is enabled. Added regression coverage in tests/Feature/Filament/ScriptPoliciesNormalizedDisplayTest plus new feature test DeviceComplianceScriptPolicyTypeTest. Runs: ScriptPoliciesNormalizedDisplayTest.php, ./vendor/bin/pint --dirty. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #29
187 lines
6.3 KiB
PHP
187 lines
6.3 KiB
PHP
<?php
|
|
|
|
use App\Models\BackupItem;
|
|
use App\Models\BackupSet;
|
|
use App\Models\Policy;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Intune\PolicyNormalizer;
|
|
use App\Services\Intune\RestoreService;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
class DeviceComplianceScriptRestoreGraphClient implements GraphClientInterface
|
|
{
|
|
/**
|
|
* @var array<int, array{method:string,path:string,payload:array|null}>
|
|
*/
|
|
public array $requestCalls = [];
|
|
|
|
/**
|
|
* @param array<int, GraphResponse> $requestResponses
|
|
*/
|
|
public function __construct(
|
|
private readonly GraphResponse $applyPolicyResponse,
|
|
private array $requestResponses = [],
|
|
) {}
|
|
|
|
public function listPolicies(string $policyType, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getPolicy(string $policyType, string $policyId, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, ['payload' => []]);
|
|
}
|
|
|
|
public function getOrganization(array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function applyPolicy(string $policyType, string $policyId, array $payload, array $options = []): GraphResponse
|
|
{
|
|
return $this->applyPolicyResponse;
|
|
}
|
|
|
|
public function getServicePrincipalPermissions(array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function request(string $method, string $path, array $options = []): GraphResponse
|
|
{
|
|
$this->requestCalls[] = [
|
|
'method' => strtoupper($method),
|
|
'path' => $path,
|
|
'payload' => $options['json'] ?? null,
|
|
];
|
|
|
|
return array_shift($this->requestResponses) ?? new GraphResponse(true, []);
|
|
}
|
|
}
|
|
|
|
it('includes device compliance scripts in supported policy types', function () {
|
|
$supported = collect(config('tenantpilot.supported_policy_types', []))
|
|
->keyBy('type')
|
|
->all();
|
|
|
|
expect($supported)->toHaveKey('deviceComplianceScript');
|
|
expect($supported['deviceComplianceScript']['endpoint'] ?? null)->toBe('deviceManagement/deviceComplianceScripts');
|
|
expect($supported['deviceComplianceScript']['restore'] ?? null)->toBe('enabled');
|
|
});
|
|
|
|
it('defines device compliance script graph contract with correct assignment payload key', function () {
|
|
$contract = config('graph_contracts.types.deviceComplianceScript');
|
|
|
|
expect($contract)->toBeArray();
|
|
expect($contract['resource'] ?? null)->toBe('deviceManagement/deviceComplianceScripts');
|
|
expect($contract['assignments_create_path'] ?? null)->toBe('/deviceManagement/deviceComplianceScripts/{id}/assign');
|
|
expect($contract['assignments_payload_key'] ?? null)->toBe('deviceHealthScriptAssignments');
|
|
});
|
|
|
|
it('restores device compliance script assignments via assign action', function () {
|
|
$client = new DeviceComplianceScriptRestoreGraphClient(
|
|
applyPolicyResponse: new GraphResponse(true, []),
|
|
requestResponses: [
|
|
new GraphResponse(true, []), // assign action
|
|
],
|
|
);
|
|
app()->instance(GraphClientInterface::class, $client);
|
|
|
|
$tenant = Tenant::factory()->create([
|
|
'tenant_id' => 'tenant-1',
|
|
]);
|
|
|
|
$policy = Policy::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'external_id' => 'dcs-1',
|
|
'policy_type' => 'deviceComplianceScript',
|
|
'platform' => 'windows',
|
|
]);
|
|
|
|
$backupSet = BackupSet::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'status' => 'completed',
|
|
'item_count' => 1,
|
|
]);
|
|
|
|
$backupItem = BackupItem::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
'policy_id' => $policy->id,
|
|
'policy_identifier' => $policy->external_id,
|
|
'policy_type' => $policy->policy_type,
|
|
'platform' => $policy->platform,
|
|
'payload' => [
|
|
'id' => $policy->external_id,
|
|
'@odata.type' => '#microsoft.graph.deviceComplianceScript',
|
|
],
|
|
'assignments' => [
|
|
[
|
|
'id' => 'assignment-1',
|
|
'intent' => 'apply',
|
|
'target' => [
|
|
'@odata.type' => '#microsoft.graph.groupAssignmentTarget',
|
|
'groupId' => 'source-group-1',
|
|
],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$user = User::factory()->create(['email' => 'tester@example.com']);
|
|
$this->actingAs($user);
|
|
|
|
$service = app(RestoreService::class);
|
|
$service->execute(
|
|
tenant: $tenant,
|
|
backupSet: $backupSet,
|
|
selectedItemIds: [$backupItem->id],
|
|
dryRun: false,
|
|
actorEmail: $user->email,
|
|
actorName: $user->name,
|
|
groupMapping: [
|
|
'source-group-1' => 'target-group-1',
|
|
],
|
|
);
|
|
|
|
$postCalls = collect($client->requestCalls)
|
|
->filter(fn (array $call) => $call['method'] === 'POST')
|
|
->values();
|
|
|
|
expect($postCalls)->toHaveCount(1);
|
|
expect($postCalls[0]['path'])->toBe('/deviceManagement/deviceComplianceScripts/dcs-1/assign');
|
|
|
|
$payloadAssignments = $postCalls[0]['payload']['deviceHealthScriptAssignments'] ?? [];
|
|
$groupIds = collect($payloadAssignments)->pluck('target.groupId')->all();
|
|
|
|
expect($groupIds)->toBe(['target-group-1']);
|
|
expect($payloadAssignments[0])->not->toHaveKey('id');
|
|
});
|
|
|
|
it('normalizes device compliance script key fields', function () {
|
|
config([
|
|
'tenantpilot.display.show_script_content' => false,
|
|
]);
|
|
|
|
$normalized = app(PolicyNormalizer::class)->normalize([
|
|
'@odata.type' => '#microsoft.graph.deviceComplianceScript',
|
|
'displayName' => 'My script',
|
|
'runAsAccount' => 'system',
|
|
'runAs32Bit' => true,
|
|
'enforceSignatureCheck' => false,
|
|
'detectionScriptContent' => base64_encode("Write-Host 'hello'\n"),
|
|
], 'deviceComplianceScript', 'windows');
|
|
|
|
$settings = $normalized['settings'][0]['entries'] ?? [];
|
|
$byKey = collect($settings)->keyBy('key');
|
|
|
|
expect($byKey['Run as account']['value'] ?? null)->toBe('system');
|
|
expect($byKey['Run as 32-bit']['value'] ?? null)->toBe('Enabled');
|
|
expect($byKey['Enforce signature check']['value'] ?? null)->toBe('Disabled');
|
|
});
|