Compare commits
No commits in common. "f23cf8a83f94456ba2642ab01bc43fa56cf51e1c" and "d54a245a5833579d50a384df9dd2ad0f0d637edc" have entirely different histories.
f23cf8a83f
...
d54a245a58
@ -756,17 +756,7 @@ private function resolveRestoreMode(?string $policyType): string
|
|||||||
{
|
{
|
||||||
$meta = $this->resolveTypeMeta($policyType);
|
$meta = $this->resolveTypeMeta($policyType);
|
||||||
|
|
||||||
if ($meta === []) {
|
return (string) ($meta['restore'] ?? 'enabled');
|
||||||
return 'preview-only';
|
|
||||||
}
|
|
||||||
|
|
||||||
$restore = $meta['restore'] ?? 'enabled';
|
|
||||||
|
|
||||||
if (! is_string($restore) || $restore === '') {
|
|
||||||
return 'enabled';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $restore;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function resolveTypeLabel(?string $policyType): string
|
private function resolveTypeLabel(?string $policyType): string
|
||||||
|
|||||||
@ -931,11 +931,6 @@ private function resolveTypeMeta(string $policyType): array
|
|||||||
private function resolveRestoreMode(string $policyType): string
|
private function resolveRestoreMode(string $policyType): string
|
||||||
{
|
{
|
||||||
$meta = $this->resolveTypeMeta($policyType);
|
$meta = $this->resolveTypeMeta($policyType);
|
||||||
|
|
||||||
if ($meta === []) {
|
|
||||||
return 'preview-only';
|
|
||||||
}
|
|
||||||
|
|
||||||
$restore = $meta['restore'] ?? 'enabled';
|
$restore = $meta['restore'] ?? 'enabled';
|
||||||
|
|
||||||
if (! is_string($restore) || $restore === '') {
|
if (! is_string($restore) || $restore === '') {
|
||||||
|
|||||||
@ -1,117 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use App\Models\BackupItem;
|
|
||||||
use App\Models\BackupSet;
|
|
||||||
use App\Models\Tenant;
|
|
||||||
use App\Services\Graph\GraphClientInterface;
|
|
||||||
use App\Services\Graph\GraphResponse;
|
|
||||||
use App\Services\Intune\RestoreService;
|
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
||||||
|
|
||||||
uses(RefreshDatabase::class);
|
|
||||||
|
|
||||||
class RestoreUnknownTypeGraphClient implements GraphClientInterface
|
|
||||||
{
|
|
||||||
/** @var array<int, array{policyType:string,policyId:string,payload:array,options:array<string,mixed>}> */
|
|
||||||
public array $applyPolicyCalls = [];
|
|
||||||
|
|
||||||
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
|
|
||||||
{
|
|
||||||
$this->applyPolicyCalls[] = [
|
|
||||||
'policyType' => $policyType,
|
|
||||||
'policyId' => $policyId,
|
|
||||||
'payload' => $payload,
|
|
||||||
'options' => $options,
|
|
||||||
];
|
|
||||||
|
|
||||||
return new GraphResponse(false, ['error' => ['message' => 'Bad request']], 400, [], [], [
|
|
||||||
'error_code' => 'BadRequest',
|
|
||||||
'error_message' => 'Bad request',
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getServicePrincipalPermissions(array $options = []): GraphResponse
|
|
||||||
{
|
|
||||||
return new GraphResponse(true, []);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function request(string $method, string $path, array $options = []): GraphResponse
|
|
||||||
{
|
|
||||||
return new GraphResponse(true, []);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
$this->originalSupportedTypes = config('tenantpilot.supported_policy_types');
|
|
||||||
$this->originalSecurityBaselineContract = config('graph_contracts.types.securityBaselinePolicy');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(function () {
|
|
||||||
config()->set('tenantpilot.supported_policy_types', $this->originalSupportedTypes);
|
|
||||||
|
|
||||||
if (is_array($this->originalSecurityBaselineContract)) {
|
|
||||||
config()->set('graph_contracts.types.securityBaselinePolicy', $this->originalSecurityBaselineContract);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
test('restore skips security baseline policies when type metadata is missing', function () {
|
|
||||||
$client = new RestoreUnknownTypeGraphClient;
|
|
||||||
app()->instance(GraphClientInterface::class, $client);
|
|
||||||
|
|
||||||
$supported = array_values(array_filter(
|
|
||||||
config('tenantpilot.supported_policy_types', []),
|
|
||||||
static fn (array $type): bool => ($type['type'] ?? null) !== 'securityBaselinePolicy'
|
|
||||||
));
|
|
||||||
|
|
||||||
config()->set('tenantpilot.supported_policy_types', $supported);
|
|
||||||
config()->set('graph_contracts.types.securityBaselinePolicy', []);
|
|
||||||
|
|
||||||
$tenant = Tenant::factory()->create();
|
|
||||||
$backupSet = BackupSet::factory()->for($tenant)->create([
|
|
||||||
'status' => 'completed',
|
|
||||||
'item_count' => 1,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$backupItem = BackupItem::factory()->for($tenant)->for($backupSet)->create([
|
|
||||||
'policy_id' => null,
|
|
||||||
'policy_identifier' => 'baseline-1',
|
|
||||||
'policy_type' => 'securityBaselinePolicy',
|
|
||||||
'platform' => 'windows',
|
|
||||||
'payload' => [
|
|
||||||
'id' => 'baseline-1',
|
|
||||||
'@odata.type' => '#microsoft.graph.deviceManagementConfigurationPolicy',
|
|
||||||
'name' => 'Security Baseline Policy',
|
|
||||||
],
|
|
||||||
'assignments' => null,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$service = app(RestoreService::class);
|
|
||||||
$run = $service->execute(
|
|
||||||
tenant: $tenant,
|
|
||||||
backupSet: $backupSet,
|
|
||||||
selectedItemIds: [$backupItem->id],
|
|
||||||
dryRun: false,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect($client->applyPolicyCalls)->toHaveCount(0);
|
|
||||||
|
|
||||||
$result = $run->results[0] ?? null;
|
|
||||||
expect($result)->toBeArray();
|
|
||||||
expect($result['status'] ?? null)->toBe('skipped');
|
|
||||||
expect($result['restore_mode'] ?? null)->toBe('preview-only');
|
|
||||||
});
|
|
||||||
Loading…
Reference in New Issue
Block a user