Skip to content

Commit 9135ce6

Browse files
CaideyipiCaideyipi
committed
refactor
1 parent b054a0f commit 9135ce6

File tree

8 files changed

+175
-151
lines changed

8 files changed

+175
-151
lines changed

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
386386
((PipeAlterEncodingCompressorPlan) plan).setPatternTreeBytes(tree.serialize());
387387
configManager
388388
.getAuditLogger()
389-
.recordAuditLog(
389+
.recordObjectAuthenticationAuditLog(
390390
userEntity
391391
.setPrivilegeType(PrivilegeType.WRITE_SCHEMA)
392392
.setResult(!tree.isEmpty()),
@@ -505,7 +505,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
505505
}
506506
configManager
507507
.getAuditLogger()
508-
.recordAuditLog(
508+
.recordObjectAuthenticationAuditLog(
509509
userEntity.setPrivilegeType(PrivilegeType.SECURITY).setResult(true),
510510
() -> entityName);
511511
return StatusUtils.OK;
@@ -528,7 +528,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
528528
}
529529
configManager
530530
.getAuditLogger()
531-
.recordAuditLog(
531+
.recordObjectAuthenticationAuditLog(
532532
userEntity.setPrivilegeType(PrivilegeType.SECURITY).setResult(true),
533533
() -> entityName);
534534
return StatusUtils.OK;
@@ -556,7 +556,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
556556
}
557557
configManager
558558
.getAuditLogger()
559-
.recordAuditLog(
559+
.recordObjectAuthenticationAuditLog(
560560
userEntity.setPrivilegeType(PrivilegeType.SECURITY).setResult(true),
561561
() -> entityName);
562562
return StatusUtils.OK;
@@ -582,7 +582,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
582582
}
583583
configManager
584584
.getAuditLogger()
585-
.recordAuditLog(
585+
.recordObjectAuthenticationAuditLog(
586586
userEntity.setPrivilegeType(PrivilegeType.SECURITY).setResult(true),
587587
() -> entityName);
588588
return StatusUtils.OK;
@@ -610,7 +610,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
610610
}
611611
configManager
612612
.getAuditLogger()
613-
.recordAuditLog(
613+
.recordObjectAuthenticationAuditLog(
614614
userEntity.setPrivilegeType(PrivilegeType.SECURITY).setResult(true),
615615
() -> entityName);
616616
return StatusUtils.OK;
@@ -633,7 +633,7 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
633633
}
634634
configManager
635635
.getAuditLogger()
636-
.recordAuditLog(
636+
.recordObjectAuthenticationAuditLog(
637637
userEntity.setPrivilegeType(PrivilegeType.SECURITY).setResult(true),
638638
() -> entityName);
639639
return StatusUtils.OK;
@@ -644,7 +644,8 @@ private TSStatus checkPermission(final ConfigPhysicalPlan plan) throws IOExcepti
644644
if (((AuthorPlan) plan).getUserName().equals(username)) {
645645
configManager
646646
.getAuditLogger()
647-
.recordAuditLog(userEntity.setPrivilegeType(null).setResult(true), () -> username);
647+
.recordObjectAuthenticationAuditLog(
648+
userEntity.setPrivilegeType(null).setResult(true), () -> username);
648649
return StatusUtils.OK;
649650
}
650651
return checkGlobalStatus(
@@ -690,7 +691,7 @@ private TSStatus checkDatabaseStatus(
690691
userEntity.getUsername(), new PrivilegeUnion(database, privilegeType, grantOption))
691692
.getStatus();
692693
if (result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
693-
auditLogger.recordAuditLog(
694+
auditLogger.recordObjectAuthenticationAuditLog(
694695
userEntity
695696
.setPrivilegeType(privilegeType)
696697
.setResult(result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()),
@@ -722,7 +723,7 @@ private TSStatus checkTableStatus(
722723
new PrivilegeUnion(database, tableName, privilegeType, grantOption))
723724
.getStatus();
724725
if (result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode() || isLastCheck) {
725-
auditLogger.recordAuditLog(
726+
auditLogger.recordObjectAuthenticationAuditLog(
726727
userEntity
727728
.setPrivilegeType(privilegeType)
728729
.setResult(result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()),

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTablePrivilegeParseVisitor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private boolean isDatabaseVisible(final IAuditEntity userEntity, final String da
9292
.getCode()
9393
== TSStatusCode.SUCCESS_STATUS.getStatusCode();
9494
if (result) {
95-
logger.recordAuditLog(
95+
logger.recordObjectAuthenticationAuditLog(
9696
userEntity.setPrivilegeType(PrivilegeType.READ_SCHEMA).setResult(true), () -> database);
9797
return true;
9898
}
@@ -185,7 +185,7 @@ private boolean isTableVisible(
185185
.getCode()
186186
== TSStatusCode.SUCCESS_STATUS.getStatusCode();
187187
if (result) {
188-
logger.recordAuditLog(
188+
logger.recordObjectAuthenticationAuditLog(
189189
userEntity.setPrivilegeType(PrivilegeType.READ_SCHEMA).setResult(true), () -> database);
190190
return true;
191191
}

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePrivilegeParseVisitor.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ public static Optional<ConfigPhysicalPlan> visitUserPlan(
220220
ConfigNode.getInstance()
221221
.getConfigManager()
222222
.getAuditLogger()
223-
.recordAuditLog(userEntity.setPrivilegeType(null).setResult(true), () -> auditObject);
223+
.recordObjectAuthenticationAuditLog(
224+
userEntity.setPrivilegeType(null).setResult(true), () -> auditObject);
224225
return Optional.of(plan);
225226
}
226227
return hasGlobalPrivilege(
@@ -242,7 +243,8 @@ public static Optional<ConfigPhysicalPlan> visitRolePlan(
242243
== TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
243244
configManager
244245
.getAuditLogger()
245-
.recordAuditLog(userEntity.setPrivilegeType(null).setResult(true), () -> auditObject);
246+
.recordObjectAuthenticationAuditLog(
247+
userEntity.setPrivilegeType(null).setResult(true), () -> auditObject);
246248
return Optional.of(plan);
247249
}
248250
} catch (final Exception ignore) {
@@ -265,23 +267,23 @@ public Optional<ConfigPhysicalPlan> visitPipeDeleteTimeSeries(
265267
final PathPatternTree intersectedTree =
266268
originalTree.intersectWithFullPathPrefixTree(getAuthorizedPTree(userEntity));
267269
if (!skip && !originalTree.equals(intersectedTree)) {
268-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
270+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
269271
throw new AccessDeniedException(
270272
"Not has privilege to transfer plan: " + pipeDeleteTimeSeriesPlan);
271273
}
272274
final boolean result = !intersectedTree.isEmpty();
273-
logger.recordAuditLog(userEntity.setResult(result), () -> auditObject);
275+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(result), () -> auditObject);
274276
return result
275277
? Optional.of(new PipeDeleteTimeSeriesPlan(intersectedTree.serialize()))
276278
: Optional.empty();
277279
} catch (final IOException e) {
278280
LOGGER.warn(
279281
"Serialization failed for the delete time series plan in pipe transmission, skip transfer",
280282
e);
281-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
283+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
282284
return Optional.empty();
283285
} catch (final AuthException e) {
284-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
286+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
285287
if (skip) {
286288
return Optional.empty();
287289
} else {
@@ -303,23 +305,23 @@ public Optional<ConfigPhysicalPlan> visitPipeDeleteLogicalView(
303305
final PathPatternTree intersectedTree =
304306
originalTree.intersectWithFullPathPrefixTree(getAuthorizedPTree(userEntity));
305307
if (!skip && !originalTree.equals(intersectedTree)) {
306-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
308+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
307309
throw new AccessDeniedException(
308310
"Not has privilege to transfer plan: " + pipeDeleteLogicalViewPlan);
309311
}
310312
final boolean result = !intersectedTree.isEmpty();
311-
logger.recordAuditLog(userEntity.setResult(result), () -> auditObject);
313+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(result), () -> auditObject);
312314
return result
313315
? Optional.of(new PipeDeleteLogicalViewPlan(intersectedTree.serialize()))
314316
: Optional.empty();
315317
} catch (final IOException e) {
316318
LOGGER.warn(
317319
"Serialization failed for the delete time series plan in pipe transmission, skip transfer",
318320
e);
319-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
321+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
320322
return Optional.empty();
321323
} catch (final AuthException e) {
322-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
324+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
323325
if (skip) {
324326
return Optional.empty();
325327
} else {
@@ -350,12 +352,12 @@ public Optional<ConfigPhysicalPlan> visitPipeDeactivateTemplate(
350352
}
351353
}
352354
final boolean result = !newTemplateSetInfo.isEmpty();
353-
logger.recordAuditLog(userEntity.setResult(result), () -> auditObject);
355+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(result), () -> auditObject);
354356
return !newTemplateSetInfo.isEmpty()
355357
? Optional.of(new PipeDeactivateTemplatePlan(newTemplateSetInfo))
356358
: Optional.empty();
357359
} catch (final AuthException e) {
358-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
360+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
359361
if (skip) {
360362
return Optional.empty();
361363
} else {
@@ -379,12 +381,12 @@ public Optional<ConfigPhysicalPlan> visitTTL(
379381
// pattern and TTL path are each either a prefix path or a full path
380382
final boolean result =
381383
!paths.isEmpty() && paths.get(0).getNodeLength() == setTTLPlan.getPathPattern().length;
382-
logger.recordAuditLog(userEntity.setResult(result), () -> auditObject);
384+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(result), () -> auditObject);
383385
return result
384386
? Optional.of(new SetTTLPlan(paths.get(0).getNodes(), setTTLPlan.getTTL()))
385387
: Optional.empty();
386388
} catch (final AuthException e) {
387-
logger.recordAuditLog(userEntity.setResult(false), () -> auditObject);
389+
logger.recordObjectAuthenticationAuditLog(userEntity.setResult(false), () -> auditObject);
388390
if (skip) {
389391
return Optional.empty();
390392
} else {
@@ -448,7 +450,7 @@ public static TSStatus checkGlobalOrAnyStatus(
448450
userEntity.getUsername(), new PrivilegeUnion(privilegeType, grantOption, isAny))
449451
.getStatus();
450452
if (result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode() || isLastCheck) {
451-
logger.recordAuditLog(
453+
logger.recordObjectAuthenticationAuditLog(
452454
userEntity
453455
.setPrivilegeType(privilegeType)
454456
.setResult(result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()),
@@ -491,7 +493,7 @@ public static TSStatus checkPathsStatus(
491493
new PrivilegeUnion(paths, privilegeType, Objects.nonNull(grantName)))
492494
.getStatus();
493495
if (result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode() || isLastCheck) {
494-
logger.recordAuditLog(
496+
logger.recordObjectAuthenticationAuditLog(
495497
userEntity
496498
.setPrivilegeType(PrivilegeType.READ_SCHEMA)
497499
.setResult(result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()),

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ protected IConfigTask visitShowAvailableUrls(
501501
final ShowAvailableUrls showAvailableUrls, final MPPQueryContext context) {
502502
context.setQueryType(QueryType.READ);
503503
DNAuditLogger.getInstance()
504-
.recordAuditLog(
504+
.recordObjectAuthenticationAuditLog(
505505
context.setAuditLogOperation(AuditLogOperation.QUERY).setResult(true), () -> "");
506506
return new ShowAvailableUrlsTask();
507507
}

0 commit comments

Comments
 (0)