diff options
author | Andrey Serebryanskiy <[email protected]> | 2025-02-07 10:24:34 +0300 |
---|---|---|
committer | GitHub <[email protected]> | 2025-02-07 10:24:34 +0300 |
commit | ccd7d90d2d9141a4be028c8e2c768d20e82b0976 (patch) | |
tree | ff0ff9b34cabd348aacbd3a5305a505752f0049f | |
parent | 9c0a054fba1b1840fc1b6414ccb6d413257b5230 (diff) |
remove kafka cloud role check (#13816)
-rw-r--r-- | ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp | 16 | ||||
-rw-r--r-- | ydb/library/testlib/service_mocks/access_service_mock.h | 3 | ||||
-rw-r--r-- | ydb/services/persqueue_v1/actors/persqueue_utils.h | 8 |
3 files changed, 3 insertions, 24 deletions
diff --git a/ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp b/ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp index 10bd5607e94..d9ec0c10065 100644 --- a/ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp +++ b/ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp @@ -54,20 +54,6 @@ void TKafkaSaslAuthActor::Handle(NKikimr::TEvTicketParser::TEvAuthorizeTicketRes } UserToken = ev->Get()->Token; - if (ClientAuthData.UserName.empty()) { - bool gotPermission = false; - for (auto & sid : UserToken->GetGroupSIDs()) { - if (sid == NKikimr::NGRpcProxy::V1::KafkaPlainAuthSid) { - gotPermission = true; - break; - } - } - if (!gotPermission) { - SendResponseAndDie(EKafkaErrors::SASL_AUTHENTICATION_FAILED, "", TStringBuilder() << "no permission '" << NKikimr::NGRpcProxy::V1::KafkaPlainAuthPermission << "'", ctx); - return; - } - } - SendResponseAndDie(EKafkaErrors::NONE_ERROR, "", "", ctx); } @@ -174,7 +160,7 @@ void TKafkaSaslAuthActor::SendLoginRequest(TKafkaSaslAuthActor::TAuthData authDa } void TKafkaSaslAuthActor::SendApiKeyRequest() { - auto entries = NKikimr::NGRpcProxy::V1::GetTicketParserEntries(DatabaseId, FolderId, true); + auto entries = NKikimr::NGRpcProxy::V1::GetTicketParserEntries(DatabaseId, FolderId); Send(NKikimr::MakeTicketParserID(), new NKikimr::TEvTicketParser::TEvAuthorizeTicket({ .Database = DatabasePath, diff --git a/ydb/library/testlib/service_mocks/access_service_mock.h b/ydb/library/testlib/service_mocks/access_service_mock.h index 5d6f421472e..62083fdc7b2 100644 --- a/ydb/library/testlib/service_mocks/access_service_mock.h +++ b/ydb/library/testlib/service_mocks/access_service_mock.h @@ -137,7 +137,7 @@ public: THashSet<TString> AllowedUserPermissions = { "user1-something.read", "ApiKey-value-valid-something.read", - "ApiKey-value-valid-ydb.api.kafkaPlainAuth", + "ApiKey-value-valid-ydb.streams.write", "user1-monitoring.view"}; THashMap<TString, TString> AllowedServicePermissions = {{"service1-something.write", "root1/folder1"}}; THashSet<TString> AllowedResourceIds = {}; @@ -200,7 +200,6 @@ public: THashSet<TString> AllowedUserPermissions = { "user1-something.read", "ApiKey-value-valid-something.read", - "ApiKey-value-valid-ydb.api.kafkaPlainAuth", "user1-monitoring.view" }; THashMap<TString, TString> AllowedServicePermissions = {{"service1-something.write", "root1/folder1"}}; diff --git a/ydb/services/persqueue_v1/actors/persqueue_utils.h b/ydb/services/persqueue_v1/actors/persqueue_utils.h index 16f372ad0dc..f2bb00e31d8 100644 --- a/ydb/services/persqueue_v1/actors/persqueue_utils.h +++ b/ydb/services/persqueue_v1/actors/persqueue_utils.h @@ -17,9 +17,6 @@ namespace NKikimr::NGRpcProxy::V1 { #endif #define PQ_LOG_PREFIX "session cookie " << Cookie << " consumer " << ClientPath << " session " << Session -static constexpr char KafkaPlainAuthPermission[] = "ydb.api.kafkaPlainAuth"; -static constexpr char KafkaPlainAuthSid[] = "ydb.api.kafkaPlainAuth@as"; - // moved to ydb/core/client/server/msgbus_server_persqueue.h? // const TString& TopicPrefix(const TActorContext& ctx); @@ -76,7 +73,7 @@ static inline bool InternalErrorCode(Ydb::PersQueue::ErrorCode::ErrorCode errorC void FillIssue(Ydb::Issue::IssueMessage* issue, const Ydb::PersQueue::ErrorCode::ErrorCode errorCode, const TString& errorReason); -static inline TVector<TEvTicketParser::TEvAuthorizeTicket::TEntry> GetTicketParserEntries(const TString& dbId, const TString& folderId, bool useKafkaApi = false) { +static inline TVector<TEvTicketParser::TEvAuthorizeTicket::TEntry> GetTicketParserEntries(const TString& dbId, const TString& folderId) { TVector<TString> permissions = { "ydb.databases.list", "ydb.databases.create", @@ -85,9 +82,6 @@ static inline TVector<TEvTicketParser::TEvAuthorizeTicket::TEntry> GetTicketPar "ydb.schemas.getMetadata", "ydb.streams.write" }; - if (useKafkaApi) { - permissions.push_back(KafkaPlainAuthPermission); - } TVector<std::pair<TString, TString>> attributes; if (!dbId.empty()) attributes.push_back({"database_id", dbId}); if (!folderId.empty()) attributes.push_back({"folder_id", folderId}); |