Skip to content
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

oidc bad cookie #11200

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+40 −21
Open

oidc bad cookie #11200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a29047
return cookie names
StekPerepolnen Oct 31, 2024
c7e7b32
remove logs
StekPerepolnen Nov 1, 2024
e6ba78f
changed to StringBuilder
StekPerepolnen Nov 1, 2024
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
60 changes: 39 additions & 21 deletions ydb/library/actors/http/http.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <util/generic/hash_set.h>
#include <util/generic/buffer.h>
#include <util/generic/intrlist.h>
#include <ydb/library/security/util.h>
#include "http_config.h"

// TODO(xenoxeno): hide in implementation
Expand Down Expand Up @@ -208,40 +209,57 @@ class THttpBase : public HeaderType, public BufferType {
public:
TString GetObfuscatedData() const {
THeaders headers(HeaderType::Headers);
TStringBuf authorization(headers["Authorization"]);
TStringBuf cookie(headers["Cookie"]);
TStringBuf set_cookie(headers["Set-Cookie"]);
TStringBuf x_ydb_auth_ticket(headers["x-ydb-auth-ticket"]);
TStringBuf x_yacloud_subjecttoken(headers["x-yacloud-subjecttoken"]);
TStringBuf authorizationHeader(headers["Authorization"]);
TStringBuf cookieHeader(headers["Cookie"]);
TStringBuf setCookieHeader(headers["Set-Cookie"]);
TStringBuf xYdbAuthTicketHeader(headers["x-ydb-auth-ticket"]);
TStringBuf xYacloudSubjecttokenHeader(headers["x-yacloud-subjecttoken"]);
TString data(GetRawData());
if (!authorization.empty()) {
auto pos = data.find(authorization);
if (!authorizationHeader.empty()) {
auto pos = data.find(authorizationHeader);
if (pos != TString::npos) {
data.replace(pos, authorization.size(), TString("<obfuscated>"));
data.replace(pos, authorizationHeader.size(), TString("<obfuscated>"));
}
}
if (!cookie.empty()) {
auto pos = data.find(cookie);
if (!cookieHeader.empty()) {
TStringBuf cookieParser(cookieHeader);
TStringBuilder obfuscated;
for (TStringBuf param = cookieParser.NextTok(';'); !param.empty(); param = cookieParser.NextTok(';')) {
param.SkipPrefix(" ");
TStringBuf name = param.NextTok('=');
if (!obfuscated.empty()) {
obfuscated << ' ';
}
obfuscated << name << '=' << NKikimr::MaskTicket(param) << ';';
}
auto pos = data.find(cookieHeader);
if (pos != TString::npos) {
data.replace(pos, cookie.size(), TString("<obfuscated>"));
data.replace(pos, cookieHeader.size(), obfuscated);
}
}
if (!set_cookie.empty()) {
auto pos = data.find(set_cookie);
if (pos != TString::npos) {
data.replace(pos, set_cookie.size(), TString("<obfuscated>"));
if (!setCookieHeader.empty()) {
TStringBuf cookieParser(setCookieHeader);
TStringBuf name = cookieParser.NextTok('=');
TStringBuf value = cookieParser.NextTok(';');
if (!name.empty()) {
TStringBuilder obfuscated;
obfuscated << name << '=' << NKikimr::MaskTicket(value) << ';' << cookieParser;
auto pos = data.find(setCookieHeader);
if (pos != TString::npos) {
data.replace(pos, setCookieHeader.size(), obfuscated);
}
}
}
if (!x_ydb_auth_ticket.empty()) {
auto pos = data.find(x_ydb_auth_ticket);
if (!xYdbAuthTicketHeader.empty()) {
auto pos = data.find(xYdbAuthTicketHeader);
if (pos != TString::npos) {
data.replace(pos, x_ydb_auth_ticket.size(), TString("<obfuscated>"));
data.replace(pos, xYdbAuthTicketHeader.size(), TString("<obfuscated>"));
}
}
if (!x_yacloud_subjecttoken.empty()) {
auto pos = data.find(x_yacloud_subjecttoken);
if (!xYacloudSubjecttokenHeader.empty()) {
auto pos = data.find(xYacloudSubjecttokenHeader);
if (pos != TString::npos) {
data.replace(pos, x_yacloud_subjecttoken.size(), TString("<obfuscated>"));
data.replace(pos, xYacloudSubjecttokenHeader.size(), TString("<obfuscated>"));
}
}
return data;
Expand Down
1 change: 1 addition & 0 deletions ydb/library/actors/http/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ PEERDIR(
contrib/libs/zlib
ydb/library/actors/core
ydb/library/actors/interconnect
ydb/library/security
library/cpp/dns
library/cpp/monlib/metrics
library/cpp/string_utils/quote
Expand Down
Loading