Skip to content

Commit 2d44ef0

Browse files
CRZbulabulaCRZbulabula
authored
Support user rename (apache#16512)
1 parent a6c5650 commit 2d44ef0

File tree

32 files changed

+424
-76
lines changed

32 files changed

+424
-76
lines changed

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ public void testListRoleUsers() throws SQLException {
807807
}
808808
}
809809

810-
private void validateResultSet(ResultSet set, String ans) throws SQLException {
810+
public static void validateResultSet(ResultSet set, String ans) throws SQLException {
811811
try {
812812
StringBuilder builder = new StringBuilder();
813813
ResultSetMetaData metaData = set.getMetaData();

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityIT.java‎

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ private void cleanUserAndRole(IConfigNodeRPCService.Iface client) throws TExcept
8585
new HashSet<>(),
8686
false,
8787
AuthUtils.serializePartialPathList(new ArrayList<>()),
88-
0);
88+
0,
89+
"");
8990
TAuthorizerResp authorizerResp = client.queryPermission(authorizerReq);
9091
status = authorizerResp.getStatus();
9192
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -103,7 +104,8 @@ private void cleanUserAndRole(IConfigNodeRPCService.Iface client) throws TExcept
103104
new HashSet<>(),
104105
false,
105106
AuthUtils.serializePartialPathList(new ArrayList<>()),
106-
0);
107+
0,
108+
"");
107109
status = client.operatePermission(authorizerReq);
108110
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
109111
}
@@ -153,7 +155,8 @@ public void permissionTest() throws IllegalPathException {
153155
new HashSet<>(),
154156
false,
155157
AuthUtils.serializePartialPathList(new ArrayList<>()),
156-
0);
158+
0,
159+
"");
157160
status = client.operatePermission(authorizerReq);
158161
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
159162
authorizerReq.setUserName("tempuser1");
@@ -183,7 +186,8 @@ public void permissionTest() throws IllegalPathException {
183186
new HashSet<>(),
184187
false,
185188
AuthUtils.serializePartialPathList(new ArrayList<>()),
186-
0);
189+
0,
190+
"");
187191
status = client.operatePermission(authorizerReq);
188192
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
189193
// in confignode: tempuser0
@@ -199,7 +203,8 @@ public void permissionTest() throws IllegalPathException {
199203
new HashSet<>(),
200204
false,
201205
AuthUtils.serializePartialPathList(new ArrayList<>()),
202-
0);
206+
0,
207+
"");
203208
authorizerResp = client.queryPermission(authorizerReq);
204209
status = authorizerResp.getStatus();
205210
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -217,7 +222,8 @@ public void permissionTest() throws IllegalPathException {
217222
new HashSet<>(),
218223
false,
219224
AuthUtils.serializePartialPathList(new ArrayList<>()),
220-
0);
225+
0,
226+
"");
221227
status = client.operatePermission(authorizerReq);
222228
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
223229
authorizerReq.setRoleName("temprole1");
@@ -236,7 +242,8 @@ public void permissionTest() throws IllegalPathException {
236242
new HashSet<>(),
237243
false,
238244
AuthUtils.serializePartialPathList(new ArrayList<>()),
239-
0);
245+
0,
246+
"");
240247
status = client.operatePermission(authorizerReq);
241248
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
242249
// in confignode: tempuser0,temprole0
@@ -252,7 +259,8 @@ public void permissionTest() throws IllegalPathException {
252259
new HashSet<>(),
253260
false,
254261
AuthUtils.serializePartialPathList(new ArrayList<>()),
255-
0);
262+
0,
263+
"");
256264
authorizerResp = client.queryPermission(authorizerReq);
257265
status = authorizerResp.getStatus();
258266
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -270,7 +278,8 @@ public void permissionTest() throws IllegalPathException {
270278
new HashSet<>(),
271279
false,
272280
AuthUtils.serializePartialPathList(new ArrayList<>()),
273-
0);
281+
0,
282+
"");
274283
status = client.operatePermission(authorizerReq);
275284
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
276285

@@ -287,7 +296,8 @@ public void permissionTest() throws IllegalPathException {
287296
pathPrivilegeList,
288297
false,
289298
AuthUtils.serializePartialPathList(nodeNameList),
290-
0);
299+
0,
300+
"");
291301
status = client.operatePermission(authorizerReq);
292302
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
293303
// in confignode: tempuser0: root.ln.** ,read_data
@@ -315,7 +325,8 @@ public void permissionTest() throws IllegalPathException {
315325
pathPrivilegeList,
316326
false,
317327
AuthUtils.serializePartialPathList(nodeNameList),
318-
0);
328+
0,
329+
"");
319330
status = client.operatePermission(authorizerReq);
320331
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
321332
// in confignode: tempuser0: root.ln.** ,read_data
@@ -332,7 +343,8 @@ public void permissionTest() throws IllegalPathException {
332343
new HashSet<>(),
333344
false,
334345
AuthUtils.serializePartialPathList(nodeNameList),
335-
0);
346+
0,
347+
"");
336348
status = client.operatePermission(authorizerReq);
337349
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
338350
// in confignode: tempuser0: root.ln.** ,read_data; [temprole0]
@@ -349,7 +361,8 @@ public void permissionTest() throws IllegalPathException {
349361
revokePathPrivilege,
350362
false,
351363
AuthUtils.serializePartialPathList(nodeNameList),
352-
0);
364+
0,
365+
"");
353366
status = client.operatePermission(authorizerReq);
354367
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
355368
// in confignode: tempuser0: ; [temprole0]
@@ -366,7 +379,8 @@ public void permissionTest() throws IllegalPathException {
366379
revokePathPrivilege,
367380
false,
368381
AuthUtils.serializePartialPathList(nodeNameList),
369-
0);
382+
0,
383+
"");
370384
status = client.operatePermission(authorizerReq);
371385
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
372386
// in confignode: tempuser0: ; [temprole0]
@@ -383,7 +397,8 @@ public void permissionTest() throws IllegalPathException {
383397
new HashSet<>(),
384398
false,
385399
AuthUtils.serializePartialPathList(new ArrayList<>()),
386-
0);
400+
0,
401+
"");
387402
authorizerResp = client.queryPermission(authorizerReq);
388403
status = authorizerResp.getStatus();
389404
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -407,7 +422,8 @@ public void permissionTest() throws IllegalPathException {
407422
new HashSet<>(),
408423
false,
409424
AuthUtils.serializePartialPathList(new ArrayList<>()),
410-
0);
425+
0,
426+
"");
411427
authorizerResp = client.queryPermission(authorizerReq);
412428
status = authorizerResp.getStatus();
413429
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -428,7 +444,8 @@ public void permissionTest() throws IllegalPathException {
428444
new HashSet<>(),
429445
false,
430446
AuthUtils.serializePartialPathList(new ArrayList<>()),
431-
0);
447+
0,
448+
"");
432449
authorizerResp = client.queryPermission(authorizerReq);
433450
status = authorizerResp.getStatus();
434451
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -446,7 +463,8 @@ public void permissionTest() throws IllegalPathException {
446463
new HashSet<>(),
447464
false,
448465
AuthUtils.serializePartialPathList(new ArrayList<>()),
449-
0);
466+
0,
467+
"");
450468
authorizerResp = client.queryPermission(authorizerReq);
451469
status = authorizerResp.getStatus();
452470
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -465,7 +483,8 @@ public void permissionTest() throws IllegalPathException {
465483
new HashSet<>(),
466484
false,
467485
AuthUtils.serializePartialPathList(new ArrayList<>()),
468-
0);
486+
0,
487+
"");
469488
authorizerResp = client.queryPermission(authorizerReq);
470489
status = authorizerResp.getStatus();
471490
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -508,7 +527,8 @@ public void permissionTest() throws IllegalPathException {
508527
Collections.singleton(PrivilegeType.MANAGE_USER.ordinal()),
509528
false,
510529
AuthUtils.serializePartialPathList(new ArrayList<>()),
511-
0);
530+
0,
531+
"");
512532
status = client.operatePermission(authorizerReq);
513533
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
514534
// in confignode: tempuser0: MANAGE_USER
@@ -533,7 +553,8 @@ public void permissionTest() throws IllegalPathException {
533553
Collections.singleton(PrivilegeType.MANAGE_DATABASE.ordinal()),
534554
false,
535555
AuthUtils.serializePartialPathList(new ArrayList<>()),
536-
0);
556+
0,
557+
"");
537558
status = client.operatePermission(authorizerReq);
538559
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
539560
// in confignode: tempuser0: MANAGE_USER
@@ -559,7 +580,8 @@ public void permissionTest() throws IllegalPathException {
559580
new HashSet<>(),
560581
false,
561582
AuthUtils.serializePartialPathList(new ArrayList<>()),
562-
0);
583+
0,
584+
"");
563585
status = client.operatePermission(authorizerReq);
564586
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
565587

@@ -574,7 +596,8 @@ public void permissionTest() throws IllegalPathException {
574596
new HashSet<>(),
575597
false,
576598
AuthUtils.serializePartialPathList(new ArrayList<>()),
577-
0);
599+
0,
600+
"");
578601
authorizerResp = client.queryPermission(authorizerReq);
579602
status = authorizerResp.getStatus();
580603
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityRelationalIT.java‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,16 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
8383
// clean user
8484
TAuthorizerRelationalReq authorizerReq =
8585
new TAuthorizerRelationalReq(
86-
AuthorRType.LIST_USER.ordinal(), "", "", "", "", "", Collections.emptySet(), false, 0);
86+
AuthorRType.LIST_USER.ordinal(),
87+
"",
88+
"",
89+
"",
90+
"",
91+
"",
92+
Collections.emptySet(),
93+
false,
94+
0,
95+
"");
8796

8897
TAuthorizerResp authorizerResp = client.queryRPermission(authorizerReq);
8998
status = authorizerResp.getStatus();
@@ -102,7 +111,8 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
102111
"",
103112
Collections.emptySet(),
104113
false,
105-
0);
114+
0,
115+
"");
106116
status = client.operateRPermission(authorizerReq);
107117
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
108118
}
@@ -111,7 +121,16 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
111121
// clean role
112122
authorizerReq =
113123
new TAuthorizerRelationalReq(
114-
AuthorRType.LIST_ROLE.ordinal(), "", "", "", "", "", Collections.emptySet(), false, 0);
124+
AuthorRType.LIST_ROLE.ordinal(),
125+
"",
126+
"",
127+
"",
128+
"",
129+
"",
130+
Collections.emptySet(),
131+
false,
132+
0,
133+
"");
115134

116135
authorizerResp = client.queryRPermission(authorizerReq);
117136
status = authorizerResp.getStatus();
@@ -129,7 +148,8 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
129148
"",
130149
Collections.emptySet(),
131150
false,
132-
0);
151+
0,
152+
"");
133153
status = client.operateRPermission(authorizerReq);
134154
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
135155
}
@@ -149,7 +169,8 @@ private void createUserORRoleAndCheck(
149169
"",
150170
Collections.emptySet(),
151171
false,
152-
0);
172+
0,
173+
"");
153174
status = client.operateRPermission(authorizerReq);
154175
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
155176
authorizerReq =
@@ -162,7 +183,8 @@ private void createUserORRoleAndCheck(
162183
"",
163184
Collections.emptySet(),
164185
false,
165-
0);
186+
0,
187+
"");
166188
TAuthorizerResp resp = client.queryRPermission(authorizerReq);
167189
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), resp.getStatus().getCode());
168190
assertTrue(resp.getMemberInfo().contains(name));
@@ -187,7 +209,8 @@ private void grantSysPrivilegeAndCheck(
187209
"",
188210
Collections.singleton(sysPriv.ordinal()),
189211
grantOpt,
190-
0);
212+
0,
213+
"");
191214

192215
status = client.operateRPermission(authorizerRelationalReq);
193216
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -242,7 +265,8 @@ private void grantPrivilegeAndCheck(
242265
union.getTbName() == null ? "" : union.getTbName(),
243266
Collections.singleton(union.getPrivilegeType().ordinal()),
244267
union.isGrantOption(),
245-
0);
268+
0,
269+
"");
246270
status = client.operateRPermission(authorizerRelationalReq);
247271
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
248272
int reqtype = -1;
@@ -360,7 +384,8 @@ public void permissionTest()
360384
"",
361385
Collections.emptySet(),
362386
false,
363-
0));
387+
0,
388+
""));
364389
grantSysPrivilegeAndCheck(client, "user1", "role1", true, PrivilegeType.MANAGE_USER, false);
365390
grantSysPrivilegeAndCheck(client, "user1", "role1", true, PrivilegeType.MANAGE_ROLE, true);
366391
grantPrivilegeAndCheck(
@@ -407,7 +432,8 @@ public void permissionTest()
407432
Collections.emptySet(),
408433
false,
409434
AuthUtils.serializePartialPathList(Collections.emptyList()),
410-
0);
435+
0,
436+
"");
411437
expectSuccess(client.checkRoleOfUser(user_role_req));
412438

413439
// check db is visible

0 commit comments

Comments
 (0)