congbobo184 commented on code in PR #19976:
URL: https://github.com/apache/pulsar/pull/19976#discussion_r1159285748
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -2534,32 +2535,39 @@ protected void handleEndTxn(CommandEndTxn command) {
});
}
- private CompletableFuture<Boolean>
verifyTxnOwnershipForTCToBrokerCommands() {
+ private CompletableFuture<Boolean> isSuperUser() {
+ assert ctx.executor().inEventLoop();
if (service.isAuthenticationEnabled() &&
service.isAuthorizationEnabled()) {
- return getBrokerService()
- .getAuthorizationService()
- .isSuperUser(getPrincipal(), getAuthenticationData());
+ CompletableFuture<Boolean> isAuthRoleAuthorized =
service.getAuthorizationService().isSuperUser(
+ authRole, authenticationData);
+ if (originalPrincipal != null) {
+ CompletableFuture<Boolean> isOriginalPrincipalAuthorized =
service.getAuthorizationService()
+ .isSuperUser(originalPrincipal,
+ originalAuthData != null ? originalAuthData :
authenticationData);
+ return
isOriginalPrincipalAuthorized.thenCombine(isAuthRoleAuthorized,
+ (originalPrincipal, authRole) -> originalPrincipal &&
authRole);
+ } else {
+ return isAuthRoleAuthorized;
+ }
} else {
return CompletableFuture.completedFuture(true);
}
}
private CompletableFuture<Boolean> verifyTxnOwnership(TxnID txnID) {
- final String checkOwner = getPrincipal();
+ assert ctx.executor().inEventLoop();
return service.pulsar().getTransactionMetadataStoreService()
- .verifyTxnOwnership(txnID, checkOwner)
- .thenCompose(isOwner -> {
+ .verifyTxnOwnership(txnID, getPrincipal())
+ .thenComposeAsync(isOwner -> {
if (isOwner) {
return CompletableFuture.completedFuture(true);
}
if (service.isAuthenticationEnabled() &&
service.isAuthorizationEnabled()) {
- return getBrokerService()
- .getAuthorizationService()
- .isSuperUser(checkOwner,
getAuthenticationData());
+ return isSuperUser();
} else {
return CompletableFuture.completedFuture(false);
}
- });
+ }, ctx.executor());
Review Comment:
Why do we need to change the thread? I think `verifyTxnOwnership` will
change the thread right?
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -2534,32 +2535,39 @@ protected void handleEndTxn(CommandEndTxn command) {
});
}
- private CompletableFuture<Boolean>
verifyTxnOwnershipForTCToBrokerCommands() {
+ private CompletableFuture<Boolean> isSuperUser() {
+ assert ctx.executor().inEventLoop();
if (service.isAuthenticationEnabled() &&
service.isAuthorizationEnabled()) {
- return getBrokerService()
- .getAuthorizationService()
- .isSuperUser(getPrincipal(), getAuthenticationData());
+ CompletableFuture<Boolean> isAuthRoleAuthorized =
service.getAuthorizationService().isSuperUser(
+ authRole, authenticationData);
+ if (originalPrincipal != null) {
+ CompletableFuture<Boolean> isOriginalPrincipalAuthorized =
service.getAuthorizationService()
+ .isSuperUser(originalPrincipal,
+ originalAuthData != null ? originalAuthData :
authenticationData);
+ return
isOriginalPrincipalAuthorized.thenCombine(isAuthRoleAuthorized,
+ (originalPrincipal, authRole) -> originalPrincipal &&
authRole);
+ } else {
+ return isAuthRoleAuthorized;
+ }
} else {
return CompletableFuture.completedFuture(true);
}
}
private CompletableFuture<Boolean> verifyTxnOwnership(TxnID txnID) {
- final String checkOwner = getPrincipal();
+ assert ctx.executor().inEventLoop();
Review Comment:
why we need this assert?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
