This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new a9ee691ecc [IOTDB-3363][IOTDB-3252] Update thrift fileds about
Authorization (#6165)
a9ee691ecc is described below
commit a9ee691ecc4dfbcfdacac6afc9e6f3eb9f80ad60
Author: YongzaoDan <[email protected]>
AuthorDate: Mon Jun 6 16:11:40 2022 +0800
[IOTDB-3363][IOTDB-3252] Update thrift fileds about Authorization (#6165)
---
.../service/thrift/ConfigNodeRPCServiceProcessor.java | 4 +++-
thrift-confignode/src/main/thrift/confignode.thrift | 16 ++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 03de05999e..b589d5034f 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -365,7 +365,9 @@ public class ConfigNodeRPCServiceProcessor implements
ConfigIService.Iface {
LOGGER.error(e.getMessage());
}
PermissionInfoResp dataSet = (PermissionInfoResp)
configManager.queryPermission(plan);
- return new TAuthorizerResp(dataSet.getStatus(),
dataSet.getPermissionInfo());
+ TAuthorizerResp resp = new TAuthorizerResp(dataSet.getStatus());
+ resp.setAuthorizerInfo(dataSet.getPermissionInfo());
+ return resp;
}
@Override
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift
b/thrift-confignode/src/main/thrift/confignode.thrift
index 8719cb98a3..52e8d3f004 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -157,25 +157,25 @@ struct TAuthorizerReq {
struct TAuthorizerResp {
1: required common.TSStatus status
- 2: required map<string, list<string>> authorizerInfo
+ 2: optional map<string, list<string>> authorizerInfo
}
-struct TUserResp{
+struct TUserResp {
1: required string username
2: required string password
3: required list<string> privilegeList
4: required list<string> roleList
}
-struct TRoleResp{
+struct TRoleResp {
1: required string roleName
2: required list<string> privilegeList
}
-struct TPermissionInfoResp{
- 1: required TUserResp userInfo
- 2: required map<string, TRoleResp> roleInfo
- 3: required common.TSStatus status
+struct TPermissionInfoResp {
+ 1: required common.TSStatus status
+ 2: optional TUserResp userInfo
+ 3: optional map<string, TRoleResp> roleInfo
}
struct TLoginReq {
@@ -183,7 +183,7 @@ struct TLoginReq {
2: required string password
}
-struct TCheckUserPrivilegesReq{
+struct TCheckUserPrivilegesReq {
1: required string username;
2: required list<string> paths
3: required i32 permission