Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Fix targeting Teams in live queries (#1043)

Browse source 
Properly handle the `TargetTeam` type, allowing live queries to
successfully execute against Teams.

Part of #1022
This commit is contained in:
Zach Wasserman 2021-06-09 18:56:57 -07:00 committed by GitHub
parent 6a18b2a250
commit 0a99ec751c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/datastore/mysql/campaigns.go
View file

@ -76,11 +76,14 @@ func (d *Datastore) DistributedQueryCampaignTargetIDs(id uint) (*fleet.HostTarge
labelIDs := []uint{}
teamIDs := []uint{}
for _, target := range targets {
if target.Type == fleet.TargetHost {
switch target.Type {
case fleet.TargetHost:
hostIDs = append(hostIDs, target.TargetID)
} else if target.Type == fleet.TargetLabel {
case fleet.TargetLabel:
labelIDs = append(labelIDs, target.TargetID)
} else {
case fleet.TargetTeam:
teamIDs = append(teamIDs, target.TargetID)
default:
return nil, errors.Errorf("invalid target type: %d", target.Type)
}
}

4
server/service/service_campaigns.go
View file

@ -109,11 +109,11 @@ func (svc Service) NewDistributedQueryCampaign(ctx context.Context, queryString
}
// Add team targets
for _, lid := range targets.TeamIDs {
for _, tid := range targets.TeamIDs {
_, err = svc.ds.NewDistributedQueryCampaignTarget(&fleet.DistributedQueryCampaignTarget{
Type: fleet.TargetTeam,
DistributedQueryCampaignID: campaign.ID,
TargetID: lid,
TargetID: tid,
})
if err != nil {
return nil, errors.Wrap(err, "adding team target")