Integrate valid UTF-8 and publish char checking

Profiling showed it was significant enough to do so.

Integrate valid UTF-8 and publish char checking
Profiling showed it was significant enough to do so.
Wiebe Cazemier
1 parent aaeb3603
Showing 3 changed files with 7 additions and 10 deletions
mqttpacket.cpp
utils.cpp
utils.h
@@ -439,15 +439,9 @@ void MqttPacket::handlePublish()
     topic = std::string(readBytes(variable_header_length), variable_header_length);
-    if (!isValidUtf8(topic))
+    if (!isValidUtf8(topic, true))
     {
-        logger->logf(LOG_WARNING, "Client '%s' published a message with invalid UTF8. Dropping.", sender->repr().c_str());
-        return;
-    }
-
-    if (!isValidPublishPath(topic))
-    {
-        logger->logf(LOG_WARNING, "Client '%s' published a message with invalid publish path '%s'. Dropping.", sender->repr().c_str(), topic.c_str());
+        logger->logf(LOG_WARNING, "Client '%s' published a message with invalid UTF8 or +/# in it. Dropping.", sender->repr().c_str());
         return;
     }
@@ -77,7 +77,7 @@ bool topicsMatch(const std::string &amp;subscribeTopic, const std::string &amp;publishTo
     return result;
 }
-bool isValidUtf8(const std::string &s)
+bool isValidUtf8(const std::string &s, bool alsoCheckInvalidPublishChars)
 {
     int multibyte_remain = 0;
     int cur_code_point = 0;
@@ -86,6 +86,9 @@ bool isValidUtf8(const std::string &amp;s)
         if (x == 0)
             return false;
+        if (alsoCheckInvalidPublishChars && (x == '#' || x == '+'))
+            return false;
+
         if(!multibyte_remain)
         {
             cur_code_point = 0;
@@ -49,7 +49,7 @@ std::vector&lt;std::string&gt; splitToVector(const std::string &amp;input, const char sep,
 bool topicsMatch(const std::string &subscribeTopic, const std::string &publishTopic);
-bool isValidUtf8(const std::string &s);
+bool isValidUtf8(const std::string &s, bool alsoCheckInvalidPublishChars = false);
 bool strContains(const std::string &s, const std::string &needle);