Skip to content

changes for certification #14878

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
adameat merged 1 commit into from
Feb 21, 2025
Merged

changes for certification #14878

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
6 changes: 6 additions & 0 deletions ydb/core/viewer/viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ class TViewer : public TActorBootstrapped<TViewer>, public IViewer {
.UseAuth = true,
.AllowedSIDs = viewerAllowedSIDs,
});
mon->RegisterActorPage({
.RelPath = "viewer/capabilities",
.ActorSystem = ctx.ActorSystem(),
.ActorId = ctx.SelfID,
.UseAuth = false,
});
mon->RegisterActorPage({
.Title = "Viewer",
.RelPath = "viewer/v2",
Expand Down
10 changes: 10 additions & 0 deletions ydb/core/viewer/viewer_capabilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ class TViewerCapabilities : public TViewerPipeClient {
ReplyAndPassAway();
}

NJson::TJsonValue GetSettings() {
NJson::TJsonValue json;
NJson::TJsonValue& security(json["Security"]);
security["IsTokenRequired"] = AppData()->EnforceUserTokenRequirement;
security["UseLoginProvider"] = AppData()->AuthConfig.GetUseLoginProvider();
security["DomainLoginOnly"] = AppData()->AuthConfig.GetDomainLoginOnly();
return json;
}

void ReplyAndPassAway() override {
NJson::TJsonValue json;
json["Capabilities"] = Viewer->GetCapabilities();
json["Settings"] = GetSettings();
TBase::ReplyAndPassAway(GetHTTPOKJSON(json));
}
};
Expand Down
28 changes: 12 additions & 16 deletions ydb/core/viewer/viewer_whoami.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once
#include "json_handlers.h"
#include "json_pipe_req.h"
#include "viewer.h"
#include <ydb/core/base/appdata_fwd.h>
#include <ydb/core/base/auth.h>
Expand All @@ -12,25 +13,25 @@ namespace NKikimr::NViewer {

using namespace NActors;

class TJsonWhoAmI : public TActorBootstrapped<TJsonWhoAmI> {
IViewer* Viewer;
NMon::TEvHttpInfo::TPtr Event;

class TJsonWhoAmI : public TViewerPipeClient {
using TBase = TViewerPipeClient;
public:
static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
return NKikimrServices::TActivity::VIEWER_HANDLER;
}

TJsonWhoAmI(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
: Viewer(viewer)
, Event(ev)
: TViewerPipeClient(viewer, ev)
{}

void Bootstrap(const TActorContext& ctx) {
ReplyAndDie(ctx);
void Bootstrap() {
if (NeedToRedirect()) {
return;
}
ReplyAndPassAway();
}

void ReplyAndDie(const TActorContext &ctx) {
void ReplyAndPassAway() {
NACLibProto::TUserToken userToken;
Y_PROTOBUF_SUPPRESS_NODISCARD userToken.ParseFromString(Event->Get()->UserToken);
NJson::TJsonValue json(NJson::JSON_MAP);
Expand All @@ -54,16 +55,11 @@ class TJsonWhoAmI : public TActorBootstrapped<TJsonWhoAmI> {
}

NACLib::TUserToken token(std::move(userToken));
json["IsTokenRequired"] = AppData()->EnforceUserTokenRequirement;
json["IsViewerAllowed"] = IsTokenAllowed(&token, AppData()->DomainsConfig.GetSecurityConfig().GetViewerAllowedSIDs());
json["IsMonitoringAllowed"] = IsTokenAllowed(&token, AppData()->DomainsConfig.GetSecurityConfig().GetMonitoringAllowedSIDs());
json["IsAdministrationAllowed"] = IsTokenAllowed(&token, AppData()->DomainsConfig.GetSecurityConfig().GetAdministrationAllowedSIDs());
ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(Viewer->GetHTTPOKJSON(Event->Get(), NJson::WriteJson(json, false)), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
Die(ctx);
}

void HandleTimeout(const TActorContext &ctx) {
ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(Viewer->GetHTTPGATEWAYTIMEOUT(Event->Get()), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
Die(ctx);
TBase::ReplyAndPassAway(GetHTTPOKJSON(json));
}

static YAML::Node GetSwaggerSchema() {
Expand Down
Loading