Skip to content

[sql-40] firewalldb: action store prep commits #1078

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
merged 4 commits into from
May 29, 2025
Merged

[sql-40] firewalldb: action store prep commits #1078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fea538
firewalldb: fix missing `ctx` param in actions test
ellemouton May 22, 2025
b99a4f8
firewall+firewalldb: move mac ID serialisation to kvdb impl
ellemouton May 27, 2025
e40328c
firewalldb: let test times have intuitive order
ellemouton May 27, 2025
ed96f93
firewalldb: fix BBolt ListGroupActions when Reversed is set
ellemouton May 27, 2025
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
25 changes: 20 additions & 5 deletions firewalldb/actions_kvdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,13 @@ func (db *BoltDB) ListActions(ctx context.Context, query *ListActionsQuery,
)
}
if opts.groupID != session.EmptyID {
actions, err := db.listGroupActions(ctx, opts.groupID, filterFn)
var reversed bool
if query != nil {
reversed = query.Reversed
}
actions, err := db.listGroupActions(
ctx, opts.groupID, filterFn, reversed,
)
if err != nil {
return nil, 0, 0, err
}
Expand Down Expand Up @@ -439,11 +445,11 @@ func (db *BoltDB) listSessionActions(sessionID session.ID,
//
// TODO: update to allow for pagination.
func (db *BoltDB) listGroupActions(ctx context.Context, groupID session.ID,
filterFn listActionsFilterFn) ([]*Action, error) {
filterFn listActionsFilterFn, reversed bool) ([]*Action, error) {

if filterFn == nil {
filterFn = func(a *Action, reversed bool) (bool, bool) {
return true, true
return true, reversed
}
}

Expand Down Expand Up @@ -482,9 +488,18 @@ func (db *BoltDB) listGroupActions(ctx context.Context, groupID session.ID,
return err
}

include, cont := filterFn(action, false)
include, cont := filterFn(action, reversed)
if include {
actions = append(actions, action)
if !reversed {
actions = append(
actions, action,
)
} else {
actions = append(
[]*Action{action},
actions...,
)
}
}

if !cont {
Expand Down
12 changes: 11 additions & 1 deletion firewalldb/actions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,12 +497,22 @@ func TestListGroupActions(t *testing.T) {
_, err = db.AddAction(ctx, action2Req)
require.NoError(t, err)

// There should now be actions in the group.
// There should now be two actions in the group.
al, _, _, err = db.ListActions(ctx, nil, WithActionGroupID(group1))
require.NoError(t, err)
require.Len(t, al, 2)
assertEqualActions(t, action1, al[0])
assertEqualActions(t, action2, al[1])

// Try the reversed query too.
al, _, _, err = db.ListActions(
ctx, &ListActionsQuery{Reversed: true},
WithActionGroupID(group1),
)
require.NoError(t, err)
require.Len(t, al, 2)
assertEqualActions(t, action2, al[0])
assertEqualActions(t, action1, al[1])
}

func assertEqualActions(t *testing.T, expected, got *Action) {
Expand Down
Loading