添加android客户端签名验证功能
This commit is contained in:
@@ -59,6 +59,12 @@ token.key testim
|
|||||||
##token的过期时间,单位为毫秒,默认为无限期。如果需要设置无限期,客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
|
##token的过期时间,单位为毫秒,默认为无限期。如果需要设置无限期,客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
|
||||||
##token.expire_time 2592000000
|
##token.expire_time 2592000000
|
||||||
|
|
||||||
|
##客户端(目前只有android)的应用签名(一个应用最取第一个签名),如果有多个签名(多个客户端),用英文逗号分开。获取签名方法请参考文档:https://docs.wildfirechat.cn/blogs/签名验证.html
|
||||||
|
#connect.client_signature_list eNkezQ1g9OsnhfLSFUY1vzKDzhs=,xykezQ1g9OsnhfLSFUY1vzKDzhs=
|
||||||
|
|
||||||
|
##是否拒绝空签名的android客户端, 默认为true。当有旧的客户端需要兼容时改成false,当所有都是新客户端时,改成true。
|
||||||
|
#connect.reject_empty_signature true
|
||||||
|
|
||||||
##首次登录,是否接收之前的历史消息。
|
##首次登录,是否接收之前的历史消息。
|
||||||
##0 不接收历史消息,只接收${message.compensate_time_limit}毫秒以内的消息,由于服务器没有保存已经收取记录,所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉;
|
##0 不接收历史消息,只接收${message.compensate_time_limit}毫秒以内的消息,由于服务器没有保存已经收取记录,所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉;
|
||||||
##1接收,会接收 message.max_queue 配置的条数的历史消息
|
##1接收,会接收 message.max_queue 配置的条数的历史消息
|
||||||
|
|||||||
@@ -110,6 +110,9 @@ public final class BrokerConstants {
|
|||||||
public static final String TOKEN_SECRET_KEY = "token.key";
|
public static final String TOKEN_SECRET_KEY = "token.key";
|
||||||
public static final String TOKEN_EXPIRE_TIME = "token.expire_time";
|
public static final String TOKEN_EXPIRE_TIME = "token.expire_time";
|
||||||
|
|
||||||
|
public static final String CONNECT_CLIENT_SIGNATURE_LIST = "connect.client_signature_list";
|
||||||
|
public static final String CONNECT_REJECT_EMPTY_SIGNATURE = "connect.reject_empty_signature";
|
||||||
|
|
||||||
public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
|
public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
|
||||||
public static final String DB_AUTO_CLEAN_HISTORY_MESSAGES = "db.auto_clean_history_messages";
|
public static final String DB_AUTO_CLEAN_HISTORY_MESSAGES = "db.auto_clean_history_messages";
|
||||||
public static final String H2DB_PATH = "h2db.path";
|
public static final String H2DB_PATH = "h2db.path";
|
||||||
|
|||||||
@@ -147,6 +147,9 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
private boolean mDisableStrangerChat = false;
|
private boolean mDisableStrangerChat = false;
|
||||||
private Set<String> mAllowStrangerChatSet = new HashSet<>();
|
private Set<String> mAllowStrangerChatSet = new HashSet<>();
|
||||||
|
|
||||||
|
private Set<String> mClientSignatureSet = new HashSet<>();
|
||||||
|
private boolean mRejectEmptySignature = true;
|
||||||
|
|
||||||
private long mChatroomParticipantIdleTime = 900000;
|
private long mChatroomParticipantIdleTime = 900000;
|
||||||
private boolean mChatroomRejoinWhenActive = true;
|
private boolean mChatroomRejoinWhenActive = true;
|
||||||
private boolean mChatroomCreateWhenNotExist = true;
|
private boolean mChatroomCreateWhenNotExist = true;
|
||||||
@@ -191,6 +194,27 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
IS_CHATROOM_MESSAGE_REMOTE_HISTORY_MESSAGE = "1".equals(m_Server.getConfig().getProperty(MESSAGE_Remote_Chatroom_History_Message, "1"));
|
IS_CHATROOM_MESSAGE_REMOTE_HISTORY_MESSAGE = "1".equals(m_Server.getConfig().getProperty(MESSAGE_Remote_Chatroom_History_Message, "1"));
|
||||||
Constants.MAX_MESSAGE_QUEUE = Integer.parseInt(m_Server.getConfig().getProperty(MESSAGE_Max_Queue));
|
Constants.MAX_MESSAGE_QUEUE = Integer.parseInt(m_Server.getConfig().getProperty(MESSAGE_Max_Queue));
|
||||||
|
|
||||||
|
try {
|
||||||
|
String signatureList = m_Server.getConfig().getProperty(BrokerConstants.CONNECT_CLIENT_SIGNATURE_LIST);
|
||||||
|
if(!StringUtil.isNullOrEmptyAfterTrim(signatureList)) {
|
||||||
|
signatureList = signatureList.replace(",", ",");
|
||||||
|
for (String s : signatureList.split(",")) {
|
||||||
|
mClientSignatureSet.add(s.trim());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if(!mClientSignatureSet.isEmpty()) {
|
||||||
|
mRejectEmptySignature = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CONNECT_REJECT_EMPTY_SIGNATURE, "true"));
|
||||||
|
} else {
|
||||||
|
mRejectEmptySignature = false;
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mDisableStrangerChat = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Disable_Stranger_Chat));
|
mDisableStrangerChat = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Disable_Stranger_Chat));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -4330,6 +4354,25 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
return UUIDGenerator.getUUID();
|
return UUIDGenerator.getUUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean checkSignature(String signature) {
|
||||||
|
if(StringUtil.isNullOrEmptyAfterTrim(signature)) {
|
||||||
|
if(mRejectEmptySignature) {
|
||||||
|
LOG.info("Failed check signature, no signature");
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if(mClientSignatureSet.contains(signature)) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
LOG.info("Failed check signature, signature no matched");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void storeRetained(Topic topic, StoredMessage storedMessage) {
|
public void storeRetained(Topic topic, StoredMessage storedMessage) {
|
||||||
LOG.debug("Store retained message for topic={}, CId={}", topic, storedMessage.getClientID());
|
LOG.debug("Store retained message for topic={}, CId={}", topic, storedMessage.getClientID());
|
||||||
|
|||||||
@@ -249,6 +249,8 @@ public interface IMessagesStore {
|
|||||||
|
|
||||||
//使用了数据库,会比较慢,仅能用户用户/群组等id的生成
|
//使用了数据库,会比较慢,仅能用户用户/群组等id的生成
|
||||||
String getShortUUID();
|
String getShortUUID();
|
||||||
|
|
||||||
|
boolean checkSignature(String signature);
|
||||||
/**
|
/**
|
||||||
* Used to initialize all persistent store structures
|
* Used to initialize all persistent store structures
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ import win.liyufan.im.HttpUtils;
|
|||||||
import win.liyufan.im.IMTopic;
|
import win.liyufan.im.IMTopic;
|
||||||
import win.liyufan.im.Utility;
|
import win.liyufan.im.Utility;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
@@ -339,6 +340,24 @@ public class ProtocolProcessor {
|
|||||||
failedCredentials(channel);
|
failedCredentials(channel);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(session.getPlatform() == ProtoConstants.Platform.Platform_Android || session.getPlatform() == ProtoConstants.Platform.Platform_APad) {
|
||||||
|
byte[] signature = msg.payload().signatureInBytes();
|
||||||
|
String basedSign = null;
|
||||||
|
if (signature != null && signature.length > 0) {
|
||||||
|
signature = AES.AESDecrypt(signature, session.getSecret(), true);
|
||||||
|
}
|
||||||
|
if (signature != null && signature.length > 0) {
|
||||||
|
basedSign = Base64.getEncoder().encodeToString(signature);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!m_messagesStore.checkSignature(basedSign)) {
|
||||||
|
LOG.error("Bad signature of session <{}, {}>", session.getUsername(), session.getClientID());
|
||||||
|
failedBadSignature(channel);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
session.setMqttVersion(mqttVersion);
|
session.setMqttVersion(mqttVersion);
|
||||||
} else {
|
} else {
|
||||||
LOG.error("Client didn't supply any password and MQTT anonymous mode is disabled CId={}", clientId);
|
LOG.error("Client didn't supply any password and MQTT anonymous mode is disabled CId={}", clientId);
|
||||||
@@ -446,6 +465,11 @@ public class ProtocolProcessor {
|
|||||||
LOG.info("Client {} failed to connect with bad username or password.", session);
|
LOG.info("Client {} failed to connect with bad username or password.", session);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void failedBadSignature(Channel session) {
|
||||||
|
session.writeAndFlush(connAck(CONNECTION_REFUSED_SIGNATURE_FAILURE));
|
||||||
|
LOG.info("Client {} failed to connect with bad signature.", session);
|
||||||
|
}
|
||||||
|
|
||||||
private void setIdleTime(ChannelPipeline pipeline, int idleTime) {
|
private void setIdleTime(ChannelPipeline pipeline, int idleTime) {
|
||||||
if (pipeline.names().contains("idleStateHandler")) {
|
if (pipeline.names().contains("idleStateHandler")) {
|
||||||
pipeline.remove("idleStateHandler");
|
pipeline.remove("idleStateHandler");
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ public final class MqttConnectPayload {
|
|||||||
private final byte[] willMessage;
|
private final byte[] willMessage;
|
||||||
private final String userName;
|
private final String userName;
|
||||||
private final byte[] password;
|
private final byte[] password;
|
||||||
|
private final byte[] signature;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use {@link MqttConnectPayload#MqttConnectPayload(String,
|
* @deprecated use {@link MqttConnectPayload#MqttConnectPayload(String,
|
||||||
@@ -50,7 +51,7 @@ public final class MqttConnectPayload {
|
|||||||
willTopic,
|
willTopic,
|
||||||
willMessage.getBytes(CharsetUtil.UTF_8),
|
willMessage.getBytes(CharsetUtil.UTF_8),
|
||||||
userName,
|
userName,
|
||||||
password.getBytes(CharsetUtil.UTF_8));
|
password.getBytes(CharsetUtil.UTF_8), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MqttConnectPayload(
|
public MqttConnectPayload(
|
||||||
@@ -64,7 +65,7 @@ public final class MqttConnectPayload {
|
|||||||
willTopic,
|
willTopic,
|
||||||
willMessage,
|
willMessage,
|
||||||
userName,
|
userName,
|
||||||
password);
|
password, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MqttConnectPayload(
|
public MqttConnectPayload(
|
||||||
@@ -73,13 +74,15 @@ public final class MqttConnectPayload {
|
|||||||
String willTopic,
|
String willTopic,
|
||||||
byte[] willMessage,
|
byte[] willMessage,
|
||||||
String userName,
|
String userName,
|
||||||
byte[] password) {
|
byte[] password,
|
||||||
|
byte[] signature) {
|
||||||
this.clientIdentifier = clientIdentifier;
|
this.clientIdentifier = clientIdentifier;
|
||||||
this.willProperties = MqttProperties.withEmptyDefaults(willProperties);
|
this.willProperties = MqttProperties.withEmptyDefaults(willProperties);
|
||||||
this.willTopic = willTopic;
|
this.willTopic = willTopic;
|
||||||
this.willMessage = willMessage;
|
this.willMessage = willMessage;
|
||||||
this.userName = userName;
|
this.userName = userName;
|
||||||
this.password = password;
|
this.password = password;
|
||||||
|
this.signature = signature;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String clientIdentifier() {
|
public String clientIdentifier() {
|
||||||
@@ -122,6 +125,10 @@ public final class MqttConnectPayload {
|
|||||||
return password;
|
return password;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public byte[] signatureInBytes() {
|
||||||
|
return signature;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new StringBuilder(StringUtil.simpleClassName(this))
|
return new StringBuilder(StringUtil.simpleClassName(this))
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ public enum MqttConnectReturnCode {
|
|||||||
CONNECTION_REFUSED_NOT_AUTHORIZED((byte) 0x05),
|
CONNECTION_REFUSED_NOT_AUTHORIZED((byte) 0x05),
|
||||||
CONNECTION_REFUSED_UNEXPECT_NODE((byte) 0X06),
|
CONNECTION_REFUSED_UNEXPECT_NODE((byte) 0X06),
|
||||||
CONNECTION_REFUSED_SESSION_NOT_EXIST((byte) 0x07),
|
CONNECTION_REFUSED_SESSION_NOT_EXIST((byte) 0x07),
|
||||||
|
CONNECTION_REFUSED_SIGNATURE_FAILURE((byte) 0x08),
|
||||||
//MQTT 5 codes
|
//MQTT 5 codes
|
||||||
CONNECTION_REFUSED_UNSPECIFIED_ERROR((byte) 0x80),
|
CONNECTION_REFUSED_UNSPECIFIED_ERROR((byte) 0x80),
|
||||||
CONNECTION_REFUSED_MALFORMED_PACKET((byte) 0x81),
|
CONNECTION_REFUSED_MALFORMED_PACKET((byte) 0x81),
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ public final class MqttDecoder extends ReplayingDecoder<MqttDecoder.DecoderState
|
|||||||
* bytes for the remaining length.
|
* bytes for the remaining length.
|
||||||
*
|
*
|
||||||
* @see
|
* @see
|
||||||
* https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html#_Toc442180841
|
* <a href="https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html#_Toc442180841">...</a>
|
||||||
*
|
*
|
||||||
* @param buffer the buffer to decode from
|
* @param buffer the buffer to decode from
|
||||||
* @return the fixed header
|
* @return the fixed header
|
||||||
@@ -534,7 +534,7 @@ public final class MqttDecoder extends ReplayingDecoder<MqttDecoder.DecoderState
|
|||||||
|
|
||||||
final MqttProperties willProperties;
|
final MqttProperties willProperties;
|
||||||
if (mqttConnectVariableHeader.isWillFlag()) {
|
if (mqttConnectVariableHeader.isWillFlag()) {
|
||||||
if (mqttVersion == MqttVersion.MQTT_5) {
|
if (mqttVersion.protocolLevel() <= MqttVersion.MQTT_5.protocolLevel()) {
|
||||||
final Result<MqttProperties> propertiesResult = decodeProperties(buffer);
|
final Result<MqttProperties> propertiesResult = decodeProperties(buffer);
|
||||||
willProperties = propertiesResult.value;
|
willProperties = propertiesResult.value;
|
||||||
numberOfBytesConsumed += propertiesResult.numberOfBytesConsumed;
|
numberOfBytesConsumed += propertiesResult.numberOfBytesConsumed;
|
||||||
@@ -550,6 +550,7 @@ public final class MqttDecoder extends ReplayingDecoder<MqttDecoder.DecoderState
|
|||||||
}
|
}
|
||||||
Result<String> decodedUserName = null;
|
Result<String> decodedUserName = null;
|
||||||
byte[] decodedPassword = null;
|
byte[] decodedPassword = null;
|
||||||
|
byte[] decodedSignature = null;
|
||||||
if (mqttConnectVariableHeader.hasUserName()) {
|
if (mqttConnectVariableHeader.hasUserName()) {
|
||||||
decodedUserName = decodeString(buffer);
|
decodedUserName = decodeString(buffer);
|
||||||
numberOfBytesConsumed += decodedUserName.numberOfBytesConsumed;
|
numberOfBytesConsumed += decodedUserName.numberOfBytesConsumed;
|
||||||
@@ -558,6 +559,10 @@ public final class MqttDecoder extends ReplayingDecoder<MqttDecoder.DecoderState
|
|||||||
decodedPassword = decodeByteArray(buffer);
|
decodedPassword = decodeByteArray(buffer);
|
||||||
numberOfBytesConsumed += decodedPassword.length + 2;
|
numberOfBytesConsumed += decodedPassword.length + 2;
|
||||||
}
|
}
|
||||||
|
if (mqttConnectVariableHeader.isWillRetain()) {
|
||||||
|
decodedSignature = decodeByteArray(buffer);
|
||||||
|
numberOfBytesConsumed += decodedSignature.length + 2;
|
||||||
|
}
|
||||||
|
|
||||||
final MqttConnectPayload mqttConnectPayload =
|
final MqttConnectPayload mqttConnectPayload =
|
||||||
new MqttConnectPayload(
|
new MqttConnectPayload(
|
||||||
@@ -566,7 +571,9 @@ public final class MqttDecoder extends ReplayingDecoder<MqttDecoder.DecoderState
|
|||||||
decodedWillTopic != null ? decodedWillTopic.value : null,
|
decodedWillTopic != null ? decodedWillTopic.value : null,
|
||||||
decodedWillMessage,
|
decodedWillMessage,
|
||||||
decodedUserName != null ? decodedUserName.value : null,
|
decodedUserName != null ? decodedUserName.value : null,
|
||||||
decodedPassword);
|
decodedPassword,
|
||||||
|
decodedSignature
|
||||||
|
);
|
||||||
return new Result<MqttConnectPayload>(mqttConnectPayload, numberOfBytesConsumed);
|
return new Result<MqttConnectPayload>(mqttConnectPayload, numberOfBytesConsumed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ public final class MqttMessageBuilders {
|
|||||||
keepAliveSecs,
|
keepAliveSecs,
|
||||||
properties);
|
properties);
|
||||||
MqttConnectPayload mqttConnectPayload =
|
MqttConnectPayload mqttConnectPayload =
|
||||||
new MqttConnectPayload(clientId, willProperties, willTopic, willMessage, username, password);
|
new MqttConnectPayload(clientId, willProperties, willTopic, willMessage, username, password, null);
|
||||||
return new MqttConnectMessage(mqttFixedHeader, mqttConnectVariableHeader, mqttConnectPayload);
|
return new MqttConnectMessage(mqttFixedHeader, mqttConnectVariableHeader, mqttConnectPayload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,12 @@ token.key testim
|
|||||||
##token的过期时间,单位为毫秒,默认为无限期。如果需要设置无限期,客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
|
##token的过期时间,单位为毫秒,默认为无限期。如果需要设置无限期,客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
|
||||||
##token.expire_time 2592000000
|
##token.expire_time 2592000000
|
||||||
|
|
||||||
|
##客户端(目前只有android)的应用签名(一个应用最取第一个签名),如果有多个签名(多个客户端),用英文逗号分开。获取签名方法请参考文档:https://docs.wildfirechat.cn/blogs/签名验证.html
|
||||||
|
#connect.client_signature_list eNkezQ1g9OsnhfLSFUY1vzKDzhs=,xykezQ1g9OsnhfLSFUY1vzKDzhs=
|
||||||
|
|
||||||
|
##是否拒绝空签名的android客户端, 默认为true。当有旧的客户端需要兼容时改成false,当所有都是新客户端时,改成true。
|
||||||
|
#connect.reject_empty_signature true
|
||||||
|
|
||||||
##首次登录,是否接收之前的历史消息。
|
##首次登录,是否接收之前的历史消息。
|
||||||
##0 不接收历史消息,只接收${message.compensate_time_limit}毫秒以内的消息,由于服务器没有保存已经收取记录,所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉;
|
##0 不接收历史消息,只接收${message.compensate_time_limit}毫秒以内的消息,由于服务器没有保存已经收取记录,所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉;
|
||||||
##1接收,会接收 message.max_queue 配置的条数的历史消息
|
##1接收,会接收 message.max_queue 配置的条数的历史消息
|
||||||
|
|||||||
Reference in New Issue
Block a user