bug fix: mqq sub auth error (#755)

WeBankBlockchain · Mar 23, 2021 · 2bb35dc · 2bb35dc
1 parent f991f09
commit 2bb35dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/weevent-broker/src/main/java/com/webank/weevent/broker/protocol/mqtt/ProtocolProcess.java b/weevent-broker/src/main/java/com/webank/weevent/broker/protocol/mqtt/ProtocolProcess.java
@@ -227,15 +227,20 @@ public Optional<MqttMessage> process(MqttMessage req, String sessionId, String r
         }
 
         if (auth && req.fixedHeader().messageType().equals(MqttMessageType.SUBSCRIBE)) {
+            boolean isAuth = true;
             List<MqttTopicSubscription> topicSubscriptions = ((MqttSubscribePayload) req.payload()).topicSubscriptions();
             for (MqttTopicSubscription topicSubscription : topicSubscriptions) {
                 String topicName = topicSubscription.topicName();
                 String userName = this.authorSessions.get(sessionId).getUserName();
                 AccountTopicAuthEntity entity = accountTopicAuthRepository.findAllByUserNameAndTopicNameAndDeleteAt(userName, topicName, IsDeleteEnum.NOT_DELETED.getCode());
                 if (null != entity && (entity.getPermission() == SUB_PUB || entity.getPermission() == PUB)) {
-                    return this.subscribe.process(req, clientId, remoteIp);
+                    continue;
                 }
                 log.error("userName:{},topicName:{}, not subscribe permission", userName, topicName);
+                isAuth = false;
+                break;
+            }
+            if (!isAuth) {
                 throw new BrokerException(ErrorCode.MQTT_NOT_PERMISSION);
             }
         }

diff --git a/weevent-broker/src/main/java/com/webank/weevent/broker/protocol/mqtt/store/AuthService.java b/weevent-broker/src/main/java/com/webank/weevent/broker/protocol/mqtt/store/AuthService.java
@@ -30,7 +30,7 @@ public boolean verifyUserName(String userName, String password) {
         if (null == accountEntity) {
             return false;
         }
-        log.info("accountEntity:{}", accountEntity.toString());
+        log.info("accountEntity:{}", accountEntity.getUserName());
         return password.equals(accountEntity.getPassword());
     }
 }
diff --git a/weevent-governance/web/src/components/fileTranspoart.vue b/weevent-governance/web/src/components/fileTranspoart.vue
@@ -147,7 +147,7 @@
       <el-button @click="dialogFormVisible = false">{{$t('common.cancel')}}</el-button>
     </div>
   </el-dialog>
-  
+
   <el-dialog :title="$t('file.secretKey')" :visible.sync="dialogSecretKeyVisible" center width='450px' :close-on-click-modal='false'>
     <el-form :model="form" ref='form' label-position="top">
       <el-form-item>
@@ -576,8 +576,7 @@ export default {
           role: e.role,
           topicName: e.topicName,
           brokerId: localStorage.getItem('brokerId'),
-          groupId: localStorage.getItem('groupId'),
-          nodeAddress: e.nodeAddress
+          groupId: localStorage.getItem('groupId')
         })
       } else {
         // download file