Skip to content

[v13] athena audit logs - always pass utc to query #26821

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

Merged
tobiaszheller merged 1 commit into from
May 24, 2023
Merged

[v13] athena audit logs - always pass utc to query #26821

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lib/events/athena/athena.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,11 @@ func (l *Log) EmitAuditEvent(ctx context.Context, in apievents.AuditEvent) error
}

func (l *Log) SearchEvents(ctx context.Context, req events.SearchEventsRequest) ([]apievents.AuditEvent, string, error) {
return l.querier.SearchEvents(ctx, req.From, req.To, req.EventTypes, req.Limit, req.Order, req.StartKey)
return l.querier.SearchEvents(ctx, req)
}

func (l *Log) SearchSessionEvents(ctx context.Context, req events.SearchSessionEventsRequest) ([]apievents.AuditEvent, string, error) {
return l.querier.SearchSessionEvents(ctx, req.From, req.To, req.Limit, req.Order, req.StartKey, req.Cond, req.SessionID)
return l.querier.SearchSessionEvents(ctx, req)
}

func (l *Log) Close() error {
Expand Down
36 changes: 16 additions & 20 deletions lib/events/athena/querier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,43 +113,39 @@ func newQuerier(cfg querierConfig) (*querier, error) {
}, nil
}

func (q *querier) SearchEvents(ctx context.Context, fromUTC, toUTC time.Time,
eventTypes []string, limit int, order types.EventOrder, startKey string,
) ([]apievents.AuditEvent, string, error) {
filter := searchEventsFilter{eventTypes: eventTypes}
func (q *querier) SearchEvents(ctx context.Context, req events.SearchEventsRequest) ([]apievents.AuditEvent, string, error) {
filter := searchEventsFilter{eventTypes: req.EventTypes}
events, keyset, err := q.searchEvents(ctx, searchEventsRequest{
fromUTC: fromUTC,
toUTC: toUTC,
limit: limit,
order: order,
startKey: startKey,
fromUTC: req.From.UTC(),
toUTC: req.To.UTC(),
limit: req.Limit,
order: req.Order,
startKey: req.StartKey,
filter: filter,
sessionID: "",
})
return events, keyset, trace.Wrap(err)
}

func (q *querier) SearchSessionEvents(ctx context.Context, fromUTC, toUTC time.Time, limit int,
order types.EventOrder, startKey string, cond *types.WhereExpr, sessionID string,
) ([]apievents.AuditEvent, string, error) {
func (q *querier) SearchSessionEvents(ctx context.Context, req events.SearchSessionEventsRequest) ([]apievents.AuditEvent, string, error) {
// TODO(tobiaszheller): maybe if fromUTC is 0000-00-00, ask first last 30days and fallback to -inf - now-30
// for sessionID != "". This kind of call is done on RBAC to check if user can access that session.
filter := searchEventsFilter{eventTypes: []string{events.SessionEndEvent, events.WindowsDesktopSessionEndEvent}}
if cond != nil {
condFn, err := utils.ToFieldsCondition(cond)
if req.Cond != nil {
condFn, err := utils.ToFieldsCondition(req.Cond)
if err != nil {
return nil, "", trace.Wrap(err)
}
filter.condition = condFn
}
events, keyset, err := q.searchEvents(ctx, searchEventsRequest{
fromUTC: fromUTC,
toUTC: toUTC,
limit: limit,
order: order,
startKey: startKey,
fromUTC: req.From.UTC(),
toUTC: req.To.UTC(),
limit: req.Limit,
order: req.Order,
startKey: req.StartKey,
filter: filter,
sessionID: sessionID,
sessionID: req.SessionID,
})
return events, keyset, trace.Wrap(err)
}
Expand Down