Broker, client, and MQTT v5 packet validation and reliability fixes by aidangarske · Pull Request #552 · wolfSSL/wolfMQTT

aidangarske · 2026-06-12T17:24:00Z

Description

F-3825, F-4050, F-4051, F-4052, F-4059, F-4244, F-4245, F-4246, F-4247, F-4249, F-4304, F-4305, F-4307,
F-4308, F-4529, F-4652, F-4653, F-4654, F-4655, F-4656, F-4657, F-4658, F-4722, F-4723, F-4724, F-4726,
F-4727, F-4729, F-4772, F-4773, F-4776, F-4777, F-4928, F-4929, F-4932, F-4933, F-4991, F-4992, F-4993,
F-4994, F-4996, F-4997,  F-5115, F-5116, F-5143, F-5148, F-5149, F-5512, F-5766, F-5767, F-5768, F-5769,
F-5771, F-5861, F-5862, F-5863, F-5865, F-4725, F-5144, F-4927

… sub/unsub property cleanup

…shot sub iterator

…tion identifier

… interval

…tize peer strings in broker log sinks

…n-state mutation

…essage list

…ty count

…y callbacks

…gs in example log output

…pass

…erification, and log injection

…ner policy

…5 props, fix packet-size comparison

…ll re-entrancy, scoped wolfSSL cleanup, fan-out write reset

… PUBACK on topic alloc failure

…et credential staging buffer

…roker publish, enforce retained cap on persist restore

…ed before scrub)

…cap at 1, count restore cap skips

…unsubscribe-reject test

… reap tombstones after delivery

…fication passes

…al-write handling

…for localhost

…fter-free

embhorn

Couple minor things to clean up

embhorn · 2026-06-12T20:07:53Z

    MQTTCtx* mqttCtx = (MQTTCtx*)client->ctx;

-    /* Verify this message is for the firmware topic */
+    /* Verify this message is for the firmware topic. Compare against the full


Too wordy for the example. Revert this comment to the original.

embhorn · 2026-06-12T20:10:38Z

 Certificate:
    Data:
-        Version: 3 (0x2)
+        Version: 1 (0x0)


Why did this change to V1 cert?

embhorn · 2026-06-12T20:17:48Z

    while (((int)prop_len > 0) && (rc >= 0))
    {
+        /* Bound the number of properties a single message may carry so a peer
+         * cannot saturate the shared property pool (CWE-770). */


Remove the CWE reference

embhorn · 2026-06-12T20:18:28Z

    MqttBroker_Free(&broker);
 }
+
+/* [CWE-863/CWE-639] An unauthenticated CONNECT must not mutate another


Remove the CWE reference

embhorn · 2026-06-12T20:18:55Z

+            if (broker->retained_delivering > 0) {
+                /* A delivery loop is iterating this list (possibly re-entered
+                 * via a WebSocket fan-out). Freeing now would invalidate that
+                 * loop's saved next pointer (CWE-416); flag for deferred reap


Remove the CWE reference

embhorn · 2026-06-12T20:21:09Z

+    ASSERT_NULL(pub.props);
+}
+
+/* [CWE-770] A single message may not carry more than the internal


Remove CWE reference

embhorn · 2026-06-12T20:21:30Z

    ASSERT_TRUE(rc > 0);
 }

+/* [CWE-125] The encoder must clamp the copied payload to buffer_len so a


Remove CWE reference

embhorn · 2026-06-12T20:21:43Z

+#endif /* WOLFMQTT_BROKER_RETAINED && !WOLFMQTT_STATIC_MEMORY */
+
+#ifndef WOLFMQTT_STATIC_MEMORY
+/* [CWE-770] A single client cannot occupy more than BROKER_MAX_SUBS_PER_CLIENT


Remove CWE reference

embhorn · 2026-06-12T20:21:59Z

+}
+
+#if defined(WOLFMQTT_BROKER_RETAINED) && !defined(WOLFMQTT_STATIC_MEMORY)
+/* [CWE-400] The dynamic retained-message list must be bounded. A client that


Remove CWE reference

embhorn · 2026-06-12T21:19:43Z

+    return n;
+}
+
+/* [issue 3129] A broker that rejects a subscription returns a SUBACK whose


Remove issue numbers

aidangarske added 26 commits June 11, 2026 13:14

F-3825 F-4050 F-4051 F-4052 F-4059 - Harden v5 unsubscribe reject and…

ccce7eb

… sub/unsub property cleanup

F-4244 F-4307 - Defer WebSocket close during publish fan-out and snap…

60d20f6

…shot sub iterator

F-4246 F-4247 - Reject v5 empty topic without alias and zero subscrip…

57cfd36

…tion identifier

F-4245 F-4249 - Reject overlong static topics and clamp v5 will delay…

1ef1d06

… interval

F-4304 F-4654 F-4655 F-4722 F-4723 F-4727 F-4729 F-4776 F-4933 - Sani…

2581a2c

…tize peer strings in broker log sinks

F-4305 F-4652 - Validate broker CONNECT credentials before any sessio…

d46da08

…n-state mutation

F-4308 F-4653 - Reject v5 zero topic alias and cap dynamic retained-m…

b455240

…essage list

F-4529 - Add MqttClient_Subscribe broker-rejection regression test

5b97a8d

F-4657 F-4658 - Validate v5 response topic and cap per-message proper…

337f88d

…ty count

F-4656 - Cap per-client broker subscriptions to prevent table exhaustion

2c5ce32

F-4928 F-4929 F-4991 - Enforce TLS peer verification in example verif…

d9e79ce

…y callbacks

F-5766 F-5767 F-5768 F-5769 F-5861 - Sanitize broker-controlled strin…

087d9f0

…gs in example log output

F-4724 F-4772 - Fix firmware client length-overflow and topic-gate by…

c829dbc

…pass

F-5148 - Prevent broker client double-free on re-entrant takeover close

154bfae

F-4773 F-4992 F-5116 F-5143 F-5771 - Fix WebSocket fan-out UAF, TLS v…

be003af

…erification, and log injection

F-4726 F-5115 - Enforce WebSocket origin allowlist and TLS-only liste…

61870fb

…ner policy

F-4994 F-4996 F-5149 - Clamp publish payload copy, reject duplicate v…

dc8ab1e

…5 props, fix packet-size comparison

F-4997 F-5862 F-5863 F-5865 - Broker disconnect-with-will, pending-wi…

356fd47

…ll re-entrancy, scoped wolfSSL cleanup, fan-out write reset

F-4777 F-4932 - Reject client PUBLISH subscription id and avoid false…

0154f26

… PUBACK on topic alloc failure

F-4993 F-5512 - Add broker pre-CONNECT idle timeout and scrub WebSock…

dcbc2c0

…et credential staging buffer

Address skoll review: bound UNSUBACK reason codes, reject oversized b…

ab130c2

…roker publish, enforce retained cap on persist restore

Address skoll review: guard v5-only test registrations for non-v5 builds

0fb17bc

Clarify MqttClient_Auth rx_buf scrub ordering (skoll FP: props consum…

6bec2fb

…ed before scrub)

Address skoll review: free v5 DISCONNECT props, floor per-client sub …

41dabde

…cap at 1, count restore cap skips

Address skoll review: map UNSUBSCRIBE_REJECTED string and add client …

bd8104d

…unsubscribe-reject test

Address skoll review: cancel deferred retained delete on re-store and…

7e14290

… reap tombstones after delivery

Copilot AI review requested due to automatic review settings June 12, 2026 17:24

Copilot started reviewing on behalf of aidangarske June 12, 2026 17:24 View session

Add localhost SAN to broker test certs so WebSocket TLS hostname veri…

abb3dcc

…fication passes

This comment was marked as resolved.

Sign in to view

aidangarske added 2 commits June 12, 2026 10:48

Enforce example TLS peer verification only when a CA is configured

bf581a1

Harden publish encode clamp, firmware length prints, and broker parti…

9447505

…al-write handling

aidangarske requested a review from wolfSSL-Fenrir-bot June 12, 2026 17:55

This comment was marked as resolved.

Sign in to view

aidangarske added 2 commits June 12, 2026 11:06

F-4927 - Enforce curl TLS hostname verification instead of bypassing …

3004ba9

…for localhost

Defer nested retained-delivery reap to outermost depth to avoid use-a…

c138692

…fter-free

aidangarske requested a review from embhorn June 12, 2026 19:04

aidangarske assigned embhorn Jun 12, 2026

embhorn requested changes Jun 12, 2026

View reviewed changes

Conversation

aidangarske commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

embhorn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

aidangarske commented Jun 12, 2026 •

edited

Loading