Fixed #379.

Fixed MQTT allowed UTF-8 contents checking. Fixed reason_code. If invalid UTF-8 detected, the reason_code should be malformed_packet.
redboltz · Dec 10, 2024 · 84178c5 · 84178c5
1 parent 455c155
commit 84178c5
Show file tree

Hide file tree

Showing 22 changed files with 179 additions and 421 deletions.
diff --git a/include/async_mqtt/packet/detail/base_property.hpp b/include/async_mqtt/packet/detail/base_property.hpp
@@ -260,7 +260,7 @@ struct string_property : binary_property {
         }
         else {
             return make_error_code(
-                disconnect_reason_code::protocol_error
+                disconnect_reason_code::malformed_packet
             );
         }
     }
@@ -370,7 +370,7 @@ struct len_str {
         }
         else {
             return make_error_code(
-                disconnect_reason_code::protocol_error
+                disconnect_reason_code::malformed_packet
             );
         }
     }

diff --git a/include/async_mqtt/packet/impl/v3_1_1_connect.ipp b/include/async_mqtt/packet/impl/v3_1_1_connect.ipp
@@ -82,7 +82,7 @@ connect_packet::connect_packet(
     if (!utf8string_check(client_id_)) {
         throw system_error(
             make_error_code(
-                connect_reason_code::client_identifier_not_valid
+                connect_reason_code::malformed_packet
             )
         );
     }
@@ -92,7 +92,7 @@ connect_packet::connect_packet(
         if (!utf8string_check(*user_name)) {
             throw system_error(
                 make_error_code(
-                    connect_reason_code::bad_user_name_or_password
+                    connect_reason_code::malformed_packet
                 )
             );
         }
@@ -114,7 +114,7 @@ connect_packet::connect_packet(
         if (!utf8string_check(w->topic())) {
             throw system_error(
                 make_error_code(
-                    connect_reason_code::topic_name_invalid
+                    connect_reason_code::malformed_packet
                 )
             );
         }
@@ -365,7 +365,7 @@ connect_packet::connect_packet(buffer buf, error_code& ec) {
     client_id_ = buf.substr(0, client_id_length);
     if (!utf8string_check(client_id_)) {
         ec = make_error_code(
-            connect_reason_code::client_identifier_not_valid
+            connect_reason_code::malformed_packet
         );
         return;
     }
@@ -401,7 +401,7 @@ connect_packet::connect_packet(buffer buf, error_code& ec) {
         will_topic_ = buf.substr(0, will_topic_length);
         if (!utf8string_check(will_topic_)) {
             ec = make_error_code(
-                connect_reason_code::topic_name_invalid
+                connect_reason_code::malformed_packet
             );
             return;
         }
@@ -463,7 +463,7 @@ connect_packet::connect_packet(buffer buf, error_code& ec) {
         user_name_ = buf.substr(0, user_name_length);
         if (!utf8string_check(user_name_)) {
             ec = make_error_code(
-                connect_reason_code::bad_user_name_or_password
+                connect_reason_code::malformed_packet
             );
             return;
         }

diff --git a/include/async_mqtt/packet/impl/v3_1_1_publish.ipp b/include/async_mqtt/packet/impl/v3_1_1_publish.ipp
@@ -84,7 +84,7 @@ basic_publish_packet<PacketIdBytes>::basic_publish_packet(
     if (!utf8string_check(topic_name_)) {
         throw system_error(
             make_error_code(
-                disconnect_reason_code::topic_name_invalid
+                disconnect_reason_code::malformed_packet
             )
         );
     }
@@ -262,7 +262,7 @@ basic_publish_packet<PacketIdBytes>::basic_publish_packet(buffer buf, error_code
 
     if (!utf8string_check(topic_name_)) {
         ec = make_error_code(
-            disconnect_reason_code::topic_name_invalid
+            disconnect_reason_code::malformed_packet
         );
         return;
     }

diff --git a/include/async_mqtt/packet/impl/v3_1_1_subscribe.ipp b/include/async_mqtt/packet/impl/v3_1_1_subscribe.ipp
@@ -101,7 +101,7 @@ basic_subscribe_packet<PacketIdBytes>::basic_subscribe_packet(
         if (!utf8string_check(e.all_topic())) {
             throw system_error{
                 make_error_code(
-                    disconnect_reason_code::topic_filter_invalid
+                    disconnect_reason_code::malformed_packet
                 )
             };
         }
@@ -240,7 +240,7 @@ basic_subscribe_packet<PacketIdBytes>::basic_subscribe_packet(buffer buf, error_
 
         if (!utf8string_check(topic)) {
             ec = make_error_code(
-                disconnect_reason_code::topic_filter_invalid
+                disconnect_reason_code::malformed_packet
             );
             return;
         }

diff --git a/include/async_mqtt/packet/impl/v3_1_1_unsubscribe.ipp b/include/async_mqtt/packet/impl/v3_1_1_unsubscribe.ipp
@@ -71,7 +71,7 @@ basic_unsubscribe_packet<PacketIdBytes>::basic_unsubscribe_packet(
         if (!utf8string_check(e.all_topic())) {
             throw system_error{
                 make_error_code(
-                    disconnect_reason_code::topic_filter_invalid
+                    disconnect_reason_code::malformed_packet
                 )
             };
         }
@@ -207,7 +207,7 @@ basic_unsubscribe_packet<PacketIdBytes>::basic_unsubscribe_packet(buffer buf, er
         auto topic = buf.substr(0, topic_length);
         if (!utf8string_check(topic)) {
             ec = make_error_code(
-                disconnect_reason_code::topic_filter_invalid
+                disconnect_reason_code::malformed_packet
             );
             return;
         }

diff --git a/include/async_mqtt/packet/impl/v5_connect.ipp b/include/async_mqtt/packet/impl/v5_connect.ipp
@@ -92,7 +92,7 @@ connect_packet::connect_packet(
     if (!utf8string_check(client_id_)) {
         throw system_error{
             make_error_code(
-                connect_reason_code::client_identifier_not_valid
+                connect_reason_code::malformed_packet
             )
         };
     }
@@ -102,7 +102,7 @@ connect_packet::connect_packet(
         if (!utf8string_check(*user_name)) {
             throw system_error{
                 make_error_code(
-                    connect_reason_code::bad_user_name_or_password
+                    connect_reason_code::malformed_packet
                 )
             };
         }
@@ -143,7 +143,7 @@ connect_packet::connect_packet(
         if (!utf8string_check(w->topic())) {
             throw system_error{
                 make_error_code(
-                    connect_reason_code::topic_name_invalid
+                    connect_reason_code::malformed_packet
                 )
             };
         }
@@ -453,7 +453,7 @@ connect_packet::connect_packet(buffer buf, error_code& ec) {
     client_id_ = buf.substr(0, client_id_length);
     if (!utf8string_check(client_id_)) {
         ec = make_error_code(
-            connect_reason_code::client_identifier_not_valid
+            connect_reason_code::malformed_packet
         );
         return;
     }
@@ -515,7 +515,7 @@ connect_packet::connect_packet(buffer buf, error_code& ec) {
         will_topic_ = buf.substr(0, will_topic_length);
         if (!utf8string_check(will_topic_)) {
             ec = make_error_code(
-                connect_reason_code::topic_name_invalid
+                connect_reason_code::malformed_packet
             );
             return;
         }
@@ -577,7 +577,7 @@ connect_packet::connect_packet(buffer buf, error_code& ec) {
         user_name_ = buf.substr(0, user_name_length);
         if (!utf8string_check(user_name_)) {
             ec = make_error_code(
-                connect_reason_code::bad_user_name_or_password
+                connect_reason_code::malformed_packet
             );
             return;
         }

diff --git a/include/async_mqtt/packet/impl/v5_publish.ipp b/include/async_mqtt/packet/impl/v5_publish.ipp
@@ -89,7 +89,7 @@ basic_publish_packet<PacketIdBytes>::basic_publish_packet(
     if (!utf8string_check(topic_name_)) {
         throw system_error(
             make_error_code(
-                disconnect_reason_code::topic_name_invalid
+                disconnect_reason_code::malformed_packet
             )
         );
     }
@@ -436,7 +436,7 @@ basic_publish_packet<PacketIdBytes>::basic_publish_packet(buffer buf, error_code
 
     if (!utf8string_check(topic_name_)) {
         ec = make_error_code(
-            disconnect_reason_code::topic_name_invalid
+            disconnect_reason_code::malformed_packet
         );
         return;
     }

diff --git a/include/async_mqtt/packet/impl/v5_subscribe.ipp b/include/async_mqtt/packet/impl/v5_subscribe.ipp
@@ -135,7 +135,7 @@ basic_subscribe_packet<PacketIdBytes>::basic_subscribe_packet(
         if (!utf8string_check(e.all_topic())) {
             throw system_error{
                 make_error_code(
-                    disconnect_reason_code::topic_filter_invalid
+                    disconnect_reason_code::malformed_packet
                 )
             };
         }
@@ -313,7 +313,7 @@ basic_subscribe_packet<PacketIdBytes>::basic_subscribe_packet(buffer buf, error_
 
         if (!utf8string_check(topic)) {
             ec = make_error_code(
-                disconnect_reason_code::topic_filter_invalid
+                disconnect_reason_code::malformed_packet
             );
             return;
         }

diff --git a/include/async_mqtt/packet/impl/v5_unsubscribe.ipp b/include/async_mqtt/packet/impl/v5_unsubscribe.ipp
@@ -93,7 +93,7 @@ basic_unsubscribe_packet<PacketIdBytes>::basic_unsubscribe_packet(
         if (!utf8string_check(e.all_topic())) {
             throw system_error(
                 make_error_code(
-                    disconnect_reason_code::topic_filter_invalid
+                    disconnect_reason_code::malformed_packet
                 )
             );
         }
@@ -270,7 +270,7 @@ basic_unsubscribe_packet<PacketIdBytes>::basic_unsubscribe_packet(buffer buf, er
         auto topic = buf.substr(0, topic_length);
         if (!utf8string_check(topic)) {
             ec = make_error_code(
-                disconnect_reason_code::topic_filter_invalid
+                disconnect_reason_code::malformed_packet
             );
             return;
         }