Skip to content

[fix][broker] Only validate superuser access if authz enabled #19989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaeljmarshall merged 5 commits into from
Apr 5, 2023
Merged

[fix][broker] Only validate superuser access if authz enabled #19989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b76dd4
[fix][broker] Only validate superuser access if authz enabled
michaeljmarshall Apr 1, 2023
bff583a
Fix testUpdateTransactionCoordinatorNumber: enable authorization
michaeljmarshall Apr 4, 2023
c083f8e
Remove misleading authz config from test
michaeljmarshall Apr 5, 2023
1bad342
Revert "Remove misleading authz config from test"
michaeljmarshall Apr 5, 2023
04f9e98
Include authentication check due to hack
michaeljmarshall Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ protected boolean hasSuperUserAccess() {
return true;
}

public CompletableFuture<Void> validateSuperUserAccessAsync(){
if (!config().isAuthenticationEnabled()) {
public CompletableFuture<Void> validateSuperUserAccessAsync() {
if (!config().isAuthenticationEnabled() || !config().isAuthorizationEnabled()) {
return CompletableFuture.completedFuture(null);
}
String appId = clientAppId();
Expand Down Expand Up @@ -221,22 +221,15 @@ public CompletableFuture<Void> validateSuperUserAccessAsync(){
}
});
} else {
if (config().isAuthorizationEnabled()) {
return pulsar.getBrokerService()
.getAuthorizationService()
.isSuperUser(appId, clientAuthData())
.thenAccept(proxyAuthorizationSuccess -> {
if (!proxyAuthorizationSuccess) {
throw new RestException(Status.UNAUTHORIZED,
"This operation requires super-user access");
}
});
}
if (log.isDebugEnabled()) {
log.debug("Successfully authorized {} as super-user",
appId);
}
return CompletableFuture.completedFuture(null);
return pulsar.getBrokerService()
.getAuthorizationService()
.isSuperUser(appId, clientAuthData())
.thenAccept(proxyAuthorizationSuccess -> {
if (!proxyAuthorizationSuccess) {
throw new RestException(Status.UNAUTHORIZED,
"This operation requires super-user access");
}
});
}
}

Expand Down
1 change: 1 addition & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@ public void testUpdateTransactionCoordinatorNumber() throws Exception {
Awaitility.await().until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() ==
coordinatorSize * 2);
pulsar.getConfiguration().setAuthenticationEnabled(true);
pulsar.getConfiguration().setAuthorizationEnabled(true);
Set<String> proxyRoles = spy(Set.class);
doReturn(true).when(proxyRoles).contains(any());
pulsar.getConfiguration().setProxyRoles(proxyRoles);
Expand Down