Skip to content

Commit 44c4649

Browse files
StekPerepolnenStekPerepolnen
authored
mvp remove unnecessary methods (#7487)
1 parent a9e2b92 commit 44c4649

File tree

8 files changed

+10
-78
lines changed

8 files changed

+10
-78
lines changed

‎ydb/mvp/meta/mvp.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ void TMVP::TryGetGenericOptionsFromConfig(
185185
TString& caCertificateFile,
186186
TString& sslCertificateFile,
187187
bool& useStderr,
188-
bool& mlock,
189-
NMvp::EAccessServiceType& /*accessServiceType*/
188+
bool& mlock
190189
) {
191190
if (!config["generic"]) {
192191
return;
@@ -238,8 +237,6 @@ THolder<NActors::TActorSystemSetup> TMVP::BuildActorSystemSetup(int argc, char**
238237
TString defaultMetaDatabase = "/Root";
239238
TString defaultMetaApiEndpoint = "grpc://meta.ydb.yandex.net:2135";
240239

241-
NMvp::EAccessServiceType accessServiceType = NMvp::EAccessServiceType::yandex_v2;
242-
243240
opts.AddLongOption("stderr", "Redirect log to stderr").NoArgument().SetFlag(&useStderr);
244241
opts.AddLongOption("mlock", "Lock resident memory").NoArgument().SetFlag(&mlock);
245242

@@ -262,8 +259,7 @@ THolder<NActors::TActorSystemSetup> TMVP::BuildActorSystemSetup(int argc, char**
262259
caCertificateFile,
263260
sslCertificateFile,
264261
useStderr,
265-
mlock,
266-
accessServiceType
262+
mlock
267263
);
268264
} catch (const YAML::Exception& e) {
269265
std::cerr << "Error parsing YAML configuration file: " << e.what() << std::endl;

‎ydb/mvp/meta/mvp.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ class TMVP {
5959
TString& caCertificateFile,
6060
TString& sslCertificateFile,
6161
bool& useStderr,
62-
bool& mlock,
63-
NMvp::EAccessServiceType& accessServiceType);
62+
bool& mlock);
6463

6564
TMVPAppData AppData;
6665
TIntrusivePtr<NActors::NLog::TSettings> LoggerSettings;

‎ydb/mvp/oidc_proxy/oidc_protected_page.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,12 @@ class THandlerSessionServiceCheck : public NActors::TActorBootstrapped<THandlerS
6868
}
6969
}
7070

71-
void Handle(NHttp::TEvHttpProxy::TEvHttpIncomingResponse::TPtr event, const NActors::TActorContext& ctx) {
71+
void HandleProxy(NHttp::TEvHttpProxy::TEvHttpIncomingResponse::TPtr event, const NActors::TActorContext& ctx) {
7272
NHttp::THttpOutgoingResponsePtr httpResponse;
7373
if (event->Get()->Response != nullptr) {
7474
NHttp::THttpIncomingResponsePtr response = event->Get()->Response;
75-
if (response->Status == "400" && RequestedPageScheme.empty()) {
75+
LOG_DEBUG_S(ctx, EService::MVP, "Incoming response for protected resource: " << response->Status);
76+
if ((response->Status == "400" || response->Status.empty()) && RequestedPageScheme.empty()) {
7677
NHttp::THttpOutgoingRequestPtr request = response->GetRequest();
7778
if (!request->Secure) {
7879
LOG_DEBUG_S(ctx, EService::MVP, "Try to send request to HTTPS port");

‎ydb/mvp/oidc_proxy/oidc_protected_page_nebius.h

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,6 @@ class THandlerSessionServiceCheckNebius : public THandlerSessionServiceCheck {
3737
}
3838
}
3939

40-
void HandleProxy(NHttp::TEvHttpProxy::TEvHttpIncomingResponse::TPtr event, const NActors::TActorContext& ctx) {
41-
NHttp::THttpOutgoingResponsePtr httpResponse;
42-
if (event->Get()->Response != nullptr) {
43-
NHttp::THttpIncomingResponsePtr response = event->Get()->Response;
44-
LOG_DEBUG_S(ctx, EService::MVP, "Incoming response for protected resource: " << response->Status);
45-
if ((response->Status == "400" || response->Status.empty()) && RequestedPageScheme.empty()) {
46-
NHttp::THttpOutgoingRequestPtr request = response->GetRequest();
47-
if (!request->Secure) {
48-
LOG_DEBUG_S(ctx, EService::MVP, "Try to send request to HTTPS port");
49-
NHttp::THeadersBuilder headers {request->Headers};
50-
ForwardUserRequest(headers.Get(AUTH_HEADER_NAME), ctx, true);
51-
return;
52-
}
53-
}
54-
NHttp::THeadersBuilder headers = GetResponseHeaders(response);
55-
TStringBuf contentType = headers.Get("Content-Type").NextTok(';');
56-
if (contentType == "text/html") {
57-
TString newBody = FixReferenceInHtml(response->Body, response->GetRequest()->Host);
58-
httpResponse = Request->CreateResponse( response->Status, response->Message, headers, newBody);
59-
} else {
60-
httpResponse = Request->CreateResponse( response->Status, response->Message, headers, response->Body);
61-
}
62-
} else {
63-
httpResponse = Request->CreateResponseNotFound(NOT_FOUND_HTML_PAGE, "text/html");
64-
}
65-
ctx.Send(Sender, new NHttp::TEvHttpProxy::TEvHttpOutgoingResponse(httpResponse));
66-
Die(ctx);
67-
}
68-
6940
void HandleExchange(NHttp::TEvHttpProxy::TEvHttpIncomingResponse::TPtr event, const NActors::TActorContext& ctx) {
7041
if (!event->Get()->Response) {
7142
LOG_DEBUG_S(ctx, EService::MVP, "Getting access token: Bad Request");

‎ydb/mvp/oidc_proxy/oidc_protected_page_yandex.h

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,9 @@ class THandlerSessionServiceCheckYandex : public THandlerSessionServiceCheck {
4242
Die(ctx);
4343
}
4444

45-
void Handle(NHttp::TEvHttpProxy::TEvHttpIncomingResponse::TPtr event, const NActors::TActorContext& ctx) {
46-
NHttp::THttpOutgoingResponsePtr httpResponse;
47-
if (event->Get()->Response != nullptr) {
48-
NHttp::THttpIncomingResponsePtr response = event->Get()->Response;
49-
if (response->Status == "400" && RequestedPageScheme.empty()) {
50-
NHttp::THttpOutgoingRequestPtr request = response->GetRequest();
51-
if (!request->Secure) {
52-
LOG_DEBUG_S(ctx, EService::MVP, "Try to send request to HTTPS port");
53-
NHttp::THeadersBuilder headers {request->Headers};
54-
ForwardUserRequest(headers.Get(AUTH_HEADER_NAME), ctx, true);
55-
return;
56-
}
57-
}
58-
NHttp::THeadersBuilder headers = GetResponseHeaders(response);
59-
TStringBuf contentType = headers.Get("Content-Type").NextTok(';');
60-
if (contentType == "text/html") {
61-
TString newBody = FixReferenceInHtml(response->Body, response->GetRequest()->Host);
62-
httpResponse = Request->CreateResponse( response->Status, response->Message, headers, newBody);
63-
} else {
64-
httpResponse = Request->CreateResponse( response->Status, response->Message, headers, response->Body);
65-
}
66-
} else {
67-
httpResponse = Request->CreateResponseNotFound(NOT_FOUND_HTML_PAGE, "text/html");
68-
}
69-
ctx.Send(Sender, new NHttp::TEvHttpProxy::TEvHttpOutgoingResponse(httpResponse));
70-
Die(ctx);
71-
}
72-
7345
STFUNC(StateWork) {
7446
switch (ev->GetTypeRewrite()) {
75-
HFunc(NHttp::TEvHttpProxy::TEvHttpIncomingResponse, Handle);
47+
HFunc(NHttp::TEvHttpProxy::TEvHttpIncomingResponse, HandleProxy);
7648
HFunc(TEvPrivate::TEvCheckSessionResponse, Handle);
7749
HFunc(TEvPrivate::TEvErrorResponse, Handle);
7850
}

‎ydb/mvp/oidc_proxy/oidc_session_create.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ class THandlerSessionCreate : public NActors::TActorBootstrapped<THandlerSession
3838
bool IsAjaxRequest = false;
3939
NHttp::THeadersBuilder ResponseHeaders;
4040

41-
virtual void RemoveAppliedCookie(const TString& cookieName) = 0;
41+
void RemoveAppliedCookie(const TString& cookieName) {
42+
ResponseHeaders.Set("Set-Cookie", TStringBuilder() << cookieName << "=; Path=" << GetAuthCallbackUrl() << "; Max-Age=0");
43+
}
4244

4345
bool IsStateValid(const TString& state, const NHttp::TCookies& cookies, const NActors::TActorContext& ctx) {
4446
const TString cookieName {CreateNameYdbOidcCookie(Settings.ClientSecret, state)};

‎ydb/mvp/oidc_proxy/oidc_session_create_nebius.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ class THandlerSessionCreateNebius : public THandlerSessionCreate {
1616
: THandlerSessionCreate(sender, request, httpProxyId, settings)
1717
{}
1818

19-
void RemoveAppliedCookie(const TString& cookieName) override {
20-
ResponseHeaders.Set("Set-Cookie", TStringBuilder() << cookieName << "=; Path=" << GetAuthCallbackUrl() << "; Max-Age=0");
21-
ResponseHeaders.Set("Set-Cookie", TStringBuilder() << CreateNameSessionCookie(Settings.ClientId) << "=; Max-Age=0");
22-
}
23-
2419
void RequestSessionToken(const TString& code, const NActors::TActorContext& ctx) override {
2520
TStringBuilder body;
2621
TStringBuf host = Request->Host;

‎ydb/mvp/oidc_proxy/oidc_session_create_yandex.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ class THandlerSessionCreateYandex : public THandlerSessionCreate {
1616
: THandlerSessionCreate(sender, request, httpProxyId, settings)
1717
{}
1818

19-
void RemoveAppliedCookie(const TString& cookieName) override {
20-
ResponseHeaders.Set("Set-Cookie", TStringBuilder() << cookieName << "=; Path=" << GetAuthCallbackUrl() << "; Max-Age=0");
21-
}
22-
2319
void RequestSessionToken(const TString& code, const NActors::TActorContext& ctx) override {
2420
NHttp::THttpOutgoingRequestPtr httpRequest = NHttp::THttpOutgoingRequest::CreateRequestPost(Settings.GetTokenEndpointURL());
2521
httpRequest->Set<&NHttp::THttpRequest::ContentType>("application/x-www-form-urlencoded");

0 commit comments

Comments
 (0)