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

Appropriately filter teams returned in targets API (#1042)

Browse source 
Fixes #1021 by adding the appropriate teams filtering.
This commit is contained in:
Zach Wasserman 2021-06-09 18:05:04 -07:00 committed by GitHub
parent b419958b73
commit 6a18b2a250
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/datastore/mysql/teams.go
View file

@ -192,9 +192,10 @@ func (d *Datastore) SearchTeams(filter fleet.TeamFilter, matchQuery string, omit
(SELECT count(*) FROM user_teams WHERE team_id = t.id) AS user_count,
(SELECT count(*) FROM hosts WHERE team_id = t.id) AS host_count
FROM teams t
WHERE %s
WHERE %s AND %s
`,
d.whereOmitIDs("t.id", omit),
d.whereFilterTeams(filter, "t"),
)
sql, params := searchLike(sql, nil, matchQuery, teamSearchColumns...)
sql += "\nLIMIT 5"
@ -204,6 +205,7 @@ func (d *Datastore) SearchTeams(filter fleet.TeamFilter, matchQuery string, omit
}
return teams, nil
}
func (d *Datastore) TeamEnrollSecrets(teamID uint) ([]*fleet.EnrollSecret, error) {
sql := `
SELECT * FROM enroll_secrets