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

KIKIMR-20081: add grant/revoke permissions to query service #522

Merged
merged 3 commits into from
Dec 20, 2023
Merged

KIKIMR-20081: add grant/revoke permissions to query service #522

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beeaa0a
add grant/revore permissions to query service
VPolka Dec 15, 2023
bcddff7
fix rebase
VPolka Dec 20, 2023
9403e3b
fix issues
VPolka Dec 20, 2023
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
16 changes: 11 additions & 5 deletions ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,31 +166,37 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
}

case NKqpProto::TKqpSchemeOperation::kCreateGroup: {
auto modifyScheme = schemeOp.GetCreateGroup();
const auto& modifyScheme = schemeOp.GetCreateGroup();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kAddGroupMembership: {
auto modifyScheme = schemeOp.GetAddGroupMembership();
const auto& modifyScheme = schemeOp.GetAddGroupMembership();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kRemoveGroupMembership: {
auto modifyScheme = schemeOp.GetRemoveGroupMembership();
const auto& modifyScheme = schemeOp.GetRemoveGroupMembership();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kRenameGroup: {
auto modifyScheme = schemeOp.GetRenameGroup();
const auto& modifyScheme = schemeOp.GetRenameGroup();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kDropGroup: {
auto modifyScheme = schemeOp.GetDropGroup();
const auto& modifyScheme = schemeOp.GetDropGroup();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kModifyPermissions: {
const auto& modifyScheme = schemeOp.GetModifyPermissions();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}
Expand Down
10 changes: 1 addition & 9 deletions ydb/core/kqp/gateway/kqp_ic_gateway.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,7 @@ class TKikimrIcGateway : public IKqpGateway {
TVector<std::pair<const TString*, std::pair<TString, TString>>> pathPairs;
pathPairs.reserve(settings.Pathes.size());
for (const auto& path : settings.Pathes) {
pathPairs.push_back(std::make_pair(&path, SplitPathByDirAndBaseNames(path)));
pathPairs.push_back(std::make_pair(&path, NSchemeHelpers::SplitPathByDirAndBaseNames(path)));
}

for (const auto& path : pathPairs) {
Expand Down Expand Up @@ -2311,14 +2311,6 @@ class TKikimrIcGateway : public IKqpGateway {
}

private:
static std::pair<TString, TString> SplitPathByDirAndBaseNames(const TString& path) {
auto splitPos = path.find_last_of('/');
if (splitPos == path.npos || splitPos + 1 == path.size()) {
ythrow yexception() << "wrong path format '" << path << "'" ;
}
return {path.substr(0, splitPos), path.substr(splitPos + 1)};
}

static TListPathResult GetListPathResult(const TPathDescription& pathDesc, const TString& path) {
if (pathDesc.GetSelf().GetPathType() != EPathTypeDir) {
return ResultFromError<TListPathResult>(TString("Directory not found: ") + path);
Expand Down
8 changes: 8 additions & 0 deletions ydb/core/kqp/gateway/utils/scheme_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,12 @@ void FillCreateExternalTableColumnDesc(NKikimrSchemeOp::TExternalTableDescriptio
externalTableDesc.SetContent(general.SerializeAsString());
}

std::pair<TString, TString> SplitPathByDirAndBaseNames(const TString& path) {
auto splitPos = path.find_last_of('/');
if (splitPos == path.npos || splitPos + 1 == path.size()) {
ythrow yexception() << "wrong path format '" << path << "'" ;
}
return {path.substr(0, splitPos), path.substr(splitPos + 1)};
}

} // namespace NKikimr::NKqp::NSchemeHelpers
2 changes: 2 additions & 0 deletions ydb/core/kqp/gateway/utils/scheme_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ void FillCreateExternalTableColumnDesc(NKikimrSchemeOp::TExternalTableDescriptio
const TString& name,
const NYql::TCreateExternalTableSettings& settings);

std::pair<TString, TString> SplitPathByDirAndBaseNames(const TString& path);

} // namespace NKikimr::NKqp::NSchemeHelpers
82 changes: 81 additions & 1 deletion ydb/core/kqp/host/kqp_gateway_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <ydb/core/kqp/gateway/utils/scheme_helpers.h>
#include <ydb/core/ydb_convert/table_description.h>
#include <ydb/core/ydb_convert/column_families.h>
#include <ydb/core/ydb_convert/ydb_convert.h>
#include <ydb/services/metadata/abstract/kqp_common.h>

namespace NKikimr::NKqp {
Expand Down Expand Up @@ -792,7 +793,86 @@ class TKqpGatewayProxy : public IKikimrGateway {
TFuture<TGenericResult> ModifyPermissions(const TString& cluster,
const TModifyPermissionsSettings& settings) override
{
FORWARD_ENSURE_NO_PREPARE(ModifyPermissions, cluster, settings);
CHECK_PREPARED_DDL(ModifyPermissions);

auto modifyPermissionsPromise = NewPromise<TGenericResult>();

if (settings.Permissions.empty() && !settings.IsPermissionsClear) {
return MakeFuture(ResultFromError<TGenericResult>("No permissions names for modify permissions"));
}

if (settings.Pathes.empty()) {
return MakeFuture(ResultFromError<TGenericResult>("No pathes for modify permissions"));
}

if (settings.Roles.empty()) {
return MakeFuture(ResultFromError<TGenericResult>("No roles for modify permissions"));
}

NACLib::TDiffACL acl;
switch (settings.Action) {
case NYql::TModifyPermissionsSettings::EAction::Grant: {
for (const auto& sid : settings.Roles) {
for (const auto& permission : settings.Permissions) {
TACLAttrs aclAttrs = ConvertYdbPermissionNameToACLAttrs(permission);
acl.AddAccess(NACLib::EAccessType::Allow, aclAttrs.AccessMask, sid, aclAttrs.InheritanceType);
}
}
}
break;
case NYql::TModifyPermissionsSettings::EAction::Revoke: {
if (settings.IsPermissionsClear) {
for (const auto& sid : settings.Roles) {
acl.ClearAccessForSid(sid);
}
} else {
for (const auto& sid : settings.Roles) {
for (const auto& permission : settings.Permissions) {
TACLAttrs aclAttrs = ConvertYdbPermissionNameToACLAttrs(permission);
acl.RemoveAccess(NACLib::EAccessType::Allow, aclAttrs.AccessMask, sid, aclAttrs.InheritanceType);
}
}
}
}
break;
default: {
return MakeFuture(ResultFromError<TGenericResult>("Unknown permission action"));
}
}

const auto serializedDiffAcl = acl.SerializeAsString();

TVector<std::pair<const TString*, std::pair<TString, TString>>> pathPairs;
pathPairs.reserve(settings.Pathes.size());
for (const auto& path : settings.Pathes) {
pathPairs.push_back(std::make_pair(&path, NSchemeHelpers::SplitPathByDirAndBaseNames(path)));
}

if (IsPrepare()) {
for (const auto& path : pathPairs) {
const auto& [dirname, basename] = path.second;

NKikimrSchemeOp::TModifyScheme schemeTx;
schemeTx.SetOperationType(NKikimrSchemeOp::ESchemeOpModifyACL);
schemeTx.SetWorkingDir(dirname);
schemeTx.MutableModifyACL()->SetName(basename);
schemeTx.MutableModifyACL()->SetDiffACL(serializedDiffAcl);

auto& phyQuery = *SessionCtx->Query().PreparingQuery->MutablePhysicalQuery();
auto& phyTx = *phyQuery.AddTransactions();
phyTx.SetType(NKqpProto::TKqpPhyTx::TYPE_SCHEME);
phyTx.MutableSchemeOperation()->MutableModifyPermissions()->Swap(&schemeTx);
}

TGenericResult result;
result.SetSuccess();
modifyPermissionsPromise.SetValue(result);

} else {
return Gateway->ModifyPermissions(cluster, settings);
}

return modifyPermissionsPromise;
}

TFuture<TGenericResult> CreateUser(const TString& cluster, const TCreateUserSettings& settings) override {
Expand Down
7 changes: 1 addition & 6 deletions ydb/core/kqp/provider/yql_kikimr_exec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,10 +1676,6 @@ class TKiSinkCallableExecutionTransformer : public TAsyncCallbackTransformer<TKi
}

if (auto maybeGrantPermissions = TMaybeNode<TKiModifyPermissions>(input)) {
if (!EnsureNotPrepare("MODIFY PERMISSIONS", input->Pos(), SessionCtx->Query(), ctx)) {
return SyncError();
}

auto requireStatus = RequireChild(*input, 0);
if (requireStatus.Level != TStatus::Ok) {
return SyncStatus(requireStatus);
Expand All @@ -1688,8 +1684,7 @@ class TKiSinkCallableExecutionTransformer : public TAsyncCallbackTransformer<TKi
auto cluster = TString(maybeGrantPermissions.Cast().DataSink().Cluster());
TModifyPermissionsSettings settings = ParsePermissionsSettings(maybeGrantPermissions.Cast());

bool prepareOnly = SessionCtx->Query().PrepareOnly;
auto future = prepareOnly ? CreateDummySuccess() : Gateway->ModifyPermissions(cluster, settings);
auto future = Gateway->ModifyPermissions(cluster, settings);

return WrapFuture(future,
[](const IKikimrGateway::TGenericResult& res, const TExprNode::TPtr& input, TExprContext& ctx) {
Expand Down
Loading
Loading