This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 12f70aee0dd [fix](auth)Fix some exception info of the auth case
(#38205)
12f70aee0dd is described below
commit 12f70aee0dd10ac3543186f2f2e81a517f56bd26
Author: zfr95 <[email protected]>
AuthorDate: Sun Aug 4 11:05:18 2024 +0800
[fix](auth)Fix some exception info of the auth case (#38205)
## Proposed changes
[fix](auth)Fix some exception info of the auth case
---
.../test_master_slave_consistency_auth.groovy | 32 +++++++++++-----------
.../suites/auth_p0/test_select_column_auth.groovy | 8 +++---
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
index 4370018ee9a..acb59e74326 100644
--- a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
+++ b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
@@ -120,7 +120,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -128,7 +128,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=url_tmp1) {
@@ -136,7 +136,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "SHOW DATA"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -144,7 +144,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "SHOW DATA"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
@@ -153,7 +153,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -161,7 +161,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${tableName} to
${user}"""
@@ -178,7 +178,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${view_name}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -186,7 +186,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${view_name}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${view_name} to
${user}"""
@@ -203,7 +203,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -211,7 +211,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${mtmv_name} to
${user}"""
@@ -241,7 +241,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -249,7 +249,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
@@ -272,7 +272,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -280,7 +280,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
@@ -292,7 +292,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("USAGE/ADMIN privilege"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -301,7 +301,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("USAGE/ADMIN privilege"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """GRANT USAGE_PRIV ON WORKLOAD GROUP '${wg}' TO '${user}';"""
diff --git a/regression-test/suites/auth_p0/test_select_column_auth.groovy
b/regression-test/suites/auth_p0/test_select_column_auth.groovy
index 41e3305276e..8b3e9529551 100644
--- a/regression-test/suites/auth_p0/test_select_column_auth.groovy
+++ b/regression-test/suites/auth_p0/test_select_column_auth.groovy
@@ -79,7 +79,7 @@ suite("test_select_column_auth","p0,auth") {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${tableName} to ${user}"""
@@ -93,7 +93,7 @@ suite("test_select_column_auth","p0,auth") {
sql "select username from ${dbName}.${mv_name}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${mv_name} to ${user}"""
@@ -107,7 +107,7 @@ suite("test_select_column_auth","p0,auth") {
sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}"""
@@ -123,7 +123,7 @@ suite("test_select_column_auth","p0,auth") {
sql "select username, sum(id) from ${dbName}.${tableName} group by
username"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
