You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2021/12/06 18:01:47 UTC
[pulsar] branch branch-2.9 updated: [Authorization] Revert new AuthorizationProvider method (#13133)
This is an automated email from the ASF dual-hosted git repository.
mmarshall pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 9b861b2 [Authorization] Revert new AuthorizationProvider method (#13133)
9b861b2 is described below
commit 9b861b2b995835a217faeff6cc12c6fc04cb9b18
Author: Michael Marshall <mm...@apache.org>
AuthorDate: Mon Dec 6 08:22:00 2021 -0600
[Authorization] Revert new AuthorizationProvider method (#13133)
(cherry picked from commit d1156caf0dbe8c04a604a28a32800281d7ee2d2a)
---
.../pulsar/broker/authorization/AuthorizationProvider.java | 10 ----------
.../authorization/MultiRolesTokenAuthorizationProvider.java | 5 -----
.../broker/authorization/PulsarAuthorizationProvider.java | 7 +------
.../apache/pulsar/broker/auth/MockAuthorizationProvider.java | 6 ------
.../pulsar/client/api/AuthorizationProducerConsumerTest.java | 5 -----
.../pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java | 5 -----
6 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java
index ca1bfbf..c83ae4c 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java
@@ -185,16 +185,6 @@ public interface AuthorizationProvider extends Closeable {
AuthenticationDataSource authenticationData);
/**
- * Allow consume operations with in this namespace
- * @param namespaceName The namespace that the consume operations can be executed in
- * @param role The role to check
- * @param authenticationData authentication data related to the role
- * @return a boolean to determine whether authorized or not
- */
- CompletableFuture<Boolean> allowConsumeOpsAsync(NamespaceName namespaceName, String role,
- AuthenticationDataSource authenticationData);
-
- /**
*
* Grant authorization-action permission on a namespace to the given client
*
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java
index 89ed834..dcdf779 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java
@@ -211,11 +211,6 @@ public class MultiRolesTokenAuthorizationProvider extends PulsarAuthorizationPro
}
@Override
- public CompletableFuture<Boolean> allowConsumeOpsAsync(NamespaceName namespaceName, String role, AuthenticationDataSource authenticationData) {
- return authorize(authenticationData, r -> super.allowConsumeOpsAsync(namespaceName, r, authenticationData));
- }
-
- @Override
public CompletableFuture<Boolean> allowTenantOperationAsync(String tenantName,
String role,
TenantOperation operation,
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java
index 774aa38..b6b1bafd 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java
@@ -227,11 +227,6 @@ public class PulsarAuthorizationProvider implements AuthorizationProvider {
return allowTheSpecifiedActionOpsAsync(namespaceName, role, authenticationData, AuthAction.sinks);
}
- @Override
- public CompletableFuture<Boolean> allowConsumeOpsAsync(NamespaceName namespaceName, String role, AuthenticationDataSource authenticationData) {
- return allowTheSpecifiedActionOpsAsync(namespaceName, role, authenticationData, AuthAction.consume);
- }
-
private CompletableFuture<Boolean> allowTheSpecifiedActionOpsAsync(NamespaceName namespaceName, String role,
AuthenticationDataSource authenticationData,
AuthAction authAction) {
@@ -533,7 +528,7 @@ public class PulsarAuthorizationProvider implements AuthorizationProvider {
case GET_TOPICS:
case UNSUBSCRIBE:
case CLEAR_BACKLOG:
- isAuthorizedFuture = allowConsumeOpsAsync(namespaceName, role, authData);
+ isAuthorizedFuture = allowTheSpecifiedActionOpsAsync(namespaceName, role, authData, AuthAction.consume);
break;
default:
isAuthorizedFuture = CompletableFuture.completedFuture(false);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java
index 74ba55e..3af2568 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java
@@ -97,12 +97,6 @@ public class MockAuthorizationProvider implements AuthorizationProvider {
}
@Override
- public CompletableFuture<Boolean> allowConsumeOpsAsync(NamespaceName namespaceName, String role,
- AuthenticationDataSource authenticationData) {
- return roleAuthorizedAsync(role);
- }
-
- @Override
public CompletableFuture<Void> grantPermissionAsync(NamespaceName namespace, Set<AuthAction> actions, String role,
String authDataJson) {
return CompletableFuture.completedFuture(null);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
index d852640..d852a9b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
@@ -615,11 +615,6 @@ public class AuthorizationProducerConsumerTest extends ProducerConsumerBase {
}
@Override
- public CompletableFuture<Boolean> allowConsumeOpsAsync(NamespaceName namespaceName, String role, AuthenticationDataSource authenticationData) {
- return null;
- }
-
- @Override
public CompletableFuture<Void> grantPermissionAsync(NamespaceName namespace, Set<AuthAction> actions,
String role, String authenticationData) {
return CompletableFuture.completedFuture(null);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java
index 40c31db..b1328a2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java
@@ -298,11 +298,6 @@ public class PatternTopicsConsumerImplAuthTest extends ProducerConsumerBase {
}
@Override
- public CompletableFuture<Boolean> allowConsumeOpsAsync(NamespaceName namespaceName, String role, AuthenticationDataSource authenticationData) {
- return null;
- }
-
- @Override
public CompletableFuture<Void> grantPermissionAsync(NamespaceName namespace, Set<AuthAction> actions,
String role, String authenticationData) {
return CompletableFuture.completedFuture(null);