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 targeting packs to individual hosts (#1897)

Browse source 
Packs can be targeted to individual hosts through the UI. This was supported
previously and was broken with refactoring in Fleet 2.0.

There is currently no support in the fleetctl format for targeting individual
hosts, but this could be added at a later date.

Fixes #1878
This commit is contained in:
Zachary Wasserman 2018-08-13 10:07:10 -07:00 committed by GitHub
parent 4729789943
commit dfac039422
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
server/datastore/datastore_packs_test.go
View file

@ -432,4 +432,40 @@ func testListPacksForHost(t *testing.T, ds kolide.Datastore) {
if assert.Len(t, packs, 1) {
assert.Equal(t, "foo_pack", packs[0].Name)
}
// Add host directly to pack
err = ds.AddHostToPack(h1.ID, p2.ID)
require.Nil(t, err)
packs, err = ds.ListPacksForHost(h1.ID)
require.Nil(t, err)
assert.Len(t, packs, 2)
// Remove label membership for both
err = ds.RecordLabelQueryExecutions(
h1,
map[uint]bool{l2.ID: false, l1.ID: false},
mockClock.Now(),
)
require.Nil(t, err)
err = ds.RecordLabelQueryExecutions(
h1,
map[uint]bool{l2.ID: false},
mockClock.Now(),
)
require.Nil(t, err)
packs, err = ds.ListPacksForHost(h1.ID)
require.Nil(t, err)
if assert.Len(t, packs, 1) {
assert.Equal(t, p2.Name, packs[0].Name)
}
// Now host is added directly to both packs
err = ds.AddHostToPack(h1.ID, p1.ID)
require.Nil(t, err)
packs, err = ds.ListPacksForHost(h1.ID)
require.Nil(t, err)
assert.Len(t, packs, 2)
}

15
server/datastore/mysql/packs.go
View file

@ -445,8 +445,9 @@ func (d *Datastore) ListLabelsForPack(pid uint) ([]*kolide.Label, error) {
func (d *Datastore) ListPacksForHost(hid uint) ([]*kolide.Pack, error) {
query := `
SELECT DISTINCT p.*
FROM packs p
SELECT DISTINCT packs.*
FROM
((SELECT p.* FROM packs p
JOIN pack_targets pt
JOIN label_query_executions lqe
ON (
@ -455,11 +456,17 @@ func (d *Datastore) ListPacksForHost(hid uint) ([]*kolide.Pack, error) {
AND pt.type = ?
AND lqe.matches
)
WHERE lqe.host_id = ? AND NOT p.disabled
WHERE lqe.host_id = ? AND NOT p.disabled)
UNION ALL
(SELECT p.*
FROM packs p
JOIN pack_targets pt
ON (p.id = pt.pack_id AND pt.type = ? AND pt.target_id = ?))
) packs
`
packs := []*kolide.Pack{}
if err := d.db.Select(&packs, query, kolide.TargetLabel, hid); err != nil && err != sql.ErrNoRows {
if err := d.db.Select(&packs, query, kolide.TargetLabel, hid, kolide.TargetHost, hid); err != nil && err != sql.ErrNoRows {
return nil, errors.Wrap(err, "listing hosts in pack")
}
return packs, nil