[rocketmq] branch develop updated: [ISSUE #6466] Add ForbiddenType when Broker process PullMessage return no permission

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new eb804014f [ISSUE #6466] Add ForbiddenType when Broker process 
PullMessage return no permission
eb804014f is described below

commit eb804014f191eb3d4cf680398b5c661979eb27df
Author: mxsm <ljbm...@gmail.com>
AuthorDate: Sun Mar 26 11:00:57 2023 +0800

    [ISSUE #6466] Add ForbiddenType when Broker process PullMessage return no 
permission
---
 .../org/apache/rocketmq/broker/processor/PullMessageProcessor.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
index c15f8b323..9286cf913 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
@@ -308,6 +308,7 @@ public class PullMessageProcessor implements 
NettyRequestProcessor {
 
         if 
(!PermName.isReadable(this.brokerController.getBrokerConfig().getBrokerPermission()))
 {
             response.setCode(ResponseCode.NO_PERMISSION);
+            responseHeader.setForbiddenType(ForbiddenType.BROKER_FORBIDDEN);
             response.setRemark(String.format("the broker[%s] pulling message 
is forbidden",
                 this.brokerController.getBrokerConfig().getBrokerIP1()));
             return response;
@@ -315,6 +316,7 @@ public class PullMessageProcessor implements 
NettyRequestProcessor {
 
         if (request.getCode() == RequestCode.LITE_PULL_MESSAGE && 
!this.brokerController.getBrokerConfig().isLitePullMessageEnable()) {
             response.setCode(ResponseCode.NO_PERMISSION);
+            responseHeader.setForbiddenType(ForbiddenType.BROKER_FORBIDDEN);
             response.setRemark(
                 "the broker[" + 
this.brokerController.getBrokerConfig().getBrokerIP1() + "] for lite pull 
consumer is forbidden");
             return response;
@@ -335,9 +337,6 @@ public class PullMessageProcessor implements 
NettyRequestProcessor {
             return response;
         }
 
-        final boolean hasCommitOffsetFlag = 
PullSysFlag.hasCommitOffsetFlag(requestHeader.getSysFlag());
-        final boolean hasSubscriptionFlag = 
PullSysFlag.hasSubscriptionFlag(requestHeader.getSysFlag());
-
         TopicConfig topicConfig = 
this.brokerController.getTopicConfigManager().selectTopicConfig(requestHeader.getTopic());
         if (null == topicConfig) {
             LOGGER.error("the topic {} not exist, consumer: {}", 
requestHeader.getTopic(), RemotingHelper.parseChannelRemoteAddr(channel));
@@ -386,6 +385,7 @@ public class PullMessageProcessor implements 
NettyRequestProcessor {
 
         SubscriptionData subscriptionData = null;
         ConsumerFilterData consumerFilterData = null;
+        final boolean hasSubscriptionFlag = 
PullSysFlag.hasSubscriptionFlag(requestHeader.getSysFlag());
         if (hasSubscriptionFlag) {
             try {
                 subscriptionData = FilterAPI.build(