Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fix list applications managed and non-managed command uuid (#38162)

Browse source
This commit is contained in:
Martin Angers 2026-01-12 10:03:01 -05:00 committed by GitHub
parent 6604bb5fa8
commit c3bee53338
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/mdm/apple/apple_mdm.go
View file

@ -1404,7 +1404,6 @@ func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMApp
return nil
}
logger.Log("msg", "sending commands to refetch", "count", len(devices), "lookup-duration", time.Since(start))
commandUUID := uuid.NewString()
hostMDMCommands := make([]fleet.HostMDMCommand, 0, 3*len(devices))
installedAppsUUIDs := struct {
@ -1431,6 +1430,7 @@ func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMApp
continue
}
commandUUID := uuid.NewString()
err = commander.InstalledApplicationList(ctx, uuids, fleet.RefetchAppsCommandUUIDPrefix+commandUUID, managedOnly)
turnedOff, turnedOffError := turnOffMDMIfAPNSFailed(ctx, ds, err, logger, newActivityFn)
if turnedOffError != nil {
@ -1453,6 +1453,7 @@ func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMApp
}
}
if len(certsListUUIDs) > 0 {
commandUUID := uuid.NewString()
err = commander.CertificateList(ctx, certsListUUIDs, fleet.RefetchCertsCommandUUIDPrefix+commandUUID)
turnedOff, turnedOffError := turnOffMDMIfAPNSFailed(ctx, ds, err, logger, newActivityFn)
if turnedOffError != nil {
@ -1475,6 +1476,7 @@ func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMApp
}
}
if len(deviceInfoUUIDs) > 0 {
commandUUID := uuid.NewString()
err := commander.DeviceInformation(ctx, deviceInfoUUIDs, fleet.RefetchDeviceCommandUUIDPrefix+commandUUID)
turnedOff, turnedOffError := turnOffMDMIfAPNSFailed(ctx, ds, err, logger, newActivityFn)
if turnedOffError != nil {

38
server/service/integration_mdm_test.go
View file

@ -1446,6 +1446,7 @@ func (s *integrationMDMTestSuite) createAppleMobileHostThenEnrollMDM(platform st
dbZeroTime := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)
serialNumber := mdmtest.RandSerialNumber()
fleetHost, err := s.ds.NewHost(ctx, &fleet.Host{
UUID: uuid.NewString(),
HardwareSerial: serialNumber,
HardwareModel: model,
Platform: platform,
@ -1465,6 +1466,7 @@ func (s *integrationMDMTestSuite) createAppleMobileHostThenEnrollMDM(platform st
mdmDevice := mdmtest.NewTestMDMClientAppleDirect(mdmEnrollInfo, model)
mdmDevice.SerialNumber = serialNumber
mdmDevice.UUID = fleetHost.UUID
err = mdmDevice.Enroll()
require.NoError(t, err)
@ -20198,15 +20200,15 @@ func (s *integrationMDMTestSuite) TestInstalledApplicationListCommandForBYODiDev
{HostID: hostBYOD.ID, CommandType: fleet.RefetchDeviceCommandUUIDPrefix},
}, commands)
checkExpectedCommands := func(mdmClient *mdmtest.TestAppleMDMClient, managedOnly bool) {
var installedAppCount int
checkExpectedCommands := func(mdmClient *mdmtest.TestAppleMDMClient, managedOnly bool, wantAppListCount int) {
var installedAppListCount int
cmd, err := mdmClient.Idle()
require.NoError(t, err)
for cmd != nil {
var fullCmd micromdm.CommandPayload
switch cmd.Command.RequestType {
case "InstalledApplicationList":
installedAppCount++
installedAppListCount++
require.NoError(t, plist.Unmarshal(cmd.Raw, &fullCmd))
require.NotNil(t, fullCmd.Command)
require.NotNil(t, fullCmd.Command.InstalledApplicationList)
@ -20224,10 +20226,10 @@ func (s *integrationMDMTestSuite) TestInstalledApplicationListCommandForBYODiDev
require.NoError(t, err)
}
}
require.Equal(t, 1, installedAppCount)
require.Equal(t, wantAppListCount, installedAppListCount)
}
checkExpectedCommands(mdmClientBYOD, true)
checkExpectedCommands(mdmClientBYOD, true, 1)
// create a company-owned ios host
hostDEP, mdmClientDEP := s.createAppleMobileHostThenEnrollMDM("ios")
@ -20245,5 +20247,29 @@ func (s *integrationMDMTestSuite) TestInstalledApplicationListCommandForBYODiDev
{HostID: hostDEP.ID, CommandType: fleet.RefetchDeviceCommandUUIDPrefix},
}, commands)
checkExpectedCommands(mdmClientDEP, false)
checkExpectedCommands(mdmClientDEP, false, 1)
// run the cron-based refetch, will not do anything as the devices were just refetched
err = apple_mdm.IOSiPadOSRefetch(ctx, s.ds, s.mdmCommander, s.logger, func(ctx context.Context, user *fleet.User, act fleet.ActivityDetails) error {
return newActivity(ctx, user, act, s.ds, s.logger)
})
require.NoError(t, err)
checkExpectedCommands(mdmClientBYOD, true, 0)
checkExpectedCommands(mdmClientDEP, false, 0)
// change the detail_updated_at of the devices to > 1h ago, and run the refetch again
hostBYOD.DetailUpdatedAt = time.Now().Add(-24 * time.Hour)
hostDEP.DetailUpdatedAt = time.Now().Add(-24 * time.Hour)
require.NoError(t, s.ds.UpdateHost(ctx, hostBYOD))
require.NoError(t, s.ds.UpdateHost(ctx, hostDEP))
// run the cron-based refetch again, will enqueue the commands with the correct managed only flag
err = apple_mdm.IOSiPadOSRefetch(ctx, s.ds, s.mdmCommander, s.logger, func(ctx context.Context, user *fleet.User, act fleet.ActivityDetails) error {
return newActivity(ctx, user, act, s.ds, s.logger)
})
require.NoError(t, err)
checkExpectedCommands(mdmClientBYOD, true, 1)
checkExpectedCommands(mdmClientDEP, false, 1)
}