andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change client id validation range in codec-mqtt

Browse Source 
Motivation:

In MQTT 3.1 specification, "The Client Identifier (Client ID) is between
1 and 23 characters long, and uniquely identifies the client to the
server". But, current client id validation length is 0~23. It must be
1~23. The empty string is invalid client id in MQTT 3.1

Modifications:

Change isValidClientId method. Add MIN_CLIENT_ID_LENGTH.

Result:

The validation check for client id length is between 1 and 23.
This commit is contained in:
Jongyeol Choi 2014-10-10 20:34:37 +09:00 committed by Norman Maurer
parent cbf52961f2
commit 296c0a7912
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttCodecUtil.java
View File

@ -21,6 +21,7 @@ import io.netty.handler.codec.DecoderException;
final class MqttCodecUtil { final class MqttCodecUtil {
private static final char[] TOPIC_WILDCARDS = {'#', '+'}; private static final char[] TOPIC_WILDCARDS = {'#', '+'};
private static final int MIN_CLIENT_ID_LENGTH = 1;
private static final int MAX_CLIENT_ID_LENGTH = 23; private static final int MAX_CLIENT_ID_LENGTH = 23;
static boolean isValidPublishTopicName(String topicName) { static boolean isValidPublishTopicName(String topicName) {
@ -38,7 +39,8 @@ final class MqttCodecUtil {
} }
static boolean isValidClientId(String clientId) { static boolean isValidClientId(String clientId) {
return clientId != null && clientId.length() <= MAX_CLIENT_ID_LENGTH; return clientId != null && clientId.length() >= MIN_CLIENT_ID_LENGTH &&
clientId.length() <= MAX_CLIENT_ID_LENGTH;
} }
static MqttFixedHeader validateFixedHeader(MqttFixedHeader mqttFixedHeader) { static MqttFixedHeader validateFixedHeader(MqttFixedHeader mqttFixedHeader) {