Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions ydb/core/mon/audit/audit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ namespace {
}
}

bool TAuditCtx::AuditEnabled(NKikimrConfig::TAuditConfig::TLogClassConfig::ELogPhase logPhase, NACLibProto::ESubjectType subjectType)
{
if (NKikimr::HasAppData()) {
return NKikimr::AppData()->AuditConfig.EnableLogging(NKikimrConfig::TAuditConfig::TLogClassConfig::ClusterAdmin,
logPhase, subjectType);
}
return false;
}


void TAuditCtx::AddAuditLogPart(TStringBuf name, const TString& value) {
Parts.emplace_back(name, value);
}
Expand Down Expand Up @@ -151,9 +161,7 @@ void TAuditCtx::SetSubjectType(NACLibProto::ESubjectType subjectType) {
}

void TAuditCtx::LogAudit(ERequestStatus status, const TString& reason, NKikimrConfig::TAuditConfig::TLogClassConfig::ELogPhase logPhase) {
auto auditEnabled = NKikimr::AppData()->AuditConfig.EnableLogging(NKikimrConfig::TAuditConfig::TLogClassConfig::ClusterAdmin, logPhase, SubjectType);

if (!Auditable || !auditEnabled) {
if (!Auditable || !AuditEnabled(logPhase, SubjectType)) {
return;
}

Expand Down
1 change: 1 addition & 0 deletions ydb/core/mon/audit/audit.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class TAuditCtx {
void LogOnReceived();
void LogOnCompleted(const NHttp::THttpOutgoingResponsePtr& response);
void SetSubjectType(NACLibProto::ESubjectType subjectType);
static bool AuditEnabled(NKikimrConfig::TAuditConfig::TLogClassConfig::ELogPhase logPhase, NACLibProto::ESubjectType subjectType);

private:
void AddAuditLogPart(TStringBuf name, const TString& value);
Expand Down
12 changes: 12 additions & 0 deletions ydb/core/mon/audit/audit_ut.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#include <ydb/core/mon/audit/audit.h>

#include <library/cpp/testing/unittest/registar.h>
#include <library/cpp/testing/unittest/tests_data.h>

using namespace NMonitoring::NAudit;

Y_UNIT_TEST_SUITE(TAuditTest) {
Y_UNIT_TEST(AuditDisabledWithoutAppData) {
UNIT_ASSERT(!TAuditCtx::AuditEnabled(NKikimrConfig::TAuditConfig::TLogClassConfig::Completed, NACLibProto::SUBJECT_TYPE_ANONYMOUS));
}
}
1 change: 1 addition & 0 deletions ydb/core/mon/audit/ut/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ PEERDIR(
)

SRCS(
audit_ut.cpp
url_matcher_ut.cpp
)

Expand Down
Loading