群组权限

broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java

@@ -24,20 +24,32 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
         WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
         if (groupInfo == null) {
             errorCode = ErrorCode.ERROR_CODE_NOT_EXIST;
-
-        } else if (isAdmin || ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
-            && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) ) {
-
-            //send notify message first, then kickoff the member
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
-            } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
-                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
-            }
-            errorCode = m_messagesStore.kickoffGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getRemovedMemberList());
         } else {
-            errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            boolean isAllow = isAdmin;
+            if (!isAllow) {
+                if (groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
+                    isAllow = true;
+                }
+            }
+
+            if (!isAllow) {
+                WFCMessage.GroupMember gm = m_messagesStore.getGroupMember(request.getGroupId(), fromUser);
+                if (gm != null && gm.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Manager) {
+                    isAllow = true;
+                }
+            }
+            if (!isAllow && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)) {
+                errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            } else {
+                //send notify message first, then kickoff the member
+                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                    sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                } else {
+                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
+                    sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+                }
+                errorCode = m_messagesStore.kickoffGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getRemovedMemberList());
+            }
         }
         return errorCode;
     }

broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java

@@ -22,7 +22,7 @@ import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupInfoRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue());
+        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -628,23 +628,30 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (groupInfo == null) {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
-        if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator))) {
+
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
-        }
 
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
 
         if (!isAdmin) {
             boolean isMember = false;
+            boolean isManager = false;
             for (WFCMessage.GroupMember member : memberList) {
-                if (member.getType() == GroupMemberType_Removed) {
+                if (member.getMemberId().equals(operator)) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                    if (member.getType() == GroupMemberType_Removed) {
-                } else if(member.getType() == GroupMemberType_Silent) {
+                        return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
-                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    } else if (member.getType() == GroupMemberType_Silent) {
+                        return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    }
+                    isManager = (member.getType() == GroupMemberType_Manager || member.getType() == GroupMemberType_Owner);
+                    isMember = true;
+                    break;
                 }
-                isMember = true;
-                break;
             }
+
+            if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted && ((groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)) && !isManager)) {
+                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            }
+
             if (!isMember) {
                 return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
             }
@@ -804,7 +811,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value) {
+    public ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin) {
 
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
@@ -815,22 +822,36 @@ public class MemoryMessagesStore implements IMessagesStore {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        if ((oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
+        if (!isAdmin) {
-            && (oldInfo.getOwner() == null || !oldInfo.getOwner().equals(operator))) {
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted) {
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                boolean isAllow = false;
-        }
+                if ((oldInfo.getOwner() != null && oldInfo.getOwner().equals(operator))) {
-
+                    isAllow = true;
-        if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Normal) {
+                } else {
-            if (oldInfo.getOwner() == null) {
+                    WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
-                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    if (gm != null && gm.getType() == GroupMemberType_Manager) {
-            }
+                        isAllow = true;
-            if (!oldInfo.getOwner().equals(operator)) {
+                    }
-                if (modifyType == Modify_Group_Extra) {
+                }
+                if (!isAllow) {
                     return ErrorCode.ERROR_CODE_NOT_RIGHT;
                 }
             }
+
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Normal) {
+                if (oldInfo.getOwner() == null) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+                if (!oldInfo.getOwner().equals(operator)) {
+                    if (modifyType == Modify_Group_Extra) {
+                        return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    }
+                }
+            }
         }
 
+
+
         WFCMessage.GroupInfo.Builder newInfoBuilder = oldInfo.toBuilder();
 
         if (modifyType == Modify_Group_Name)
@@ -946,6 +967,24 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public WFCMessage.GroupMember getGroupMember(String groupId, String memberId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members != null) {
+            for (WFCMessage.GroupMember gm : members) {
+                if (gm.getMemberId().equals(memberId)) {
+                    return gm;
+                }
+            }
+        }
+
+        return null;
+    }
+
 
     @Override
     public ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin) {

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -107,11 +107,12 @@ public interface IMessagesStore {
     ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
     ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
-    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value);
+    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
     ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
+    WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
     ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
     ErrorCode setGroupManager(String operator, String groupId, int type, List<String> userList, boolean isAdmin);
     boolean isMemberInGroup(String member, String groupId);