Skip to content

Commit

Permalink
Revert "better audit log naming"
Browse files Browse the repository at this point in the history 
This reverts commit 5755dbb.
  • Loading branch information
@kunga
kunga committed Jan 29, 2025
1 parent 501eaf8 commit 44ecfe3
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
22 changes: 11 additions & 11 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_login.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class TAlterLogin: public TSubOperationBase {
const NKikimrConfig::TDomainsConfig::TSecurityConfig& securityConfig = context.SS->GetDomainsConfig().GetSecurityConfig();
const NKikimrSchemeOp::TAlterLogin& alterLogin = Transaction.GetAlterLogin();

TAuditLogParts auditLogParts;
TParts additionalParts;

switch (alterLogin.GetAlterCase()) {
case NKikimrSchemeOp::TAlterLogin::kCreateUser: {
Expand Down Expand Up @@ -60,7 +60,7 @@ class TAlterLogin: public TSubOperationBase {
}
result->SetStatus(NKikimrScheme::StatusSuccess);

AddAuditLogIsUserAdminPart(createUser.GetUser(), context.SS->LoginProvider, auditLogParts);
AddIsUserAdmin(createUser.GetUser(), context.SS->LoginProvider, additionalParts);
}
break;
}
Expand Down Expand Up @@ -89,8 +89,8 @@ class TAlterLogin: public TSubOperationBase {
Schema::LoginSids::IsEnabled>(sid.Type, sid.PasswordHash, sid.IsEnabled);
result->SetStatus(NKikimrScheme::StatusSuccess);

AddAuditLogIsUserAdminPart(modifyUser.GetUser(), context.SS->LoginProvider, auditLogParts);
AddAuditLogLastSuccessfulLoginPart(sid, auditLogParts);
AddIsUserAdmin(modifyUser.GetUser(), context.SS->LoginProvider, additionalParts);
AddLastSuccessfulLogin(sid, additionalParts);
}
break;
}
Expand All @@ -99,7 +99,7 @@ class TAlterLogin: public TSubOperationBase {

auto sid = context.SS->LoginProvider.Sids.find(removeUser.GetUser());
if (context.SS->LoginProvider.Sids.end() != sid) {
AddAuditLogLastSuccessfulLoginPart(sid->second, auditLogParts);
AddLastSuccessfulLogin(sid->second, additionalParts);
}

auto response = RemoveUser(context, removeUser, db);
Expand All @@ -108,7 +108,7 @@ class TAlterLogin: public TSubOperationBase {
} else {
result->SetStatus(NKikimrScheme::StatusSuccess);

AddAuditLogIsUserAdminPart(removeUser.GetUser(), context.SS->LoginProvider, auditLogParts);
AddIsUserAdmin(removeUser.GetUser(), context.SS->LoginProvider, additionalParts);
}
break;
}
Expand Down Expand Up @@ -203,7 +203,7 @@ class TAlterLogin: public TSubOperationBase {
}
const auto status = result->Record.GetStatus();
const auto reason = result->Record.HasReason() ? result->Record.GetReason() : TString();
AuditLogModifySchemeOperation(Transaction, status, reason, context.SS, context.PeerName, userSID, sanitizedToken, ui64(txId), auditLogParts);
AuditLogModifySchemeOperation(Transaction, status, reason, context.SS, context.PeerName, userSID, sanitizedToken, ui64(txId), additionalParts);
}

if (result->Record.GetStatus() == NKikimrScheme::StatusSuccess) {
Expand Down Expand Up @@ -305,7 +305,7 @@ class TAlterLogin: public TSubOperationBase {
return {}; // success
}

void AddAuditLogIsUserAdminPart(const TString& user, NLogin::TLoginProvider& loginProvider, TAuditLogParts& auditLogParts) {
void AddIsUserAdmin(const TString& user, NLogin::TLoginProvider& loginProvider, TParts& additionalParts) {
const auto& adminSids = AppData()->AdministrationAllowedSIDs;
bool isAdmin = adminSids.empty();
if (!isAdmin) {
Expand All @@ -319,15 +319,15 @@ class TAlterLogin: public TSubOperationBase {
}

if (isAdmin) {
auditLogParts.emplace_back("login_user_level", "admin");
additionalParts.emplace_back("login_user_level", "admin");
}
}

void AddAuditLogLastSuccessfulLoginPart(NLogin::TLoginProvider::TSidRecord& sid, TAuditLogParts& auditLogParts) {
void AddLastSuccessfulLogin(NLogin::TLoginProvider::TSidRecord& sid, TParts& additionalParts) {
const auto duration = sid.LastSuccessfulLogin.time_since_epoch();
const auto time = std::chrono::duration_cast<std::chrono::microseconds>(duration).count();
if (time) {
auditLogParts.emplace_back("last_login", TInstant::MicroSeconds(time).ToString());
additionalParts.emplace_back("last_login", TInstant::MicroSeconds(time).ToString());
}
}
};
Expand Down
10 changes: 5 additions & 5 deletions ydb/core/tx/schemeshard/schemeshard_audit_log.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ TPath DatabasePathFromWorkingDir(TSchemeShard* SS, const TString &opWorkingDir)
void AuditLogModifySchemeOperation(const NKikimrSchemeOp::TModifyScheme& operation,
NKikimrScheme::EStatus status, const TString& reason, TSchemeShard* SS,
const TString& peerName, const TString& userSID, const TString& sanitizedToken,
ui64 txId, const TAuditLogParts& additionalParts) {
ui64 txId, const TParts& additionalParts) {
auto logEntry = MakeAuditLogFragment(operation);

TPath databasePath = DatabasePathFromWorkingDir(SS, operation.GetWorkingDir());
Expand Down Expand Up @@ -151,7 +151,7 @@ void AuditLogModifySchemeTransaction(const NKikimrScheme::TEvModifySchemeTransac
if (NKikimrSchemeOp::EOperationType::ESchemeOpAlterLogin == type) {
continue;
}
AuditLogModifySchemeOperation(operation, status, reason, SS, peerName, userSID, sanitizedToken, txId, TAuditLogParts());
AuditLogModifySchemeOperation(operation, status, reason, SS, peerName, userSID, sanitizedToken, txId, TParts());
}
}

Expand Down Expand Up @@ -214,7 +214,7 @@ struct TXxportRecord {
TString Status;
Ydb::StatusIds::StatusCode DetailedStatus;
TString Reason;
TAuditLogParts AdditionalParts;
TParts AdditionalParts;
TString StartTime;
TString EndTime;
TString CloudId;
Expand Down Expand Up @@ -309,7 +309,7 @@ template <> TParts ImportKindSpecificParts(const Ydb::Import::ImportFromS3Settin
} // anonymous namespace

template <class Request, class Response>
void _AuditLogXxportStart(const Request& request, const Response& response, const TString& operationName, TAuditLogParts&& additionalParts, TSchemeShard* SS) {
void _AuditLogXxportStart(const Request& request, const Response& response, const TString& operationName, TParts&& additionalParts, TSchemeShard* SS) {
TPath databasePath = DatabasePathFromWorkingDir(SS, request.GetDatabaseName());
auto [cloud_id, folder_id, database_id] = GetDatabaseCloudIds(databasePath);
auto peerName = NKikimr::NAddressClassifier::ExtractAddress(request.GetPeerName());
Expand Down Expand Up @@ -348,7 +348,7 @@ void AuditLogImportStart(const NKikimrImport::TEvCreateImportRequest& request, c
}

template <class Info>
void _AuditLogXxportEnd(const Info& info, const TString& operationName, TAuditLogParts&& additionalParts, TSchemeShard* SS) {
void _AuditLogXxportEnd(const Info& info, const TString& operationName, TParts&& additionalParts, TSchemeShard* SS) {
const TPath databasePath = TPath::Init(info.DomainPathId, SS);
auto [cloud_id, folder_id, database_id] = GetDatabaseCloudIds(databasePath);
auto peerName = NKikimr::NAddressClassifier::ExtractAddress(info.PeerName);
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard_audit_log.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ class TSchemeShard;
struct TExportInfo;
struct TImportInfo;

using TAuditLogParts = TVector<std::pair<TString, TString>>;
using TParts = TVector<std::pair<TString, TString>>;

void AuditLogModifySchemeOperation(const NKikimrSchemeOp::TModifyScheme& operation,
NKikimrScheme::EStatus status, const TString& reason, TSchemeShard* SS,
const TString& peerName, const TString& userSID, const TString& sanitizedToken,
ui64 txId, const TAuditLogParts& additionalParts);
ui64 txId, const TParts& additionalParts);

void AuditLogModifySchemeTransaction(const NKikimrScheme::TEvModifySchemeTransaction& request,
const NKikimrScheme::TEvModifySchemeTransactionResult& response, TSchemeShard* SS,
Expand Down

0 comments on commit 44ecfe3

Please sign in to comment.