You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xi...@apache.org on 2022/12/05 09:59:08 UTC
[pulsar] branch branch-2.10 updated: [improve] clean the empty topicAuthenticationMap in zk when revoke permission (#16815)
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 7b711ca6d11 [improve] clean the empty topicAuthenticationMap in zk when revoke permission (#16815)
7b711ca6d11 is described below
commit 7b711ca6d11fbb91a9c215a73e3ee843f9da2497
Author: ken <16...@qq.com>
AuthorDate: Sun Sep 4 12:06:55 2022 +0800
[improve] clean the empty topicAuthenticationMap in zk when revoke permission (#16815)
Co-authored-by: fanjianye <fa...@bigo.sg>
(cherry picked from commit d139d884bcf38d8d9f2ff99bb355591819b85ef5)
---
.../broker/admin/impl/PersistentTopicsBase.java | 8 ++++-
.../api/AuthenticatedProducerConsumerTest.java | 41 ++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index dbcb44a5f38..4ad3c6245f0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -338,7 +338,13 @@ public class PersistentTopicsBase extends AdminResource {
}
// Write the new policies to metadata store
return namespaceResources().setPoliciesAsync(namespaceName, p -> {
- p.auth_policies.getTopicAuthentication().get(topicUri).remove(role);
+ p.auth_policies.getTopicAuthentication().computeIfPresent(topicUri, (k, roles) -> {
+ roles.remove(role);
+ if (roles.isEmpty()) {
+ return null;
+ }
+ return roles;
+ });
return p;
}).thenAccept(__ ->
log.info("[{}] Successfully revoke access for role {} - topic {}", clientAppId(), role,
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java
index 046b26846e2..6d9135af1ac 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java
@@ -403,4 +403,45 @@ public class AuthenticatedProducerConsumerTest extends ProducerConsumerBase {
admin.tenants().deleteTenant("p1");
admin.clusters().deleteCluster("test");
}
+
+ @Test
+ public void testCleanupEmptyTopicAuthenticationMap() throws Exception {
+ Map<String, String> authParams = new HashMap<>();
+ authParams.put("tlsCertFile", TLS_CLIENT_CERT_FILE_PATH);
+ authParams.put("tlsKeyFile", TLS_CLIENT_KEY_FILE_PATH);
+ Authentication authTls = new AuthenticationTls();
+ authTls.configure(authParams);
+ internalSetup(authTls);
+
+ admin.clusters().createCluster("test", ClusterData.builder().build());
+ admin.tenants().createTenant("p1",
+ new TenantInfoImpl(Collections.emptySet(), new HashSet<>(admin.clusters().getClusters())));
+ admin.namespaces().createNamespace("p1/ns1");
+
+ String topic = "persistent://p1/ns1/topic";
+ admin.topics().createNonPartitionedTopic(topic);
+ assertFalse(pulsar.getPulsarResources().getNamespaceResources().getPolicies(NamespaceName.get("p1/ns1"))
+ .get().auth_policies.getTopicAuthentication().containsKey(topic));
+
+ // grant permission
+ admin.topics().grantPermission(topic, "test-user-1", EnumSet.of(AuthAction.consume));
+ Awaitility.await().untilAsserted(() -> {
+ assertTrue(pulsar.getPulsarResources().getNamespaceResources().getPolicies(NamespaceName.get("p1/ns1"))
+ .get().auth_policies.getTopicAuthentication().containsKey(topic));
+ });
+
+ // revoke permission
+ admin.topics().revokePermissions(topic, "test-user-1");
+ Awaitility.await().untilAsserted(() -> {
+ assertFalse(pulsar.getPulsarResources().getNamespaceResources().getPolicies(NamespaceName.get("p1/ns1"))
+ .get().auth_policies.getTopicAuthentication().containsKey(topic));
+ });
+
+ // grant permission again
+ admin.topics().grantPermission(topic, "test-user-1", EnumSet.of(AuthAction.consume));
+ Awaitility.await().untilAsserted(() -> {
+ assertTrue(pulsar.getPulsarResources().getNamespaceResources().getPolicies(NamespaceName.get("p1/ns1"))
+ .get().auth_policies.getTopicAuthentication().containsKey(topic));
+ });
+ }
}