Skip to content

Commit

Permalink
[fix](auth)Fix some exception info of the auth case (#38205)
Browse files Browse the repository at this point in the history 
## Proposed changes

[fix](auth)Fix some exception info of the auth case
  • Loading branch information
@zfr9527 @dataroaring
zfr9527 authored and dataroaring committed Aug 4, 2024
1 parent b63227a commit 12f70ae
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
32 changes: 16 additions & 16 deletions regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,31 +120,31 @@ 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) {
try {
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) {
try {
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) {
try {
sql "SHOW DATA"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("Admin_priv"))
assertTrue(e.getMessage().contains("denied"))
}
}

Expand All @@ -153,15 +153,15 @@ 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) {
try {
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}"""
Expand All @@ -178,15 +178,15 @@ 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) {
try {
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}"""
Expand All @@ -203,15 +203,15 @@ 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) {
try {
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}"""
Expand Down Expand Up @@ -241,15 +241,15 @@ 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) {
try {
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"))
}
}

Expand All @@ -272,15 +272,15 @@ 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) {
try {
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"))
}
}

Expand All @@ -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) {
Expand All @@ -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}';"""
Expand Down
8 changes: 4 additions & 4 deletions regression-test/suites/auth_p0/test_select_column_auth.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"""
Expand All @@ -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}"""
Expand All @@ -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}"""
Expand All @@ -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}"""
Expand Down

0 comments on commit 12f70ae

Please sign in to comment.