empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix panic when loading mdm-enrolled host by orbit key and is_server is null (#9957)

Browse Source
This commit is contained in:
Martin Angers 2023-02-21 08:41:04 -05:00 committed by GitHub
parent 765a43cb50
commit c3a9a1cd94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/issue-9905-fix-panic-host-mdm-is-server Normal file
View File

@ -0,0 +1 @@
* Fixed a panic when loading information for a host enrolled in MDM and its `is_server` field is `NULL`.

6
server/datastore/mysql/hosts.go
View File

@ -1274,7 +1274,7 @@ func (ds *Datastore) LoadHostByOrbitNodeKey(ctx context.Context, nodeKey string)
hm.server_url,
hm.installed_from_dep,
hm.mdm_id,
hm.is_server,
COALESCE(hm.is_server, false) AS is_server,
COALESCE(mdms.name, ?) AS name
FROM
hosts h
@ -2351,7 +2351,7 @@ func (ds *Datastore) SetOrUpdateHostDisksEncryption(ctx context.Context, hostID
func (ds *Datastore) SetOrUpdateHostDiskEncryptionKey(ctx context.Context, hostID uint, encryptedBase64Key string) error {
_, err := ds.writer.ExecContext(ctx, `
INSERT INTO host_disk_encryption_keys (host_id, base64_encrypted)
INSERT INTO host_disk_encryption_keys (host_id, base64_encrypted)
VALUES (?, ?)
ON DUPLICATE KEY UPDATE
/* if the key has changed, NULLify this value so it can be calculated again */
@ -2455,7 +2455,7 @@ func (ds *Datastore) GetHostMDM(ctx context.Context, hostID uint) (*fleet.HostMD
var hmdm fleet.HostMDM
err := sqlx.GetContext(ctx, ds.reader, &hmdm, `
SELECT
hm.host_id, hm.enrolled, hm.server_url, hm.installed_from_dep, hm.mdm_id, hm.is_server, COALESCE(mdms.name, ?) AS name
hm.host_id, hm.enrolled, hm.server_url, hm.installed_from_dep, hm.mdm_id, COALESCE(hm.is_server, false) AS is_server, COALESCE(mdms.name, ?) AS name
FROM
host_mdm hm
LEFT OUTER JOIN

22
server/datastore/mysql/hosts_test.go
View File

@ -923,6 +923,17 @@ func testHostsUnenrollFromMDM(t *testing.T, ds *Datastore) {
err = ds.SetOrUpdateMDMData(ctx, h2.ID, false, true, simpleMDM, true, "")
require.NoError(t, err)
// force is_server to NULL for host 1
ExecAdhocSQL(t, ds, func(q sqlx.ExtContext) error {
_, err := q.ExecContext(ctx, `UPDATE host_mdm SET is_server = NULL WHERE host_id = ?`, h.ID)
return err
})
// GetHostMDM should still work and return false for is_server
hmdm, err := ds.GetHostMDM(ctx, h.ID)
require.NoError(t, err)
require.Equal(t, h.ID, hmdm.HostID)
require.False(t, hmdm.IsServer)
for _, hi := range []*fleet.Host{h, h2} {
hmdm, err := ds.GetHostMDM(ctx, hi.ID)
require.NoError(t, err)
@ -5980,6 +5991,17 @@ func testHostsLoadHostByOrbitNodeKey(t *testing.T, ds *Datastore) {
require.Equal(t, hFleet.ID, loadFleet.MDMInfo.HostID)
require.True(t, loadFleet.IsOsqueryEnrolled())
require.True(t, loadFleet.MDMInfo.IsPendingDEPFleetEnrollment())
require.False(t, loadFleet.MDMInfo.IsServer)
// force its is_server mdm field to NULL, should be same as false
ExecAdhocSQL(t, ds, func(q sqlx.ExtContext) error {
_, err := q.ExecContext(ctx, `UPDATE host_mdm SET is_server = NULL WHERE host_id = ?`, hFleet.ID)
return err
})
loadFleet, err = ds.LoadHostByOrbitNodeKey(ctx, *hFleet.OrbitNodeKey)
require.NoError(t, err)
require.Equal(t, hFleet.ID, loadFleet.ID)
require.False(t, loadFleet.MDMInfo.IsServer)
}
func checkEncryptionKeyStatus(t *testing.T, ds *Datastore, hostID uint, expected *bool) {