Populate the allowlist with message types

Summary: Populate the allowlist with message types and add tests

Reviewed By: sharmafb

Differential Revision: D91296473

fbshipit-source-id: 56db7cfe32e626fec772441de2cd7b15a800073e

Author: sandarsh

moxygen/MoQFramer.cpp

@@ -146,19 +146,72 @@ folly::Expected<uint64_t, moxygen::ErrorCode> decodeDelta(
 
 namespace moxygen {
 
+// Frame type sets for parameter allowlist
+const folly::F14FastSet<FrameType> kAllowedFramesForAuthToken = {
+    FrameType::PUBLISH,
+    FrameType::SUBSCRIBE,
+    FrameType::SUBSCRIBE_UPDATE,
+    FrameType::SUBSCRIBE_ANNOUNCES,
+    FrameType::ANNOUNCE,
+    FrameType::TRACK_STATUS,
+    FrameType::FETCH};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForDeliveryTimeout = {
+    FrameType::PUBLISH_OK,
+    FrameType::SUBSCRIBE,
+    FrameType::SUBSCRIBE_UPDATE};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForSubscriberPriority = {
+    FrameType::SUBSCRIBE,
+    FrameType::FETCH,
+    FrameType::SUBSCRIBE_UPDATE,
+    FrameType::PUBLISH_OK};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForSubscriptionFilter = {
+    FrameType::SUBSCRIBE,
+    FrameType::PUBLISH_OK,
+    FrameType::SUBSCRIBE_UPDATE};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForExpires = {
+    FrameType::SUBSCRIBE_OK,
+    FrameType::PUBLISH,
+    FrameType::PUBLISH_OK,
+    FrameType::REQUEST_OK};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForGroupOrder = {
+    FrameType::SUBSCRIBE,
+    FrameType::PUBLISH_OK,
+    FrameType::FETCH};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForLargestObject = {
+    FrameType::SUBSCRIBE_OK,
+    FrameType::PUBLISH,
+    FrameType::REQUEST_OK};
+
+const folly::F14FastSet<FrameType> kAllowedFramesForForward = {
+    FrameType::SUBSCRIBE,
+    FrameType::SUBSCRIBE_UPDATE,
+    FrameType::PUBLISH,
+    FrameType::PUBLISH_OK,
+    FrameType::SUBSCRIBE_ANNOUNCES};
+
 // Allowlist mapping: TrackRequestParamKey -> set of allowed FrameTypes
+// Empty set means allowed for all frame types
 const folly::F14FastMap<TrackRequestParamKey, folly::F14FastSet<FrameType>>
     kParamAllowlist = {
-        {TrackRequestParamKey::DELIVERY_TIMEOUT, {}},
-        {TrackRequestParamKey::AUTHORIZATION_TOKEN, {}},
+        {TrackRequestParamKey::AUTHORIZATION_TOKEN, kAllowedFramesForAuthToken},
+        {TrackRequestParamKey::DELIVERY_TIMEOUT,
+         kAllowedFramesForDeliveryTimeout},
         {TrackRequestParamKey::MAX_CACHE_DURATION, {}},
         {TrackRequestParamKey::PUBLISHER_PRIORITY, {}},
-        {TrackRequestParamKey::SUBSCRIBER_PRIORITY, {}},
-        {TrackRequestParamKey::SUBSCRIPTION_FILTER, {}},
-        {TrackRequestParamKey::EXPIRES, {}},
-        {TrackRequestParamKey::GROUP_ORDER, {}},
-        {TrackRequestParamKey::LARGEST_OBJECT, {}},
-        {TrackRequestParamKey::FORWARD, {}},
+        {TrackRequestParamKey::SUBSCRIBER_PRIORITY,
+         kAllowedFramesForSubscriberPriority},
+        {TrackRequestParamKey::SUBSCRIPTION_FILTER,
+         kAllowedFramesForSubscriptionFilter},
+        {TrackRequestParamKey::EXPIRES, kAllowedFramesForExpires},
+        {TrackRequestParamKey::GROUP_ORDER, kAllowedFramesForGroupOrder},
+        {TrackRequestParamKey::LARGEST_OBJECT, kAllowedFramesForLargestObject},
+        {TrackRequestParamKey::FORWARD, kAllowedFramesForForward},
 };
 
 bool Parameters::isParamAllowed(TrackRequestParamKey key) const {

moxygen/test/MoQFramerTest.cpp

@@ -3477,3 +3477,56 @@ TEST(MoQFramerV16DeathTest, AnnounceCancelWithoutRequestIDDies) {
       writer.writeAnnounceCancel(writeBuf, announceCancel),
       "RequestID required for v16\\+ AnnounceCancel");
 }
+
+// Tests for Parameters::isParamAllowed()
+class ParametersIsParamAllowedTest : public ::testing::Test {};
+
+TEST_F(ParametersIsParamAllowedTest, ParamAllowedForFrameType) {
+  Parameters params(FrameType::SUBSCRIBE);
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::DELIVERY_TIMEOUT));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::AUTHORIZATION_TOKEN));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::SUBSCRIBER_PRIORITY));
+}
+
+TEST_F(ParametersIsParamAllowedTest, ParamNotAllowedForFrameType) {
+  Parameters params(FrameType::FETCH);
+  EXPECT_FALSE(params.isParamAllowed(TrackRequestParamKey::DELIVERY_TIMEOUT));
+  EXPECT_FALSE(params.isParamAllowed(TrackRequestParamKey::EXPIRES));
+}
+
+TEST_F(ParametersIsParamAllowedTest, ParamAllowedForAllFrameTypes) {
+  // MAX_CACHE_DURATION and PUBLISHER_PRIORITY have empty sets = allowed for all
+  Parameters paramsAnnounce(FrameType::ANNOUNCE);
+  EXPECT_TRUE(
+      paramsAnnounce.isParamAllowed(TrackRequestParamKey::MAX_CACHE_DURATION));
+  EXPECT_TRUE(
+      paramsAnnounce.isParamAllowed(TrackRequestParamKey::PUBLISHER_PRIORITY));
+
+  Parameters paramsFetch(FrameType::FETCH);
+  EXPECT_TRUE(
+      paramsFetch.isParamAllowed(TrackRequestParamKey::MAX_CACHE_DURATION));
+  EXPECT_TRUE(
+      paramsFetch.isParamAllowed(TrackRequestParamKey::PUBLISHER_PRIORITY));
+}
+
+TEST_F(ParametersIsParamAllowedTest, UnknownParamKeyReturnsFalse) {
+  Parameters params(FrameType::SUBSCRIBE);
+  // Cast an unknown value to TrackRequestParamKey
+  auto unknownKey = static_cast<TrackRequestParamKey>(9999);
+  EXPECT_FALSE(params.isParamAllowed(unknownKey));
+}
+
+TEST_F(ParametersIsParamAllowedTest, MultipleParamsMixedResults) {
+  Parameters params(FrameType::PUBLISH_OK);
+  // Allowed for PUBLISH_OK
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::DELIVERY_TIMEOUT));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::SUBSCRIBER_PRIORITY));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::SUBSCRIPTION_FILTER));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::EXPIRES));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::GROUP_ORDER));
+  EXPECT_TRUE(params.isParamAllowed(TrackRequestParamKey::FORWARD));
+  // NOT allowed for PUBLISH_OK
+  EXPECT_FALSE(
+      params.isParamAllowed(TrackRequestParamKey::AUTHORIZATION_TOKEN));
+  EXPECT_FALSE(params.isParamAllowed(TrackRequestParamKey::LARGEST_OBJECT));
+}