Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-03-23 16:33:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect maximum-packet-size restriction for incoming packets.

Browse Source 
Closes #3515. Thanks to Julian Graf.
This commit is contained in:
Roger A. Light
2026-02-23 18:45:34 +00:00
parent b21c9f2c9a
commit 7a1905006a
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -6,7 +6,10 @@
of that client. Closes #3487.
- Fix password length not being passed to MOSQ_EVT_BASIC_AUTH events.
Closes #3490.
- Fix incorrect maximum-packet-size restriction. Closes #3503.
- Fix incorrect maximum-packet-size restriction for outgoing packets.
Closes #3503.
- Fix incorrect maximum-packet-size restriction for incoming packets.
Closes #3515.
- Fix will messages being incorrectly delayed if a client set
session-expiry-interval=0 when using will-delay-interval>0. Closes #3505.

14
lib/packet_mosq.c
View File

@@ -399,9 +399,11 @@ static int read_header(struct mosquitto *mosq, ssize_t (*func_read)(struct mosqu
static int packet__check_in_packet_oversize(struct mosquitto *mosq)
{
uint32_t packet_length = 1 + mosquitto_varint_bytes(mosq->in_packet.remaining_length) + mosq->in_packet.remaining_length;
switch(mosq->in_packet.command & 0xF0){
case CMD_CONNECT:
if(mosq->in_packet.remaining_length > db.config->packet_max_connect){
if(packet_length > db.config->packet_max_connect){
return MOSQ_ERR_OVERSIZE_PACKET;
}
break;
@@ -412,7 +414,7 @@ static int packet__check_in_packet_oversize(struct mosquitto *mosq)
case CMD_PUBCOMP:
case CMD_UNSUBACK:
if(mosq->protocol == mosq_p_mqtt5){
if(mosq->in_packet.remaining_length > db.config->packet_max_simple){
if(packet_length > db.config->packet_max_simple){
return MOSQ_ERR_OVERSIZE_PACKET;
}
}else{
@@ -431,7 +433,7 @@ static int packet__check_in_packet_oversize(struct mosquitto *mosq)
case CMD_DISCONNECT:
if(mosq->protocol == mosq_p_mqtt5){
if(mosq->in_packet.remaining_length > db.config->packet_max_simple){
if(packet_length > db.config->packet_max_simple){
return MOSQ_ERR_OVERSIZE_PACKET;
}
}else{
@@ -443,20 +445,20 @@ static int packet__check_in_packet_oversize(struct mosquitto *mosq)
case CMD_SUBSCRIBE:
case CMD_UNSUBSCRIBE:
if(mosq->protocol == mosq_p_mqtt5 && mosq->in_packet.remaining_length > db.config->packet_max_sub){
if(mosq->protocol == mosq_p_mqtt5 && packet_length > db.config->packet_max_sub){
return MOSQ_ERR_OVERSIZE_PACKET;
}
break;
case CMD_AUTH:
if(mosq->in_packet.remaining_length > db.config->packet_max_auth){
if(packet_length > db.config->packet_max_auth){
return MOSQ_ERR_OVERSIZE_PACKET;
}
break;
}
if(db.config->max_packet_size > 0 && mosq->in_packet.remaining_length+1 > db.config->max_packet_size){
if(db.config->max_packet_size > 0 && packet_length > db.config->max_packet_size){
if(mosq->protocol == mosq_p_mqtt5){
send__disconnect(mosq, MQTT_RC_PACKET_TOO_LARGE, NULL);
}

11
test/broker/12-prop-maximum-packet-size-broker.py
View File

@@ -8,7 +8,7 @@ def write_config(filename, port):
with open(filename, 'w') as f:
f.write("listener %d\n" % (port))
f.write("allow_anonymous true\n")
f.write("max_packet_size 40\n")
f.write("max_packet_size 50\n")
port = mosq_test.get_port()
conf_file = os.path.basename(__file__).replace('.py', '.conf')
@@ -18,18 +18,21 @@ rc = 1
connect_packet = mosq_test.gen_connect("12-max-packet-broker", proto_ver=5)
props = mqtt5_props.gen_uint16_prop(mqtt5_props.TOPIC_ALIAS_MAXIMUM, 10)
props += mqtt5_props.gen_uint32_prop(mqtt5_props.MAXIMUM_PACKET_SIZE, 40)
props += mqtt5_props.gen_uint32_prop(mqtt5_props.MAXIMUM_PACKET_SIZE, 50)
props += mqtt5_props.gen_uint16_prop(mqtt5_props.RECEIVE_MAXIMUM, 20)
connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5, properties=props, property_helper=False)
publish_packet = mosq_test.gen_publish("12/max/packet/size/broker/test/topic", qos=0, payload="0123456789012345678901234567890", proto_ver=5)
publish_packet_ok = mosq_test.gen_publish("12/max/packet/size/broker/test/topic", qos=0, payload="012345678", proto_ver=5)
publish_packet_bad = mosq_test.gen_publish("12/max/packet/size/broker/test/topic", qos=0, payload="0123456789", proto_ver=5)
disconnect_packet = mosq_test.gen_disconnect(reason_code=149, proto_ver=5)
broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port, use_conf=True)
try:
sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port)
mosq_test.do_send_receive(sock, publish_packet, disconnect_packet, "disconnect")
sock.send(publish_packet_ok)
mosq_test.do_ping(sock)
mosq_test.do_send_receive(sock, publish_packet_bad, disconnect_packet, "disconnect")
rc = 0
except mosq_test.TestError:
pass