Skip to content

Guard against missing name/query keys in scheduled query results #2691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
directionless wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard against missing name/query keys in scheduled query results #2691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions ee/localserver/request-query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,28 @@ func (ls *localServer) requestScheduledQueryHandlerFunc(w http.ResponseWriter, r
results := make([]distributed.Result, len(scheduledQueriesQueryResults))

for i, scheduledQuery := range scheduledQueriesQueryResults {
name, nameOk := scheduledQuery["name"]
query, queryOk := scheduledQuery["query"]
if !nameOk || name == "" || !queryOk || query == "" {
ls.slogger.Log(r.Context(), slog.LevelError,
"scheduled query result missing name or query field",
"query_name", name,
)
results[i].Status = 1

@RebeccaMahany RebeccaMahany Apr 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a const we can use for this? Maybe osquery-go's ExtensionCode_EXT_FAILED?

continue
}

results[i] = distributed.Result{
QueryName: scheduledQuery["name"],
QueryName: name,
}

scheduledQueryResult, err := queryWithRetries(ls.querier, scheduledQuery["query"])
scheduledQueryResult, err := queryWithRetries(ls.querier, query)
if err != nil {
ls.slogger.Log(r.Context(), slog.LevelError,
"running scheduled query on demand",
"err", err,
"query", scheduledQuery["query"],
"query_name", scheduledQuery["name"],
"query", query,
"query_name", name,
)

results[i].Status = 1
Expand Down
Loading