Skip to content

Commit f181fa1

Browse files
author
babenko
committed
YT-22593: Switch to std::string for user names and co
68d8a9981ffcfca685908dd4e25c3d2171efe6a5
1 parent c73194d commit f181fa1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+228
-157
lines changed

‎yt/yt/client/api/delegating_client.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,14 +423,14 @@ class TDelegatingClient
423423
(group, member, options))
424424

425425
DELEGATE_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (
426-
const TString& user,
426+
const std::string& user,
427427
const NYPath::TYPath& path,
428428
NYTree::EPermission permission,
429429
const TCheckPermissionOptions& options),
430430
(user, path, permission, options))
431431

432432
DELEGATE_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (
433-
const std::optional<TString>& user,
433+
const std::optional<std::string>& user,
434434
NYTree::EPermission permission,
435435
NYTree::INodePtr acl,
436436
const TCheckPermissionByAclOptions& options),
@@ -712,27 +712,27 @@ class TDelegatingClient
712712
(nodeAddress, options))
713713

714714
DELEGATE_METHOD(TFuture<void>, SetUserPassword, (
715-
const TString& user,
715+
const std::string& user,
716716
const TString& currentPasswordSha256,
717717
const TString& newPasswordSha256,
718718
const TSetUserPasswordOptions& options),
719719
(user, currentPasswordSha256, newPasswordSha256, options))
720720

721721
DELEGATE_METHOD(TFuture<TIssueTokenResult>, IssueToken, (
722-
const TString& user,
722+
const std::string& user,
723723
const TString& passwordSha256,
724724
const TIssueTokenOptions& options),
725725
(user, passwordSha256, options))
726726

727727
DELEGATE_METHOD(TFuture<void>, RevokeToken, (
728-
const TString& user,
728+
const std::string& user,
729729
const TString& passwordSha256,
730730
const TString& tokenSha256,
731731
const TRevokeTokenOptions& options),
732732
(user, passwordSha256, tokenSha256, options))
733733

734734
DELEGATE_METHOD(TFuture<TListUserTokensResult>, ListUserTokens, (
735-
const TString& user,
735+
const std::string& user,
736736
const TString& passwordSha256,
737737
const TListUserTokensOptions& options),
738738
(user, passwordSha256, options))

‎yt/yt/client/api/rpc_proxy/client_impl.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ TFuture<void> TClient::RemoveMember(
992992
}
993993

994994
TFuture<TCheckPermissionResponse> TClient::CheckPermission(
995-
const TString& user,
995+
const std::string& user,
996996
const TYPath& path,
997997
EPermission permission,
998998
const TCheckPermissionOptions& options)
@@ -1002,7 +1002,7 @@ TFuture<TCheckPermissionResponse> TClient::CheckPermission(
10021002
auto req = proxy.CheckPermission();
10031003
SetTimeoutOptions(*req, options);
10041004

1005-
req->set_user(user);
1005+
req->set_user(ToProto<TProtobufString>(user));
10061006
req->set_path(path);
10071007
req->set_permission(static_cast<int>(permission));
10081008
if (options.Columns) {
@@ -1028,7 +1028,7 @@ TFuture<TCheckPermissionResponse> TClient::CheckPermission(
10281028
}
10291029

10301030
TFuture<TCheckPermissionByAclResult> TClient::CheckPermissionByAcl(
1031-
const std::optional<TString>& user,
1031+
const std::optional<std::string>& user,
10321032
EPermission permission,
10331033
INodePtr acl,
10341034
const TCheckPermissionByAclOptions& options)
@@ -1039,7 +1039,7 @@ TFuture<TCheckPermissionByAclResult> TClient::CheckPermissionByAcl(
10391039
SetTimeoutOptions(*req, options);
10401040

10411041
if (user) {
1042-
req->set_user(*user);
1042+
req->set_user(ToProto<TProtobufString>(*user));
10431043
}
10441044
req->set_permission(static_cast<int>(permission));
10451045
req->set_acl(ConvertToYsonString(acl).ToString());
@@ -1999,8 +1999,8 @@ TFuture<TMaintenanceCountsPerTarget> TClient::RemoveMaintenance(
19991999
[&] (TByUser::TMine) {
20002000
req->set_mine(true);
20012001
},
2002-
[&] (const TString& user) {
2003-
req->set_user(user);
2002+
[&] (const std::string& user) {
2003+
req->set_user(ToProto<TProtobufString>(user));
20042004
});
20052005

20062006
req->set_supports_per_target_response(true);
@@ -2422,7 +2422,7 @@ TFuture<void> TClient::SetBundleConfig(
24222422
}
24232423

24242424
TFuture<void> TClient::SetUserPassword(
2425-
const TString& /*user*/,
2425+
const std::string& /*user*/,
24262426
const TString& /*currentPasswordSha256*/,
24272427
const TString& /*newPasswordSha256*/,
24282428
const TSetUserPasswordOptions& /*options*/)
@@ -2431,15 +2431,15 @@ TFuture<void> TClient::SetUserPassword(
24312431
}
24322432

24332433
TFuture<TIssueTokenResult> TClient::IssueToken(
2434-
const TString& /*user*/,
2434+
const std::string& /*user*/,
24352435
const TString& /*passwordSha256*/,
24362436
const TIssueTokenOptions& /*options*/)
24372437
{
24382438
ThrowUnimplemented("IssueToken");
24392439
}
24402440

24412441
TFuture<void> TClient::RevokeToken(
2442-
const TString& /*user*/,
2442+
const std::string& /*user*/,
24432443
const TString& /*passwordSha256*/,
24442444
const TString& /*tokenSha256*/,
24452445
const TRevokeTokenOptions& /*options*/)
@@ -2448,7 +2448,7 @@ TFuture<void> TClient::RevokeToken(
24482448
}
24492449

24502450
TFuture<TListUserTokensResult> TClient::ListUserTokens(
2451-
const TString& /*user*/,
2451+
const std::string& /*user*/,
24522452
const TString& /*passwordSha256*/,
24532453
const TListUserTokensOptions& /*options*/)
24542454
{

‎yt/yt/client/api/rpc_proxy/client_impl.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ class TClient
200200
const NApi::TRemoveMemberOptions& options) override;
201201

202202
TFuture<TCheckPermissionResponse> CheckPermission(
203-
const TString& user,
203+
const std::string& user,
204204
const NYPath::TYPath& path,
205205
NYTree::EPermission permission,
206206
const NApi::TCheckPermissionOptions& options) override;
207207

208208
TFuture<TCheckPermissionByAclResult> CheckPermissionByAcl(
209-
const std::optional<TString>& user,
209+
const std::optional<std::string>& user,
210210
NYTree::EPermission permission,
211211
NYTree::INodePtr acl,
212212
const NApi::TCheckPermissionByAclOptions& options) override;
@@ -491,24 +491,24 @@ class TClient
491491
// Authentication
492492

493493
virtual TFuture<void> SetUserPassword(
494-
const TString& user,
494+
const std::string& user,
495495
const TString& currentPasswordSha256,
496496
const TString& newPasswordSha256,
497497
const TSetUserPasswordOptions& options) override;
498498

499499
TFuture<TIssueTokenResult> IssueToken(
500-
const TString& user,
500+
const std::string& user,
501501
const TString& passwordSha256,
502502
const TIssueTokenOptions& options) override;
503503

504504
TFuture<void> RevokeToken(
505-
const TString& user,
505+
const std::string& user,
506506
const TString& passwordSha256,
507507
const TString& tokenSha256,
508508
const TRevokeTokenOptions& options) override;
509509

510510
TFuture<TListUserTokensResult> ListUserTokens(
511-
const TString& user,
511+
const std::string& user,
512512
const TString& passwordSha256,
513513
const TListUserTokensOptions& options) override;
514514

‎yt/yt/client/api/security_client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using namespace NYTree;
77
////////////////////////////////////////////////////////////////////////////////
88

99
TError TCheckPermissionResult::ToError(
10-
const TString& user,
10+
const std::string& user,
1111
EPermission permission,
1212
const std::optional<TString>& column) const
1313
{
@@ -51,7 +51,7 @@ TError TCheckPermissionResult::ToError(
5151
}
5252
}
5353

54-
TError TCheckPermissionByAclResult::ToError(const TString &user, EPermission permission) const
54+
TError TCheckPermissionByAclResult::ToError(const std::string& user, EPermission permission) const
5555
{
5656
switch (Action) {
5757
case NSecurityClient::ESecurityAction::Allow:

‎yt/yt/client/api/security_client.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct TCheckPermissionOptions
3333
struct TCheckPermissionResult
3434
{
3535
TError ToError(
36-
const TString& user,
36+
const std::string& user,
3737
NYTree::EPermission permission,
3838
const std::optional<TString>& columns = {}) const;
3939

@@ -60,7 +60,7 @@ struct TCheckPermissionByAclOptions
6060

6161
struct TCheckPermissionByAclResult
6262
{
63-
TError ToError(const TString& user, NYTree::EPermission permission) const;
63+
TError ToError(const std::string& user, NYTree::EPermission permission) const;
6464

6565
NSecurityClient::ESecurityAction Action;
6666
NSecurityClient::TSubjectId SubjectId;
@@ -129,38 +129,38 @@ struct ISecurityClient
129129
const TRemoveMemberOptions& options = {}) = 0;
130130

131131
virtual TFuture<TCheckPermissionResponse> CheckPermission(
132-
const TString& user,
132+
const std::string& user,
133133
const NYPath::TYPath& path,
134134
NYTree::EPermission permission,
135135
const TCheckPermissionOptions& options = {}) = 0;
136136

137137
virtual TFuture<TCheckPermissionByAclResult> CheckPermissionByAcl(
138-
const std::optional<TString>& user,
138+
const std::optional<std::string>& user,
139139
NYTree::EPermission permission,
140140
NYTree::INodePtr acl,
141141
const TCheckPermissionByAclOptions& options = {}) = 0;
142142

143143
// Methods below correspond to simple authentication scheme
144144
// and are intended to be used on clusters without third-party tokens (e.g. Yandex blackbox).
145145
virtual TFuture<void> SetUserPassword(
146-
const TString& user,
146+
const std::string& user,
147147
const TString& currentPasswordSha256,
148148
const TString& newPasswordSha256,
149149
const TSetUserPasswordOptions& options) = 0;
150150

151151
virtual TFuture<TIssueTokenResult> IssueToken(
152-
const TString& user,
152+
const std::string& user,
153153
const TString& passwordSha256,
154154
const TIssueTokenOptions& options) = 0;
155155

156156
virtual TFuture<void> RevokeToken(
157-
const TString& user,
157+
const std::string& user,
158158
const TString& passwordSha256,
159159
const TString& tokenSha256,
160160
const TRevokeTokenOptions& options) = 0;
161161

162162
virtual TFuture<TListUserTokensResult> ListUserTokens(
163-
const TString& user,
163+
const std::string& user,
164164
const TString& passwordSha256,
165165
const TListUserTokensOptions& options) = 0;
166166
};

‎yt/yt/client/driver/driver.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,8 @@ class TDriver
548548

549549
NTracing::TChildTraceContextGuard commandSpan(ConcatToString(TStringBuf("Driver:"), request.CommandName));
550550
NTracing::AnnotateTraceContext([&] (const auto& traceContext) {
551-
traceContext->AddTag("user", request.AuthenticatedUser);
551+
// TODO(babenko): switch to std::string
552+
traceContext->AddTag("user", TString(request.AuthenticatedUser));
552553
traceContext->AddTag("request_id", request.Id);
553554
});
554555

‎yt/yt/client/driver/driver.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,14 @@ struct TDriverRequest
4949
NYTree::IMapNodePtr Parameters;
5050

5151
//! Name of the user issuing the request.
52-
TString AuthenticatedUser = NSecurityClient::RootUserName;
52+
// TODO(babenko): replace with TAuthenticationIdentity
53+
std::string AuthenticatedUser = NSecurityClient::RootUserName;
5354

5455
//! Provides an additional annotation to differentiate between
5556
//! various clients that authenticate via the same effective user.
56-
std::optional<TString> UserTag;
57+
std::optional<std::string> UserTag;
5758

58-
//! Filled in the context of http proxy.
59+
//! Filled in the context of HTTP proxy.
5960
std::optional<NNet::TNetworkAddress> UserRemoteAddress;
6061

6162
//! User token.

‎yt/yt/client/driver/etc_commands.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class TCheckPermissionCommand
114114
static void Register(TRegistrar registrar);
115115

116116
private:
117-
TString User;
117+
std::string User;
118118
NYPath::TRichYPath Path;
119119
NYTree::EPermission Permission;
120120

‎yt/yt/client/federated/client.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ class TClient
391391
UNIMPLEMENTED_METHOD(TFuture<TPutFileToCacheResult>, PutFileToCache, (const NYPath::TYPath&, const TString&, const TPutFileToCacheOptions&));
392392
UNIMPLEMENTED_METHOD(TFuture<void>, AddMember, (const TString&, const TString&, const TAddMemberOptions&));
393393
UNIMPLEMENTED_METHOD(TFuture<void>, RemoveMember, (const TString&, const TString&, const TRemoveMemberOptions&));
394-
UNIMPLEMENTED_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (const TString&, const NYPath::TYPath&, NYTree::EPermission, const TCheckPermissionOptions&));
395-
UNIMPLEMENTED_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (const std::optional<TString>&, NYTree::EPermission, NYTree::INodePtr, const TCheckPermissionByAclOptions&));
394+
UNIMPLEMENTED_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (const std::string&, const NYPath::TYPath&, NYTree::EPermission, const TCheckPermissionOptions&));
395+
UNIMPLEMENTED_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (const std::optional<std::string>&, NYTree::EPermission, NYTree::INodePtr, const TCheckPermissionByAclOptions&));
396396
UNIMPLEMENTED_METHOD(TFuture<void>, TransferAccountResources, (const TString&, const TString&, NYTree::INodePtr, const TTransferAccountResourcesOptions&));
397397
UNIMPLEMENTED_METHOD(TFuture<void>, TransferPoolResources, (const TString&, const TString&, const TString&, NYTree::INodePtr, const TTransferPoolResourcesOptions&));
398398
UNIMPLEMENTED_METHOD(TFuture<NScheduler::TOperationId>, StartOperation, (NScheduler::EOperationType, const NYson::TYsonString&, const TStartOperationOptions&));
@@ -445,10 +445,10 @@ class TClient
445445
UNIMPLEMENTED_METHOD(TFuture<TDestroyChunkLocationsResult>, DestroyChunkLocations, (const std::string&, bool, const std::vector<TGuid>&, const TDestroyChunkLocationsOptions&));
446446
UNIMPLEMENTED_METHOD(TFuture<TResurrectChunkLocationsResult>, ResurrectChunkLocations, (const std::string&, const std::vector<TGuid>&, const TResurrectChunkLocationsOptions&));
447447
UNIMPLEMENTED_METHOD(TFuture<TRequestRestartResult>, RequestRestart, (const std::string&, const TRequestRestartOptions&));
448-
UNIMPLEMENTED_METHOD(TFuture<void>, SetUserPassword, (const TString&, const TString&, const TString&, const TSetUserPasswordOptions&));
449-
UNIMPLEMENTED_METHOD(TFuture<TIssueTokenResult>, IssueToken, (const TString&, const TString&, const TIssueTokenOptions&));
450-
UNIMPLEMENTED_METHOD(TFuture<void>, RevokeToken, (const TString&, const TString&, const TString&, const TRevokeTokenOptions&));
451-
UNIMPLEMENTED_METHOD(TFuture<TListUserTokensResult>, ListUserTokens, (const TString&, const TString&, const TListUserTokensOptions&));
448+
UNIMPLEMENTED_METHOD(TFuture<void>, SetUserPassword, (const std::string&, const TString&, const TString&, const TSetUserPasswordOptions&));
449+
UNIMPLEMENTED_METHOD(TFuture<TIssueTokenResult>, IssueToken, (const std::string&, const TString&, const TIssueTokenOptions&));
450+
UNIMPLEMENTED_METHOD(TFuture<void>, RevokeToken, (const std::string&, const TString&, const TString&, const TRevokeTokenOptions&));
451+
UNIMPLEMENTED_METHOD(TFuture<TListUserTokensResult>, ListUserTokens, (const std::string&, const TString&, const TListUserTokensOptions&));
452452
UNIMPLEMENTED_METHOD(TFuture<NQueryTrackerClient::TQueryId>, StartQuery, (NQueryTrackerClient::EQueryEngine, const TString&, const TStartQueryOptions&));
453453
UNIMPLEMENTED_METHOD(TFuture<void>, AbortQuery, (NQueryTrackerClient::TQueryId, const TAbortQueryOptions&));
454454
UNIMPLEMENTED_METHOD(TFuture<IUnversionedRowsetPtr>, ReadQueryResult, (NQueryTrackerClient::TQueryId, i64, const TReadQueryResultOptions&));

‎yt/yt/client/hedging/hedging.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ class THedgingClient
150150
UNSUPPORTED_METHOD(TFuture<TPutFileToCacheResult>, PutFileToCache, (const TYPath&, const TString&, const TPutFileToCacheOptions&));
151151
UNSUPPORTED_METHOD(TFuture<void>, AddMember, (const TString&, const TString&, const TAddMemberOptions&));
152152
UNSUPPORTED_METHOD(TFuture<void>, RemoveMember, (const TString&, const TString&, const TRemoveMemberOptions&));
153-
UNSUPPORTED_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (const TString&, const TYPath&, EPermission, const TCheckPermissionOptions&));
154-
UNSUPPORTED_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (const std::optional<TString>&, EPermission, INodePtr, const TCheckPermissionByAclOptions&));
155-
UNSUPPORTED_METHOD(TFuture<void>, TransferAccountResources, (const TString&, const TString&, INodePtr, const TTransferAccountResourcesOptions&));
156-
UNSUPPORTED_METHOD(TFuture<void>, TransferPoolResources, (const TString&, const TString&, const TString&, INodePtr, const TTransferPoolResourcesOptions&));
153+
UNSUPPORTED_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (const std::string&, const TYPath&, NYTree::EPermission, const TCheckPermissionOptions&));
154+
UNSUPPORTED_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (const std::optional<std::string>&, NYTree::EPermission, NYTree::INodePtr, const TCheckPermissionByAclOptions&));
155+
UNSUPPORTED_METHOD(TFuture<void>, TransferAccountResources, (const TString&, const TString&, NYTree::INodePtr, const TTransferAccountResourcesOptions&));
156+
UNSUPPORTED_METHOD(TFuture<void>, TransferPoolResources, (const TString&, const TString&, const TString&, NYTree::INodePtr, const TTransferPoolResourcesOptions&));
157157
UNSUPPORTED_METHOD(TFuture<NScheduler::TOperationId>, StartOperation, (NScheduler::EOperationType, const NYson::TYsonString&, const TStartOperationOptions&));
158158
UNSUPPORTED_METHOD(TFuture<void>, AbortOperation, (const NScheduler::TOperationIdOrAlias&, const TAbortOperationOptions&));
159159
UNSUPPORTED_METHOD(TFuture<void>, SuspendOperation, (const NScheduler::TOperationIdOrAlias&, const TSuspendOperationOptions&));
@@ -206,10 +206,10 @@ class THedgingClient
206206
UNSUPPORTED_METHOD(TFuture<TResurrectChunkLocationsResult>, ResurrectChunkLocations, (const std::string&, const std::vector<TGuid>&, const TResurrectChunkLocationsOptions&));
207207
UNSUPPORTED_METHOD(TFuture<TRequestRestartResult>, RequestRestart, (const std::string&, const TRequestRestartOptions&));
208208
UNSUPPORTED_METHOD(TFuture<TPullRowsResult>, PullRows, (const TYPath&, const TPullRowsOptions&));
209-
UNSUPPORTED_METHOD(TFuture<void>, SetUserPassword, (const TString&, const TString&, const TString&, const TSetUserPasswordOptions&));
210-
UNSUPPORTED_METHOD(TFuture<TIssueTokenResult>, IssueToken, (const TString&, const TString&, const TIssueTokenOptions&));
211-
UNSUPPORTED_METHOD(TFuture<void>, RevokeToken, (const TString&, const TString&, const TString&, const TRevokeTokenOptions&));
212-
UNSUPPORTED_METHOD(TFuture<TListUserTokensResult>, ListUserTokens, (const TString&, const TString&, const TListUserTokensOptions&));
209+
UNSUPPORTED_METHOD(TFuture<void>, SetUserPassword, (const std::string&, const TString&, const TString&, const TSetUserPasswordOptions&));
210+
UNSUPPORTED_METHOD(TFuture<TIssueTokenResult>, IssueToken, (const std::string&, const TString&, const TIssueTokenOptions&));
211+
UNSUPPORTED_METHOD(TFuture<void>, RevokeToken, (const std::string&, const TString&, const TString&, const TRevokeTokenOptions&));
212+
UNSUPPORTED_METHOD(TFuture<TListUserTokensResult>, ListUserTokens, (const std::string&, const TString&, const TListUserTokensOptions&));
213213
UNSUPPORTED_METHOD(TFuture<NQueryTrackerClient::TQueryId>, StartQuery, (NQueryTrackerClient::EQueryEngine, const TString&, const TStartQueryOptions&));
214214
UNSUPPORTED_METHOD(TFuture<void>, AbortQuery, (NQueryTrackerClient::TQueryId, const TAbortQueryOptions&));
215215
UNSUPPORTED_METHOD(TFuture<TQueryResult>, GetQueryResult, (NQueryTrackerClient::TQueryId, i64, const TGetQueryResultOptions&));

0 commit comments

Comments
 (0)