Skip to content

hotfix for healthcheck access rights check #28581

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 12, 2025
Merged

hotfix for healthcheck access rights check #28581

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
3 changes: 1 addition & 2 deletions ydb/core/viewer/viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ class TViewer : public TActorBootstrapped<TViewer>, public IViewer {
.RelPath = "healthcheck",
.ActorSystem = ctx.ActorSystem(),
.ActorId = ctx.SelfID,
.UseAuth = true,
.AllowedSIDs = databaseAllowedSIDs,
.UseAuth = false, // auth is checked inside handler
});
mon->RegisterActorPage({
.RelPath = "vdisk",
Expand Down
56 changes: 25 additions & 31 deletions ydb/core/viewer/viewer_healthcheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ enum HealthCheckResponseFormat {
class TJsonHealthCheck : public TViewerPipeClient {
using TThis = TJsonHealthCheck;
using TBase = TViewerPipeClient;
static const bool WithRetry = false;
TJsonSettings JsonSettings;
ui32 Timeout = 0;
HealthCheckResponseFormat Format;
TString Database;
bool Cache = true;
Expand Down Expand Up @@ -55,7 +52,7 @@ class TJsonHealthCheck : public TViewerPipeClient {
if (params.Has("return_hints")) {
request->Request.set_return_hints(FromStringWithDefault<bool>(params.Get("return_hints"), false));
}
SetDuration(TDuration::MilliSeconds(Timeout), *request->Request.mutable_operation_params()->mutable_operation_timeout());
SetDuration(Timeout, *request->Request.mutable_operation_params()->mutable_operation_timeout());
return request;
}

Expand All @@ -67,48 +64,47 @@ class TJsonHealthCheck : public TViewerPipeClient {
if (NeedToRedirect()) {
return;
}
const auto& params(Event->Get()->Request.GetParams());
Format = HealthCheckResponseFormat::JSON;
if (params.Has("format")) {
auto& format = params.Get("format");
if (Params.Has("format")) {
auto& format = Params.Get("format");
if (format == "json") {
Format = HealthCheckResponseFormat::JSON;
} else if (format == "prometheus") {
Format = HealthCheckResponseFormat::PROMETHEUS;
}
} else if (const auto *header = Event->Get()->Request.GetHeaders().FindHeader("Accept")) {
THashSet<TString> accept;
StringSplitter(header->Value()).SplitBySet(", ").SkipEmpty().Collect(&accept);
if (accept.contains("*/*") || accept.contains("application/json")) {
Format = HealthCheckResponseFormat::JSON;
} else if (accept.contains("text/plain")) {
Format = HealthCheckResponseFormat::PROMETHEUS;
} else {
Format = HealthCheckResponseFormat::JSON;
} else if (GetRequest().HasHeader("Accept")) {
std::vector<TString> accept;
StringSplitter(GetRequest().GetHeader("Accept")).SplitBySet(", ").SkipEmpty().Collect(&accept);
for (const auto& a : accept) {
if (a == "application/json") {
Format = HealthCheckResponseFormat::JSON;
break;
} else if (a == "text/plain") {
Format = HealthCheckResponseFormat::PROMETHEUS;
break;
}
}
}
if (Format == HealthCheckResponseFormat::JSON) {
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
}
Database = params.Get("database");
Database = Params.Get("database");
if (Database.empty()) {
Database = params.Get("tenant");
Database = Params.Get("tenant");
}
if (!IsDatabaseRequest() && Format != HealthCheckResponseFormat::PROMETHEUS && !Viewer->CheckAccessMonitoring(GetRequest())) {
return TBase::ReplyAndPassAway(GetHTTPFORBIDDEN("text/plain", "Access denied"));
}
Cache = FromStringWithDefault<bool>(params.Get("cache"), Cache);
MergeRecords = FromStringWithDefault<bool>(params.Get("merge_records"), MergeRecords);
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
Cache = FromStringWithDefault<bool>(Params.Get("cache"), Cache);
MergeRecords = FromStringWithDefault<bool>(Params.Get("merge_records"), MergeRecords);

if (params.Get("min_status") && !Ydb::Monitoring::StatusFlag_Status_Parse(params.Get("min_status"), &MinStatus)) {
if (Params.Get("min_status") && !Ydb::Monitoring::StatusFlag_Status_Parse(Params.Get("min_status"), &MinStatus)) {
return TBase::ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "The field 'min_status' cannot be parsed"));
}
if (AppData()->FeatureFlags.GetEnableDbMetadataCache() && Cache && Database && MergeRecords) {
MetadataCacheEndpointsLookup = MakeRequestStateStorageMetadataCacheEndpointsLookup(Database);
} else {
SendHealthCheckRequest();
}
Timeout += Timeout * 20 / 100; // we prefer to wait for more (+20%) verbose timeout status from HC
Become(&TThis::StateRequestedInfo, TDuration::MilliSeconds(Timeout), new TEvents::TEvWakeup());
Timeout += TDuration::MilliSeconds(Timeout.MilliSeconds() * 20 / 100); // we prefer to wait for more (+20%) verbose timeout status from HC
Become(&TThis::StateRequestedInfo, Timeout, new TEvents::TEvWakeup());
}

STFUNC(StateRequestedInfo) {
Expand Down Expand Up @@ -202,9 +198,7 @@ class TJsonHealthCheck : public TViewerPipeClient {
if (Format == HealthCheckResponseFormat::PROMETHEUS) {
return HandlePrometheus();
} else {
TStringStream json;
TProtoToJson::ProtoToJson(json, *Result, JsonSettings);
return TBase::ReplyAndPassAway(GetHTTPOKJSON(json.Str()));
return TBase::ReplyAndPassAway(GetHTTPOKJSON(*Result));
}
}
}
Expand Down
Loading