Skip to content

ticket-parser: Add error message for log to TError struct of ticket parser #11403

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 1 commit into from
Nov 8, 2024
Merged

ticket-parser: Add error message for log to TError struct of ticket parser #11403

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
12 changes: 11 additions & 1 deletion ydb/core/base/ticket_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,24 @@ namespace NKikimr {

struct TError {
TString Message;
TString LogMessage;
bool Retryable = true;

bool empty() const {
return Message.empty();
return Message.empty() && LogMessage.empty();
}

bool HasMessage() const {
return !Message.empty();
}

bool HasLogMessage() const {
return !LogMessage.empty();
}

void clear() {
Message.clear();
LogMessage.clear();
Retryable = true;
}

Expand Down
6 changes: 3 additions & 3 deletions ydb/core/security/secure_request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class TSecureRequestActor : public TBase {
if (!GetAdministrationAllowedSIDs().empty()) {
const auto& allowedSIDs(GetAdministrationAllowedSIDs());
if (std::find_if(allowedSIDs.begin(), allowedSIDs.end(), [&result](const TString& sid) -> bool { return result.Token->IsExist(sid); }) == allowedSIDs.end()) {
return static_cast<TDerived*>(this)->OnAccessDenied(TEvTicketParser::TError{"Administrative access denied", false}, ctx);
return static_cast<TDerived*>(this)->OnAccessDenied(TEvTicketParser::TError{.Message = "Administrative access denied", .Retryable = false}, ctx);
}
}
UserAdmin = true;
Expand All @@ -59,7 +59,7 @@ class TSecureRequestActor : public TBase {

void Handle(TEvents::TEvUndelivered::TPtr&, const TActorContext& ctx) {
if (IsTokenRequired()) {
return static_cast<TDerived*>(this)->OnAccessDenied(TEvTicketParser::TError{"Access denied - error parsing token", false}, ctx);
return static_cast<TDerived*>(this)->OnAccessDenied(TEvTicketParser::TError{.Message = "Access denied - error parsing token", .Retryable = false}, ctx);
}
static_cast<TBootstrap*>(this)->Bootstrap(ctx);
}
Expand Down Expand Up @@ -166,7 +166,7 @@ class TSecureRequestActor : public TBase {

void Bootstrap(const TActorContext& ctx) {
if (IsTokenRequired() && !IsTokenExists()) {
return static_cast<TDerived*>(this)->OnAccessDenied(TEvTicketParser::TError{"Access denied without user token", false}, ctx);
return static_cast<TDerived*>(this)->OnAccessDenied(TEvTicketParser::TError{.Message = "Access denied without user token", .Retryable = false}, ctx);
}
if (SecurityToken.empty()) {
if (!GetDefaultUserSIDs().empty()) {
Expand Down
16 changes: 8 additions & 8 deletions ydb/core/security/ticket_parser_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,14 +649,14 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {

if (record.Ticket.EndsWith("@" BUILTIN_ERROR_DOMAIN)) {
record.TokenType = TDerived::ETokenType::Builtin;
SetError(key, record, { "Builtin error simulation" });
SetError(key, record, { .Message = "Builtin error simulation" });
CounterTicketsBuiltin->Inc();
return true;
}

if (record.Ticket.EndsWith("@" BUILTIN_SYSTEM_DOMAIN)) {
record.TokenType = TDerived::ETokenType::Builtin;
SetError(key, record, { "System domain not available for user usage", false });
SetError(key, record, { .Message = "System domain not available for user usage", .Retryable = false });
CounterTicketsBuiltin->Inc();
return true;
}
Expand Down Expand Up @@ -977,12 +977,12 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {
.AuthType = record.GetAuthType()
}));
} else {
SetError(key, record, {errorMessage, false});
SetError(key, record, {.Message = errorMessage, .Retryable = false});
}
} else {
if (record.ResponsesLeft == 0 && (record.TokenType == TDerived::ETokenType::Unknown || record.TokenType == TDerived::ETokenType::AccessService || record.TokenType == TDerived::ETokenType::ApiKey)) {
bool retryable = IsRetryableGrpcError(response->Status);
SetError(key, record, {response->Status.Msg, retryable});
SetError(key, record, {.Message = response->Status.Msg, .Retryable = retryable});
}
}
if (record.ResponsesLeft == 0) {
Expand Down Expand Up @@ -1011,7 +1011,7 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {
auto& record = it->second;
record.ResponsesLeft--;
if (!ev->Get()->Status.Ok()) {
SetError(key, record, {ev->Get()->Status.Msg});
SetError(key, record, {.Message = ev->Get()->Status.Msg});
} else {
GetDerived()->SetToken(key, record, ev);
}
Expand All @@ -1033,7 +1033,7 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {
auto& record = it->second;
record.ResponsesLeft--;
if (!ev->Get()->Status.Ok()) {
SetError(key, record, {ev->Get()->Status.Msg});
SetError(key, record, {.Message = ev->Get()->Status.Msg});
} else {
SetToken(key, record, new NACLib::TUserToken(record.Ticket, ev->Get()->Response.name() + "@" + ServiceDomain, {}));
}
Expand Down Expand Up @@ -1322,7 +1322,7 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {
}
} else {
bool retryable = IsRetryableGrpcError(response->Status);
itPermission->second.Error = {response->Status.Msg, retryable};
itPermission->second.Error = {.Message = response->Status.Msg, .Retryable = retryable};
if (itPermission->second.Subject.empty() || !retryable) {
itPermission->second.Subject.clear();
BLOG_TRACE("Ticket "
Expand Down Expand Up @@ -1433,7 +1433,7 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {
} else {
BLOG_D("Expired ticket " << record.GetMaskedTicket());
if (!record.AuthorizeRequests.empty()) {
record.Error = {"Timed out", true};
record.Error = {.Message = "Timed out", .Retryable = true};
Respond(record);
}
userTokens.erase(it);
Expand Down
Loading