database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

branch-2.1: [fix](auth)Fix after fe restarting, external permissions are lost (#43307)

Browse Source 
Cherry-picked from #43275

Co-authored-by: zhangdong <493738387@qq.com>
This commit is contained in:
github-actions[bot]
2024-11-06 14:54:59 +08:00
committed by GitHub
parent 876fae6f71
commit 8fedb03fdc
3 changed files with 80 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/Auth.java
View File

@ -597,7 +597,9 @@ public class Auth implements Writable {
throws DdlException {
writeLock();
try {
checkTablePatternExist(tblPattern);
if (!isReplay) {
checkTablePatternExist(tblPattern);
}
if (role == null) {
if (!doesUserExist(userIdent)) {
throw new DdlException("user " + userIdent + " does not exist");

45
regression-test/suites/auth_up_down_hive_p0/load.groovy Normal file
View File

@ -0,0 +1,45 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
suite("test_up_down_hive_prepare_auth","p0,auth,restart_fe,external,hive,external_docker,external_docker_hive") {
String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled == null || !enabled.equalsIgnoreCase("true")) {
logger.info("diable Hive test.")
return;
}
String suiteName = "auth_up_down_hive"
String hivePrefix = "hive2";
String hms_port = context.config.otherConfigs.get(hivePrefix + "HmsPort")
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String catalogName = "${hivePrefix}_${suiteName}_catalog"
String userName = "${hivePrefix}_${suiteName}_user"
String pwd = 'C123_567p'
try_sql("DROP USER ${userName}")
sql """CREATE USER '${userName}' IDENTIFIED BY '${pwd}'"""
sql """drop catalog if exists ${catalogName}"""
sql """create catalog if not exists ${catalogName} properties (
"type"="hms",
'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hms_port}'
);"""
sql """grant select_priv on ${catalogName}.tpch1_parquet.customer to ${userName}"""
def res = sql """show grants for ${userName}"""
logger.info("res: " + res.toString())
assertTrue(res.toString().contains("${catalogName}.tpch1_parquet.customer"))
}

32
regression-test/suites/auth_up_down_hive_p0/test_up_down_hive_auth.groovy Normal file
View File

@ -0,0 +1,32 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
suite("test_up_down_hive_auth","p0,mtmv,restart_fe,external,hive,external_docker,external_docker_hive") {
String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled == null || !enabled.equalsIgnoreCase("true")) {
logger.info("diable Hive test.")
return;
}
String suiteName = "auth_up_down_hive"
String hivePrefix = "hive2";
String catalogName = "${hivePrefix}_${suiteName}_catalog"
String userName = "${hivePrefix}_${suiteName}_user"
def res = sql """show grants for ${userName}"""
logger.info("res: " + res.toString())
assertTrue(res.toString().contains("${catalogName}.tpch1_parquet.customer"))
}