Skip to content

Commit ccd7d90

Browse files
remove kafka cloud role check (#13816)
1 parent 9c0a054 commit ccd7d90

File tree

3 files changed

+3
-24
lines changed

3 files changed

+3
-24
lines changed

ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,6 @@ void TKafkaSaslAuthActor::Handle(NKikimr::TEvTicketParser::TEvAuthorizeTicketRes
5454
}
5555
UserToken = ev->Get()->Token;
5656

57-
if (ClientAuthData.UserName.empty()) {
58-
bool gotPermission = false;
59-
for (auto & sid : UserToken->GetGroupSIDs()) {
60-
if (sid == NKikimr::NGRpcProxy::V1::KafkaPlainAuthSid) {
61-
gotPermission = true;
62-
break;
63-
}
64-
}
65-
if (!gotPermission) {
66-
SendResponseAndDie(EKafkaErrors::SASL_AUTHENTICATION_FAILED, "", TStringBuilder() << "no permission '" << NKikimr::NGRpcProxy::V1::KafkaPlainAuthPermission << "'", ctx);
67-
return;
68-
}
69-
}
70-
7157
SendResponseAndDie(EKafkaErrors::NONE_ERROR, "", "", ctx);
7258
}
7359

@@ -174,7 +160,7 @@ void TKafkaSaslAuthActor::SendLoginRequest(TKafkaSaslAuthActor::TAuthData authDa
174160
}
175161

176162
void TKafkaSaslAuthActor::SendApiKeyRequest() {
177-
auto entries = NKikimr::NGRpcProxy::V1::GetTicketParserEntries(DatabaseId, FolderId, true);
163+
auto entries = NKikimr::NGRpcProxy::V1::GetTicketParserEntries(DatabaseId, FolderId);
178164

179165
Send(NKikimr::MakeTicketParserID(), new NKikimr::TEvTicketParser::TEvAuthorizeTicket({
180166
.Database = DatabasePath,

ydb/library/testlib/service_mocks/access_service_mock.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class TTicketParserAccessServiceMock : public yandex::cloud::priv::servicecontro
137137
THashSet<TString> AllowedUserPermissions = {
138138
"user1-something.read",
139139
"ApiKey-value-valid-something.read",
140-
"ApiKey-value-valid-ydb.api.kafkaPlainAuth",
140+
"ApiKey-value-valid-ydb.streams.write",
141141
"user1-monitoring.view"};
142142
THashMap<TString, TString> AllowedServicePermissions = {{"service1-something.write", "root1/folder1"}};
143143
THashSet<TString> AllowedResourceIds = {};
@@ -200,7 +200,6 @@ class TTicketParserAccessServiceMockV2 : public yandex::cloud::priv::accessservi
200200
THashSet<TString> AllowedUserPermissions = {
201201
"user1-something.read",
202202
"ApiKey-value-valid-something.read",
203-
"ApiKey-value-valid-ydb.api.kafkaPlainAuth",
204203
"user1-monitoring.view"
205204
};
206205
THashMap<TString, TString> AllowedServicePermissions = {{"service1-something.write", "root1/folder1"}};

ydb/services/persqueue_v1/actors/persqueue_utils.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ namespace NKikimr::NGRpcProxy::V1 {
1717
#endif
1818
#define PQ_LOG_PREFIX "session cookie " << Cookie << " consumer " << ClientPath << " session " << Session
1919

20-
static constexpr char KafkaPlainAuthPermission[] = "ydb.api.kafkaPlainAuth";
21-
static constexpr char KafkaPlainAuthSid[] = "ydb.api.kafkaPlainAuth@as";
22-
2320
// moved to ydb/core/client/server/msgbus_server_persqueue.h?
2421
// const TString& TopicPrefix(const TActorContext& ctx);
2522

@@ -76,7 +73,7 @@ static inline bool InternalErrorCode(Ydb::PersQueue::ErrorCode::ErrorCode errorC
7673
void FillIssue(Ydb::Issue::IssueMessage* issue, const Ydb::PersQueue::ErrorCode::ErrorCode errorCode, const TString& errorReason);
7774

7875

79-
static inline TVector<TEvTicketParser::TEvAuthorizeTicket::TEntry> GetTicketParserEntries(const TString& dbId, const TString& folderId, bool useKafkaApi = false) {
76+
static inline TVector<TEvTicketParser::TEvAuthorizeTicket::TEntry> GetTicketParserEntries(const TString& dbId, const TString& folderId) {
8077
TVector<TString> permissions = {
8178
"ydb.databases.list",
8279
"ydb.databases.create",
@@ -85,9 +82,6 @@ static inline TVector<TEvTicketParser::TEvAuthorizeTicket::TEntry> GetTicketPar
8582
"ydb.schemas.getMetadata",
8683
"ydb.streams.write"
8784
};
88-
if (useKafkaApi) {
89-
permissions.push_back(KafkaPlainAuthPermission);
90-
}
9185
TVector<std::pair<TString, TString>> attributes;
9286
if (!dbId.empty()) attributes.push_back({"database_id", dbId});
9387
if (!folderId.empty()) attributes.push_back({"folder_id", folderId});

0 commit comments

Comments
 (0)