anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin 不检查是否有权限，不过滤敏感词

Browse Source
This commit is contained in:
heavyrain lee
2019-04-26 08:12:08 +08:00
parent cf619ebeee
commit 7f48b54b73
1 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
+47 -48
View File
@@ -46,66 +46,65 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) { public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) {
ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
if (message != null) { if (message != null) {
int userStatus = m_messagesStore.getUserStatus(fromUser); if (!isAdmin) { //admin do not check the right
if (userStatus == 1 || userStatus == 2) { int userStatus = m_messagesStore.getUserStatus(fromUser);
return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG; if (userStatus == 1 || userStatus == 2) {
} return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
}
if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) { if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
if (m_messagesStore.isBlacked(message.getConversation().getTarget(), fromUser)) { if (m_messagesStore.isBlacked(message.getConversation().getTarget(), fromUser)) {
return ErrorCode.ERROR_CODE_IN_BLACK_LIST; return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
}
}
if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && !m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_RIGHT;
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom && !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel && !m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
} }
} }
long timestamp = System.currentTimeMillis(); long timestamp = System.currentTimeMillis();
if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && long messageId = MessageShardingUtil.generateId();
!m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) { message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
errorCode = ErrorCode.ERROR_CODE_NOT_IN_GROUP;
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group &&
m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom &&
!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
errorCode = ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel &&
!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
errorCode = ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
} else {
long messageId = MessageShardingUtil.generateId();
message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
if (mForwardUrl != null) { if (mForwardUrl != null) {
publisher.forwardMessage(message, mForwardUrl); publisher.forwardMessage(message, mForwardUrl);
} }
boolean ignoreMsg = false; boolean ignoreMsg = false;
if (message.getContent().getType() == Text) { if (!isAdmin && message.getContent().getType() == Text) {
Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent()); Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
if (matched != null && !matched.isEmpty()) { if (matched != null && !matched.isEmpty()) {
if (mSensitiveType == 0) { if (mSensitiveType == 0) {
errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED; errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
} else if(mSensitiveType == 1) { } else if(mSensitiveType == 1) {
ignoreMsg = true; ignoreMsg = true;
} else { } else {
String text = message.getContent().getSearchableContent(); String text = message.getContent().getSearchableContent();
for (String word : matched) { for (String word : matched) {
text = text.replace(word, "***"); text = text.replace(word, "***");
}
message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
} }
}
}
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
if (!ignoreMsg) {
saveAndPublish(fromUser, clientID, message);
} }
ackPayload = ackPayload.capacity(20);
ackPayload.writeLong(messageId);
ackPayload.writeLong(timestamp);
} }
} }
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
if (!ignoreMsg) {
saveAndPublish(fromUser, clientID, message);
}
ackPayload = ackPayload.capacity(20);
ackPayload.writeLong(messageId);
ackPayload.writeLong(timestamp);
}
} else { } else {
errorCode = ErrorCode.ERROR_CODE_INVALID_MESSAGE; errorCode = ErrorCode.ERROR_CODE_INVALID_MESSAGE;
} }