From 6a18b2a250c2a26589f738840ec23b5ff7a8feac Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Wed, 9 Jun 2021 18:05:04 -0700 Subject: [PATCH] Appropriately filter teams returned in targets API (#1042) Fixes #1021 by adding the appropriate teams filtering. --- server/datastore/mysql/teams.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/datastore/mysql/teams.go b/server/datastore/mysql/teams.go index 9f89581c67..a322ffb9c4 100644 --- a/server/datastore/mysql/teams.go +++ b/server/datastore/mysql/teams.go @@ -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