From 67234ceaa64bc118e922005ded4aa938a21f6954 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Sat, 12 Nov 2022 14:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E7=BE=A4?=
 =?UTF-8?q?=E7=BB=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E7=BB=84=E7=BB=87=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/moquette/imhandler/KickoffGroupMember.java  |  4 ++++
 .../moquette/persistence/MemoryMessagesStore.java  | 14 +++++++++++++-
 .../java/cn/wildfirechat/proto/ProtoConstants.java |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java
index 489f2e50..253f75c4 100644
--- a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java
+++ b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java
@@ -29,6 +29,10 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
             errorCode = ErrorCode.ERROR_CODE_NOT_EXIST;
         } else {
             boolean isAdmin = requestSourceType == ProtoConstants.RequestSourceType.Request_From_Admin;
+            if (!isAdmin && groupInfo.getType() == ProtoConstants.GroupType.GroupType_Organization) {
+                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            }
+
             boolean isAllow = isAdmin;
             if (!isAllow) {
                 if (groupInfo.getOwner() != null) {
diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index d8b01e89..efd47e3c 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -1266,6 +1266,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         int maxCount = Integer.MAX_VALUE;
 
         if (!isAdmin) {
+            if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Organization) {
+                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            }
             boolean isMember = false;
             boolean isManager = false;
             WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
@@ -1511,6 +1514,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (!isAdmin && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Free ||
+            groupInfo.getType() == ProtoConstants.GroupType.GroupType_Organization ||
             (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
                 && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)))) {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
@@ -1554,7 +1558,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (!isAdmin) {
-            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted) {
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Organization && modifyType != Modify_Group_Extra && modifyType != Modify_Group_Mute && modifyType != Modify_Group_PrivateChat) {
+                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            }
+
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || oldInfo.getType() == ProtoConstants.GroupType.GroupType_Organization) {
                 boolean isAllow = false;
                 if ((oldInfo.getOwner() != null && oldInfo.getOwner().equals(operator))) {
                     isAllow = true;
@@ -1920,6 +1928,10 @@ public class MemoryMessagesStore implements IMessagesStore {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
 
+        if (!isAdmin && groupInfo.getType() == ProtoConstants.GroupType.GroupType_Organization) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         //check the new owner is in member list? is that necessary?
         long updateDt = System.currentTimeMillis();
         groupInfo = groupInfo.toBuilder().setOwner(newOwner).setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build();
diff --git a/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java
index c6278b17..a3ad10c2 100644
--- a/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java
+++ b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java
@@ -19,6 +19,8 @@ public class ProtoConstants {
         int GroupType_Free = 1;
         //member can only quit, owner can do all the operations
         int GroupType_Restricted = 2;
+        //member can not do anything, server api manage the group
+        int GroupType_Organization = 3;
     }
 
     //message GroupMember -> type