Skip to content
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

fix subscription permission not working in reset cursor #11132

Merged
merged 1 commit into from
Jun 28, 2021
+10 −2
Merged

fix subscription permission not working in reset cursor #11132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
View file
Original file line number Diff line number Diff line change
@@ -1934,7 +1934,7 @@ private void internalResetCursorForNonPartitionedTopic(AsyncResponse asyncRespon
boolean authoritative) {
try {
validateTopicOwnership(topicName, authoritative);
validateTopicOperation(topicName, TopicOperation.RESET_CURSOR);
validateTopicOperation(topicName, TopicOperation.RESET_CURSOR, subName);

log.info("[{}] [{}] Received reset cursor on subscription {} to time {}",
clientAppId(), topicName, subName, timestamp);
@@ -2157,7 +2157,7 @@ protected void internalResetCursorOnPosition(AsyncResponse asyncResponse, String
return;
} else {
validateTopicOwnership(topicName, authoritative);
validateTopicOperation(topicName, TopicOperation.RESET_CURSOR);
validateTopicOperation(topicName, TopicOperation.RESET_CURSOR, subName);

PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
if (topic == null) {
8 changes: 8 additions & 0 deletions ...-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
View file
Original file line number Diff line number Diff line change
@@ -247,6 +247,14 @@ public void testSubscriberPermission() throws Exception {
// Ok
}

// reset on position
try {
sub1Admin.topics().resetCursor(topicName, subscriptionName, MessageId.earliest);
fail("should have fail with authorization exception");
} catch (org.apache.pulsar.client.admin.PulsarAdminException.NotAuthorizedException e) {
// Ok
}

// now, grant subscription-access to subscriptionRole as well
superAdmin.namespaces().grantPermissionOnSubscription(namespace, subscriptionName,
Sets.newHashSet(otherPrincipal, subscriptionRole));