|
19 | 19 | package org.apache.pulsar.websocket;
|
20 | 20 |
|
21 | 21 | import static com.google.common.base.Preconditions.checkArgument;
|
| 22 | +import static java.util.concurrent.TimeUnit.SECONDS; |
22 | 23 | import com.fasterxml.jackson.core.JsonProcessingException;
|
23 | 24 | import com.google.common.base.Enums;
|
24 | 25 | import com.google.common.base.Splitter;
|
|
33 | 34 | import java.util.concurrent.atomic.LongAdder;
|
34 | 35 | import javax.servlet.http.HttpServletRequest;
|
35 | 36 | import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
|
| 37 | +import org.apache.pulsar.broker.authentication.AuthenticationDataSubscription; |
36 | 38 | import org.apache.pulsar.client.api.Consumer;
|
37 | 39 | import org.apache.pulsar.client.api.ConsumerBuilder;
|
38 | 40 | import org.apache.pulsar.client.api.ConsumerCryptoFailureAction;
|
|
47 | 49 | import org.apache.pulsar.client.api.TopicMessageId;
|
48 | 50 | import org.apache.pulsar.client.impl.ConsumerBuilderImpl;
|
49 | 51 | import org.apache.pulsar.client.impl.TopicMessageIdImpl;
|
| 52 | +import org.apache.pulsar.common.policies.data.TopicOperation; |
50 | 53 | import org.apache.pulsar.common.util.Codec;
|
51 | 54 | import org.apache.pulsar.common.util.DateFormatter;
|
52 | 55 | import org.apache.pulsar.websocket.data.ConsumerCommand;
|
@@ -467,8 +470,21 @@ protected ConsumerBuilder<byte[]> getConsumerConfiguration(PulsarClient client)
|
467 | 470 |
|
468 | 471 | @Override
|
469 | 472 | protected Boolean isAuthorized(String authRole, AuthenticationDataSource authenticationData) throws Exception {
|
470 |
| - return service.getAuthorizationService().canConsume(topic, authRole, authenticationData, |
471 |
| - this.subscription); |
| 473 | + try { |
| 474 | + AuthenticationDataSubscription subscription = new AuthenticationDataSubscription(authenticationData, |
| 475 | + this.subscription); |
| 476 | + return service.getAuthorizationService() |
| 477 | + .allowTopicOperationAsync(topic, TopicOperation.CONSUME, authRole, subscription) |
| 478 | + .get(service.getConfig().getMetadataStoreOperationTimeoutSeconds(), SECONDS); |
| 479 | + } catch (InterruptedException e) { |
| 480 | + log.warn("Time-out {} sec while checking authorization on {} ", |
| 481 | + service.getConfig().getMetadataStoreOperationTimeoutSeconds(), topic); |
| 482 | + throw e; |
| 483 | + } catch (Exception e) { |
| 484 | + log.warn("Consumer-client with Role - {} failed to get permissions for topic - {}. {}", authRole, topic, |
| 485 | + e.getMessage()); |
| 486 | + throw e; |
| 487 | + } |
472 | 488 | }
|
473 | 489 |
|
474 | 490 | public static String extractSubscription(HttpServletRequest request) {
|
|
0 commit comments