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

Detect not found errors for queries and policies (#3595)

Browse Source 
* Detect not found errors for queries and policies

* Fix test
This commit is contained in:
Tomas Touceda 2022-01-12 10:04:16 -03:00 committed by GitHub
parent d0f243c482
commit 312bd840a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/issue-3579-return-not-found-query-policy Normal file
View File

@ -0,0 +1 @@
* Properly return not found for queries and policies

4
server/datastore/mysql/policies.go
View File

@ -2,6 +2,7 @@ package mysql
import (
"context"
"database/sql"
"fmt"
"sort"
"strings"
@ -67,6 +68,9 @@ func policyDB(ctx context.Context, q sqlx.QueryerContext, id uint, teamID *uint)
WHERE p.id=? AND %s`, teamWhere),
args...)
if err != nil {
if err == sql.ErrNoRows {
return nil, ctxerr.Wrap(ctx, notFound("Policy").WithID(id))
}
return nil, ctxerr.Wrap(ctx, err, "getting policy")
}
return &policy, nil

7
server/datastore/mysql/queries.go
View File

@ -149,7 +149,7 @@ func (d *Datastore) DeleteQueries(ctx context.Context, ids []uint) (uint, error)
// Query returns a single Query identified by id, if such exists.
func (d *Datastore) Query(ctx context.Context, id uint) (*fleet.Query, error) {
sql := `
sqlQuery := `
SELECT q.*, COALESCE(NULLIF(u.name, ''), u.email, '') AS author_name, COALESCE(u.email, '') AS author_email
FROM queries q
LEFT JOIN users u
@ -157,7 +157,10 @@ func (d *Datastore) Query(ctx context.Context, id uint) (*fleet.Query, error) {
WHERE q.id = ?
`
query := &fleet.Query{}
if err := sqlx.GetContext(ctx, d.reader, query, sql, id); err != nil {
if err := sqlx.GetContext(ctx, d.reader, query, sqlQuery, id); err != nil {
if err == sql.ErrNoRows {
return nil, ctxerr.Wrap(ctx, notFound("Query").WithID(id))
}
return nil, ctxerr.Wrap(ctx, err, "selecting query")
}

8
server/service/integration_core_test.go
View File

@ -455,6 +455,9 @@ func (s *integrationTestSuite) TestGlobalPolicies() {
assert.Equal(t, qr.Query, policiesResponse.Policies[0].Query)
assert.Equal(t, qr.Description, policiesResponse.Policies[0].Description)
// Get an unexistent policy
s.Do("GET", fmt.Sprintf("/api/v1/fleet/global/policies/%d", 9999), nil, http.StatusNotFound)
singlePolicyResponse := getPolicyByIDResponse{}
singlePolicyURL := fmt.Sprintf("/api/v1/fleet/global/policies/%d", policiesResponse.Policies[0].ID)
s.DoJSON("GET", singlePolicyURL, nil, http.StatusOK, &singlePolicyResponse)
@ -1476,6 +1479,9 @@ func (s *integrationTestSuite) TestScheduledQueries() {
s.DoJSON("POST", "/api/v1/fleet/packs", reqPack, http.StatusOK, &createPackResp)
pack := createPackResp.Pack.Pack
// try a non existent query
s.Do("GET", fmt.Sprintf("/api/v1/fleet/queries/%d", 9999), nil, http.StatusNotFound)
// create a query
var createQueryResp createQueryResponse
reqQuery := &fleet.QueryPayload{
@ -1520,7 +1526,7 @@ func (s *integrationTestSuite) TestScheduledQueries() {
QueryID: query.ID + 1,
Interval: 3,
}
s.DoJSON("POST", "/api/v1/fleet/schedule", reqSQ, http.StatusInternalServerError, &createResp)
s.DoJSON("POST", "/api/v1/fleet/schedule", reqSQ, http.StatusNotFound, &createResp)
// list scheduled queries in pack
s.DoJSON("GET", fmt.Sprintf("/api/v1/fleet/packs/%d/scheduled", pack.ID), nil, http.StatusOK, &getInPackResp)

3
server/service/integration_live_queries_test.go
View File

@ -318,8 +318,7 @@ func (s *liveQueriesTestSuite) TestLiveQueriesRestFailsToCreateCampaign() {
require.Len(t, liveQueryResp.Results, 1)
assert.Equal(t, 0, liveQueryResp.Summary.RespondedHostCount)
require.NotNil(t, liveQueryResp.Results[0].Error)
assert.Contains(t, *liveQueryResp.Results[0].Error, "selecting query: ")
assert.Contains(t, *liveQueryResp.Results[0].Error, "sql: no rows in result set")
assert.Contains(t, *liveQueryResp.Results[0].Error, "Query 999 was not found in the datastore")
}
func (s *liveQueriesTestSuite) TestLiveQueriesRestFailsOnSomeHost() {