hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix core when expanding privs of roles

Browse Source
This commit is contained in:
bf0
2022-03-23 22:07:28 +08:00
committed by LINxiansheng
parent c0e3860141
commit 30327651c9
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/share/schema/ob_schema_getter_guard.cpp
View File

@ -1900,18 +1900,19 @@ int ObSchemaGetterGuard::add_role_id_recursively(uint64_t role_id, ObSessionPriv
int ret = OB_SUCCESS;
const ObUserInfo* role_info = NULL;
/* 1. put itself */
if (!has_exist_in_array(s_priv.enable_role_id_array_, role_id)) {
/* 1. put itself */
OZ(s_priv.enable_role_id_array_.push_back(role_id));
}
/* 2. get role recursively */
OZ(get_user_info(role_id, role_info));
if (OB_SUCC(ret) && role_info != NULL) {
const ObSEArray<uint64_t, 8>& role_id_array = role_info->get_role_id_array();
for (int i = 0; OB_SUCC(ret) && i < role_id_array.count(); ++i) {
OZ(add_role_id_recursively(role_info->get_role_id_array().at(i), s_priv));
/* 2. get role recursively */
OZ(get_user_info(role_id, role_info));
if (OB_SUCC(ret) && role_info != NULL) {
const ObSEArray<uint64_t, 8> &role_id_array = role_info->get_role_id_array();
for (int i = 0; OB_SUCC(ret) && i < role_id_array.count(); ++i) {
OZ(add_role_id_recursively(role_info->get_role_id_array().at(i), s_priv));
}
}
}
return ret;
}

2
src/sql/resolver/dcl/ob_alter_user_profile_resolver.cpp
View File

@ -101,7 +101,7 @@ int ObAlterUserProfileResolver::resolve_role_list(const ParseNode* role_list, ob
role_name.assign_ptr(const_cast<char*>(role->str_value_), static_cast<int32_t>(role->str_len_));
ObString host_name(OB_DEFAULT_HOST_NAME);
if (OB_FAIL(params_.schema_checker_->get_user_info(arg.tenant_id_, role_name, host_name, role_info))) {
if (OB_USER_NOT_EXIST == ret) {
if (OB_USER_NOT_EXIST == ret || OB_ISNULL(role_info) || !role_info->is_role()) {
if (for_default_role_stmt) {
ret = OB_ROLE_NOT_EXIST;
LOG_USER_ERROR(OB_ROLE_NOT_EXIST, role_name.length(), role_name.ptr());

2
src/sql/resolver/dcl/ob_grant_resolver.cpp
View File

@ -198,7 +198,7 @@ int ObGrantResolver::resolve_grant_role_to_ur(const ParseNode* grant_role, ObGra
role_info),
tenant_id,
role_name);
if (OB_USER_NOT_EXIST == ret) {
if (OB_USER_NOT_EXIST == ret || OB_ISNULL(role_info) || !role_info->is_role()) {
ret = OB_ROLE_NOT_EXIST;
LOG_USER_ERROR(OB_ROLE_NOT_EXIST, role_name.length(), role_name.ptr());
}

21
src/sql/resolver/dcl/ob_revoke_resolver.cpp
View File

@ -41,6 +41,7 @@ int ObRevokeResolver::resolve_revoke_role_inner(const ParseNode* revoke_role, Ob
// 1. resolve role list
ParseNode* role_list = revoke_role->children_[0];
for (int i = 0; OB_SUCC(ret) && i < role_list->num_child_; ++i) {
const ObUserInfo *role_info = NULL;
uint64_t role_id = OB_INVALID_ID;
ParseNode* role = role_list->children_[i];
if (NULL == role) {
@ -49,17 +50,19 @@ int ObRevokeResolver::resolve_revoke_role_inner(const ParseNode* revoke_role, Ob
} else {
ObString role_name;
role_name.assign_ptr(const_cast<char*>(role->str_value_), static_cast<int32_t>(role->str_len_));
ObString host_name(OB_DEFAULT_HOST_NAME);
if (OB_FAIL(params_.schema_checker_->get_user_id(tenant_id, role_name, host_name, role_id))) {
if (OB_USER_NOT_EXIST == ret) {
ret = OB_ROLE_NOT_EXIST;
LOG_USER_ERROR(OB_ROLE_NOT_EXIST, role_name.length(), role_name.ptr());
}
SQL_RESV_LOG(WARN, "fail to get user id", K(ret), K(role_name), K(host_name));
} else if (OB_FAIL(revoke_stmt->add_role(role_id))) {
LOG_WARN("failed to add role", K(ret));
OZ(params_.schema_checker_->get_user_info(tenant_id, role_name, host_name, role_info), role_name, host_name);
if (OB_USER_NOT_EXIST == ret || OB_ISNULL(role_info) || !role_info->is_role()) {
ret = OB_ROLE_NOT_EXIST;
LOG_USER_ERROR(OB_ROLE_NOT_EXIST, role_name.length(), role_name.ptr());
} else {
OZ(role_id_array.push_back(role_id));
role_id = role_info->get_user_id();
if (OB_FAIL(revoke_stmt->add_role(role_id))) {
LOG_WARN("failed to add role", K(ret));
} else {
OZ(role_id_array.push_back(role_id));
}
}
}
}