Skip to content

Fix wrong prompt exception when get non-persistent topic list without GET_BUDNLE permission #14638

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
codelipenghui merged 3 commits into from
Mar 12, 2022
+62 −33
Merged

Fix wrong prompt exception when get non-persistent topic list without GET_BUDNLE permission #14638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aecdb8e
Fix get wrong prompt exception when get non-persistent topic list wit…
Technoboy- Mar 10, 2022
c988536
update.
Technoboy- Mar 10, 2022
1c20868
add v1 support.
Technoboy- Mar 11, 2022
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
25 changes: 12 additions & 13 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ public void getList(@Suspended final AsyncResponse asyncResponse, @PathParam("pr
Policies policies = null;
NamespaceName nsName = null;
try {
validateNamespaceName(property, cluster, namespace);
validateNamespaceOperation(namespaceName, NamespaceOperation.GET_TOPICS);
policies = getNamespacePolicies(property, cluster, namespace);
nsName = NamespaceName.get(property, cluster, namespace);
Expand Down Expand Up @@ -237,22 +238,19 @@ public void getList(@Suspended final AsyncResponse asyncResponse, @PathParam("pr
}
}

final List<String> topics = Lists.newArrayList();
FutureUtil.waitForAll(futures).handle((result, exception) -> {
for (int i = 0; i < futures.size(); i++) {
try {
if (futures.get(i).isDone() && futures.get(i).get() != null) {
topics.addAll(futures.get(i).get());
FutureUtil.waitForAll(futures).whenComplete((result, ex) -> {
if (ex != null) {
resumeAsyncResponseExceptionally(asyncResponse, ex);
} else {
final List<String> topics = Lists.newArrayList();
for (int i = 0; i < futures.size(); i++) {
List<String> topicList = futures.get(i).join();
if (topicList != null) {
topics.addAll(topicList);
}
} catch (InterruptedException | ExecutionException e) {
log.error("[{}] Failed to get list of topics under namespace {}/{}/{}", clientAppId(), property,
cluster, namespace, e);
asyncResponse.resume(new RestException(e instanceof ExecutionException ? e.getCause() : e));
return null;
}
asyncResponse.resume(topics);
}
asyncResponse.resume(topics);
return null;
});
}

Expand All @@ -269,6 +267,7 @@ public List<String> getListFromBundle(@PathParam("property") String property, @P
@PathParam("bundle") String bundleRange) {
log.info("[{}] list of topics on namespace bundle {}/{}/{}/{}", clientAppId(), property, cluster, namespace,
bundleRange);
validateNamespaceName(property, cluster, namespace);
validateNamespaceOperation(namespaceName, NamespaceOperation.GET_BUNDLE);
Policies policies = getNamespacePolicies(property, cluster, namespace);
if (!cluster.equals(Constants.GLOBAL_CLUSTER)) {
Expand Down
31 changes: 14 additions & 17 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,26 +414,23 @@ public void getList(
}
}

final List<String> topics = Lists.newArrayList();
FutureUtil.waitForAll(futures).handle((result, exception) -> {
for (int i = 0; i < futures.size(); i++) {
try {
if (futures.get(i).isDone() && futures.get(i).get() != null) {
topics.addAll(futures.get(i).get());
FutureUtil.waitForAll(futures).whenComplete((result, ex) -> {
if (ex != null) {
resumeAsyncResponseExceptionally(asyncResponse, ex);
} else {
final List<String> topics = Lists.newArrayList();
for (int i = 0; i < futures.size(); i++) {
List<String> topicList = futures.get(i).join();
if (topicList != null) {
topics.addAll(topicList);
}
} catch (InterruptedException | ExecutionException e) {
log.error("[{}] Failed to get list of topics under namespace {}", clientAppId(), namespaceName, e);
asyncResponse.resume(new RestException(e instanceof ExecutionException ? e.getCause() : e));
return null;
}
final List<String> nonPersistentTopics =
topics.stream()
.filter(name -> !TopicName.get(name).isPersistent())
.collect(Collectors.toList());
asyncResponse.resume(nonPersistentTopics);
}

final List<String> nonPersistentTopics =
topics.stream()
.filter(name -> !TopicName.get(name).isPersistent())
.collect(Collectors.toList());
asyncResponse.resume(nonPersistentTopics);
return null;
});
}

Expand Down
39 changes: 36 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
*/
package org.apache.pulsar.broker.auth;

import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;

import java.util.EnumSet;

import org.apache.pulsar.broker.authorization.AuthorizationService;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminBuilder;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.common.naming.TopicDomain;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.AuthAction;
import org.apache.pulsar.common.policies.data.ClusterData;
Expand All @@ -35,7 +38,6 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import com.google.common.collect.Sets;

@Test(groups = "flaky")
Expand Down Expand Up @@ -229,6 +231,37 @@ public void simple() throws Exception {
admin.clusters().deleteCluster("c1");
}

@Test
public void testGetListWithoutGetBundleOp() throws Exception {
String tenant = "p1";
String namespaceV1 = "p1/global/ns1";
String namespaceV2 = "p1/ns2";
admin.clusters().createCluster("c1", ClusterData.builder().build());
admin.tenants().createTenant(tenant, new TenantInfoImpl(Sets.newHashSet("role1"), Sets.newHashSet("c1")));
admin.namespaces().createNamespace(namespaceV1, Sets.newHashSet("c1"));
admin.namespaces().grantPermissionOnNamespace(namespaceV1, "pass.pass2", EnumSet.of(AuthAction.produce));
admin.namespaces().createNamespace(namespaceV2, Sets.newHashSet("c1"));
admin.namespaces().grantPermissionOnNamespace(namespaceV2, "pass.pass2", EnumSet.of(AuthAction.produce));
PulsarAdmin admin2 = PulsarAdmin.builder().serviceHttpUrl(brokerUrl != null
? brokerUrl.toString()
: brokerUrlTls.toString())
.authentication(new MockAuthentication("pass.pass2"))
.build();
when(pulsar.getAdminClient()).thenReturn(admin2);
try {
admin2.topics().getList(namespaceV1, TopicDomain.non_persistent);
} catch (Exception ex) {
assertTrue(ex instanceof PulsarAdminException.NotAuthorizedException);
assertEquals(ex.getMessage(), "Unauthorized to validateNamespaceOperation for operation [GET_BUNDLE] on namespace [p1/global/ns1]");
}
try {
admin2.topics().getList(namespaceV2, TopicDomain.non_persistent);
} catch (Exception ex) {
assertTrue(ex instanceof PulsarAdminException.NotAuthorizedException);
assertEquals(ex.getMessage(), "Unauthorized to validateNamespaceOperation for operation [GET_BUNDLE] on namespace [p1/ns2]");
}
}

private static void waitForChange() {
try {
Thread.sleep(100);
Expand Down