Skip to content

A free open source IT asset/license management system

Added byod to fleet-syncing devices

snipea65c3c2e512c
diff --git a/app/SyncAdapters/Fleet/FleetAdapter.php b/app/SyncAdapters/Fleet/FleetAdapter.php
index 8c9a2dadaa..f0176b41ff 100644
--- a/app/SyncAdapters/Fleet/FleetAdapter.php
+++ b/app/SyncAdapters/Fleet/FleetAdapter.php
@@ -51,6 +51,10 @@ class FleetAdapter extends SyncAdapter
'fleet_uuid' => ['label_key' => 'admin/settings/sync_adapters.extra_uuid'],
'fleet_status' => ['label_key' => 'admin/settings/sync_adapters.extra_status'],
'fleet_model_marketing_name' => ['label_key' => 'admin/settings/sync_adapters.extra_model_marketing_name'],
+ 'fleet_byod' => [
+ 'label_key' => 'admin/settings/sync_adapters.extra_byod',
+ 'type' => 'boolean',
+ ],
];
}
@@ -184,6 +188,11 @@ class FleetAdapter extends SyncAdapter
'fleet_uuid' => Arr::get($host, 'uuid'),
'fleet_status' => Arr::get($host, 'status'),
'fleet_model_marketing_name' => Arr::get($host, 'hardware_marketing_name'),
+ // Fleet exposes BYOD via mdm.enrollment_status = "On
+ // (personal)" for Apple ADUE and Android BYOD hosts.
+ // Any other enrollment status (including omitted for
+ // non-MDM hosts) is treated as not-BYOD.
+ 'fleet_byod' => Arr::get($host, 'mdm.enrollment_status') === 'On (personal)',
],
);
}
diff --git a/resources/lang/en-US/admin/settings/sync_adapters.php b/resources/lang/en-US/admin/settings/sync_adapters.php
index 922dadf3ca..e0a7b6aa8f 100644
--- a/resources/lang/en-US/admin/settings/sync_adapters.php
+++ b/resources/lang/en-US/admin/settings/sync_adapters.php
@@ -99,6 +99,7 @@ return [
'target_native_model' => 'Asset model (auto-created)',
'target_native_asset_tag' => 'Asset tag',
'target_native_notes' => 'Asset notes',
+ 'target_native_byod' => 'BYOD (personal device)',
'target_external_mac' => 'MAC address',
'target_external_ip' => 'IP address',
'target_external_os' => 'OS',
@@ -261,6 +262,7 @@ return [
'extra_uuid' => ':vendor UUID',
'extra_udid' => ':vendor UDID',
'extra_status' => ':vendor Status',
+ 'extra_byod' => ':vendor Personal (BYOD)',
'extra_active' => ':vendor Active',
'extra_group' => ':vendor Group',
'extra_site' => ':vendor Site',
diff --git a/tests/Feature/SyncAdapters/Fleet/FleetAdapterTest.php b/tests/Feature/SyncAdapters/Fleet/FleetAdapterTest.php
index 4935e693fe..db625fd584 100644
--- a/tests/Feature/SyncAdapters/Fleet/FleetAdapterTest.php
+++ b/tests/Feature/SyncAdapters/Fleet/FleetAdapterTest.php
@@ -172,6 +172,75 @@ class FleetAdapterTest extends TestCase
);
}
+ public function test_byod_extra_is_true_when_fleet_reports_personal_enrollment()
+ {
+ // Fleet reports Apple ADUE (Account-driven User Enrollment) and
+ // Android BYOD hosts with mdm.enrollment_status = "On (personal)".
+ // Adapter surfaces this as the fleet_byod boolean extra so
+ // admins can map it to a checkbox custom field (or eventually
+ // the native assets.byod column once the mapping-target pool
+ // opens up).
+ $adapter = $this->configuredFleetAdapter();
+
+ Http::fake([
+ '*/api/latest/fleet/hosts*' => Http::sequence()
+ ->push($this->fleetHostsResponse([
+ $this->fleetHost(id: 1, hostname: 'personal-iphone', hardware_model: 'iPhone14,5')
+ + ['mdm' => ['enrollment_status' => 'On (personal)']],
+ ])),
+ ]);
+
+ $record = iterator_to_array($adapter->pull())[0];
+ $this->assertTrue($record->extra['fleet_byod']);
+ }
+
+ public function test_byod_extra_is_false_for_company_owned_or_non_mdm_hosts()
+ {
+ $adapter = $this->configuredFleetAdapter();
+
+ Http::fake([
+ '*/api/latest/fleet/hosts*' => Http::sequence()
+ ->push($this->fleetHostsResponse([
+ // Company-owned MDM host: enrollment_status is a
+ // different string. fleet_byod should be false.
+ $this->fleetHost(id: 1, hostname: 'corp-mac', hardware_model: 'MacBookPro18,3')
+ + ['mdm' => ['enrollment_status' => 'On (automatic)']],
+ // Non-MDM host: mdm object omitted entirely.
+ // fleet_byod should be false (not null).
+ $this->fleetHost(id: 2, hostname: 'non-mdm-host', hardware_model: 'ThinkPad'),
+ ])),
+ ]);
+
+ $records = iterator_to_array($adapter->pull());
+ $this->assertFalse($records[0]->extra['fleet_byod']);
+ $this->assertFalse($records[1]->extra['fleet_byod']);
+ }
+
+ public function test_byod_extra_maps_to_native_byod_column()
+ {
+ // fleet_byod extra can be routed to the native assets.byod
+ // column via the mapping UI. When configured, the boolean
+ // extra propagates to the asset's byod flag on sync.
+ $adapter = $this->configuredFleetAdapter();
+ $instance = SyncAdapterInstance::where('slug', 'fleet')->firstOrFail();
+ SyncAdapterConfig::put($instance->id, 'mapping.fleet_byod', 'native:byod');
+
+ Http::fake([
+ '*/api/latest/fleet/hosts*' => Http::sequence()
+ ->push($this->fleetHostsResponse([
+ $this->fleetHost(id: 1, hostname: 'personal-phone', hardware_model: 'iPhone14,5')
+ + ['mdm' => ['enrollment_status' => 'On (personal)']],
+ ])),
+ ]);
+
+ foreach ($adapter->pull() as $record) {
+ SyncHostFromAdapter::run($record);
+ }
+
+ $asset = \App\Models\Asset::where('name', 'personal-phone')->firstOrFail();
+ $this->assertTrue((bool) $asset->byod);
+ }
+
public function test_synced_assets_inherit_the_instance_company_id()
{
$company = \App\Models\Company::factory()->create();