Skip to content

Commit 1814069

Browse files
committed
MB-56674: Disabled audit filter incorrectly create audit events
The disabled audit filter would incorrectly mark all internal events as subject for auditing and cause it to generate a JSON object for them including a timestamp before discarding the object Change-Id: I6fff1429582fb4b796604cc76827ac2356c58aee Reviewed-on: https://review.couchbase.org/c/kv_engine/+/190172 Reviewed-by: Dave Rigby <[email protected]> Tested-by: Build Bot <[email protected]>
1 parent d90ba56 commit 1814069

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

auditd/src/audit_event_filter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class DisabledEventFilter : public AuditEventFilter {
312312
std::optional<std::string_view> bucket,
313313
std::optional<ScopeID> scope,
314314
std::optional<CollectionID> collection) const override {
315-
return false;
315+
return true;
316316
}
317317

318318
protected:

auditd/tests/audit_event_filter_test.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,9 @@ TEST(AuditEventFilterTest, isFilteredOut) {
130130
{},
131131
{}));
132132
}
133+
134+
TEST(AuditEventFilterTest, isFilteredOut_DisabledFilter) {
135+
auto filter = AuditEventFilter::create(AuditImpl::generation.load(), {});
136+
EXPECT_TRUE(filter->isFilteredOut(
137+
MEMCACHED_AUDIT_DOCUMENT_READ, {}, {}, {}, {}, {}));
138+
}

0 commit comments

Comments
 (0)