From bace7ec70cb63713d26af0e5d4911885aef38859 Mon Sep 17 00:00:00 2001
From: "heavyrain.lee" <heavyrain.lee@gmail.com>
Date: Wed, 8 Jan 2020 23:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=AF=B9=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moquette/imhandler/LoadRemoteMessagesHandler.java  |  8 ++++++++
 .../io/moquette/persistence/MemoryMessagesStore.java   | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java b/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java
index 7dd099a5..58ac09bd 100644
--- a/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java
@@ -8,6 +8,7 @@
 
 package io.moquette.imhandler;
 
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
@@ -24,6 +25,13 @@ public class LoadRemoteMessagesHandler extends IMHandler<WFCMessage.LoadRemoteMe
         if (beforeUid == 0) {
             beforeUid = Long.MAX_VALUE;
         }
+
+        if (request.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
+            if (!m_messagesStore.isMemberInGroup(fromUser, request.getConversation().getTarget())) {
+                return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+            }
+        }
+
         WFCMessage.PullMessageResult result = m_messagesStore.loadRemoteMessages(fromUser, request.getConversation(), beforeUid, request.getCount());
         byte[] data = result.toByteArray();
         LOG.info("User {} load message with count({}), payload size({})", fromUser, result.getMessageCount(), data.length);
diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index 40c8adaa..f2a6629f 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -1259,8 +1259,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (members == null || members.size() == 0) {
             members = loadGroupMemberFromDB(hzInstance, groupId);
         }
-        for (WFCMessage.GroupMember member : members
-            ) {
+        
+        boolean isInGroup = false;
+        for (WFCMessage.GroupMember member : members) {
             if (member.getMemberId().equals(memberId)) {
                 if (member.getType() == GroupMemberType_Silent) {
                     return ErrorCode.ERROR_CODE_NOT_RIGHT;
@@ -1273,11 +1274,16 @@ public class MemoryMessagesStore implements IMessagesStore {
                 if (member.getMemberId().equals(memberId) && member.getType() == GroupMemberType_Removed) {
                     return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
                 }
+                isInGroup = true;
                 break;
             }
 
         }
 
+        if (!isInGroup) {
+            return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+        }
+
         return ErrorCode.ERROR_CODE_SUCCESS;
     }