michaeljmarshall commented on code in PR #17411:
URL: https://github.com/apache/pulsar/pull/17411#discussion_r998859353
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -1089,12 +1091,25 @@ protected void handleSubscribe(final CommandSubscribe
subscribe) {
}
Optional<Map<String, String>> subscriptionProperties =
SubscriptionOption.getPropertiesMap(
subscribe.getSubscriptionPropertiesList());
+
+ boolean createTopicIfDoesNotExist = forceTopicCreation ||
(isAuthorizedToCreateTopic
+ &&
service.isAllowAutoTopicCreation(topicName.toString()));
service.getTopic(topicName.toString(),
createTopicIfDoesNotExist)
.thenCompose(optTopic -> {
if (!optTopic.isPresent()) {
- return FutureUtil
- .failedFuture(new
TopicNotFoundException(
- "Topic " + topicName + " does
not exist"));
+ if (isAuthorizedToCreateTopic) {
+ return FutureUtil
+ .failedFuture(new
TopicNotFoundException(
+ "Topic " + topicName + "
does not exist"));
+ } else {
+ String msg = "Topic to subscribe does not
exists and the Client is not"
+ + " authorized to create topic";
+ log.warn("[{}] {} with role {}",
remoteAddress, msg, getPrincipal());
+ consumers.remove(consumerId,
consumerFuture);
+
ctx.writeAndFlush(Commands.newError(requestId, ServerError.AuthorizationError,
+ msg));
+ return null;
Review Comment:
If we return `null` here, we will go to the `thenAccept` block and will call
`consumerFuture.complete(consumer)`. We don't want to complete the future
there. I think we wnat to run the lines 1187 to 1198 that you reference.
Returning a failed future ensures that we jump to the `exceptionally` block on
1169 that will send the error response.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
