PayloadChannel: enhance and test IsRequest(), IsNotification()

versatica · Jul 20, 2022 · 6358399 · 6358399
1 parent 1e75fe1
commit 6358399
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 8 deletions.
diff --git a/worker/include/PayloadChannel/Notification.hpp b/worker/include/PayloadChannel/Notification.hpp
@@ -18,7 +18,7 @@ namespace PayloadChannel
 		};
 
 	public:
-		static bool IsNotification(const char* jsonNotification);
+		static bool IsNotification(const char* msg, size_t msgLen);
 
 	private:
 		static absl::flat_hash_map<std::string, EventId> string2EventId;

diff --git a/worker/include/PayloadChannel/PayloadChannelRequest.hpp b/worker/include/PayloadChannel/PayloadChannelRequest.hpp
@@ -23,7 +23,7 @@ namespace PayloadChannel
 		};
 
 	public:
-		static bool IsRequest(const char* msg);
+		static bool IsRequest(const char* msg, size_t msgLen);
 
 	private:
 		static absl::flat_hash_map<std::string, MethodId> string2MethodId;

diff --git a/worker/meson.build b/worker/meson.build
@@ -280,6 +280,8 @@ mediasoup_worker_test = executable(
   ],
   sources: common_sources + [
     'test/src/tests.cpp',
+    'test/src/PayloadChannel/TestPayloadChannelRequest.cpp',
+    'test/src/PayloadChannel/TestNotification.cpp',
     'test/src/RTC/TestKeyFrameRequestManager.cpp',
     'test/src/RTC/TestNackGenerator.cpp',
     'test/src/RTC/TestRateCalculator.cpp',

diff --git a/worker/src/PayloadChannel/Notification.cpp b/worker/src/PayloadChannel/Notification.cpp
@@ -27,11 +27,11 @@ namespace PayloadChannel
 	/*
 	 * msg notification starts with "n:"
 	 */
-	bool Notification::IsNotification(const char* msg)
+	bool Notification::IsNotification(const char* msg, size_t msgLen)
 	{
 		MS_TRACE();
 
-		return (msg[0] == 'n' && msg[1] == ':');
+		return (msgLen > 2 && msg[0] == 'n' && msg[1] == ':');
 	}
 
 	/* Instance methods. */

diff --git a/worker/src/PayloadChannel/PayloadChannelRequest.cpp b/worker/src/PayloadChannel/PayloadChannelRequest.cpp
@@ -23,11 +23,11 @@ namespace PayloadChannel
 	/*
 	 * msg request starts with "r:"
 	 */
-	bool PayloadChannelRequest::IsRequest(const char* msg)
+	bool PayloadChannelRequest::IsRequest(const char* msg, size_t msgLen)
 	{
 		MS_TRACE();
 
-		return (msg[0] == 'r' && msg[1] == ':');
+		return (msgLen > 2 && msg[0] == 'r' && msg[1] == ':');
 	}
 
 	/* Instance methods. */

diff --git a/worker/src/PayloadChannel/PayloadChannelSocket.cpp b/worker/src/PayloadChannel/PayloadChannelSocket.cpp
@@ -366,7 +366,7 @@ namespace PayloadChannel
 
 		if (!this->ongoingNotification && !this->ongoingRequest)
 		{
-			if (PayloadChannelRequest::IsRequest(msg))
+			if (PayloadChannelRequest::IsRequest(msg, msgLen))
 			{
 				try
 				{
@@ -381,7 +381,7 @@ namespace PayloadChannel
 					MS_ERROR("discarding wrong Payload Channel request: %s", error.what());
 				}
 			}
-			else if (Notification::IsNotification(msg))
+			else if (Notification::IsNotification(msg, msgLen))
 			{
 				try
 				{

diff --git a/worker/test/src/PayloadChannel/TestNotification.cpp b/worker/test/src/PayloadChannel/TestNotification.cpp
@@ -0,0 +1,34 @@
+#include "common.hpp"
+#include "PayloadChannel/Notification.hpp"
+#include <catch2/catch.hpp>
+
+SCENARIO("Notification", "[channel][notification]")
+{
+	SECTION("notification")
+	{
+		char foo[]{"n:abcd"};
+
+		REQUIRE(PayloadChannel::Notification::IsNotification(foo, sizeof(foo)) == true);
+	}
+
+	SECTION("request")
+	{
+		char foo[]{"r:abcd"};
+
+		REQUIRE(PayloadChannel::Notification::IsNotification(foo, sizeof(foo)) == false);
+	}
+
+	SECTION("non notification")
+	{
+		char foo[]{"abcd"};
+
+		REQUIRE(PayloadChannel::Notification::IsNotification(foo, sizeof(foo)) == false);
+	}
+
+	SECTION("empty string")
+	{
+		char foo[]{};
+
+		REQUIRE(PayloadChannel::Notification::IsNotification(foo, sizeof(foo)) == false);
+	}
+}
diff --git a/worker/test/src/PayloadChannel/TestPayloadChannelRequest.cpp b/worker/test/src/PayloadChannel/TestPayloadChannelRequest.cpp
@@ -0,0 +1,34 @@
+#include "common.hpp"
+#include "PayloadChannel/PayloadChannelRequest.hpp"
+#include <catch2/catch.hpp>
+
+SCENARIO("ChannelRequest", "[channel][request]")
+{
+	SECTION("notification")
+	{
+		char foo[]{"n:abcd"};
+
+		REQUIRE(PayloadChannel::PayloadChannelRequest::IsRequest(foo, sizeof(foo)) == false);
+	}
+
+	SECTION("request")
+	{
+		char foo[]{"r:abcd"};
+
+		REQUIRE(PayloadChannel::PayloadChannelRequest::IsRequest(foo, sizeof(foo)) == true);
+	}
+
+	SECTION("non request")
+	{
+		char foo[]{"abcd"};
+
+		REQUIRE(PayloadChannel::PayloadChannelRequest::IsRequest(foo, sizeof(foo)) == false);
+	}
+
+	SECTION("empty string")
+	{
+		char foo[]{};
+
+		REQUIRE(PayloadChannel::PayloadChannelRequest::IsRequest(foo, sizeof(foo)) == false);
+	}
+}