Validate user id propagated from upstream

Summary: Even though we already added some validation on the places setting user id to context prop, however based on https://fburl.com/unidash/4qwfs4gr, we still see there are some invalid user id in context prop. Based on analysis, this could be passed through context prop propagation. Add the validation to block invalid user id from upstream.

Differential Revision: D84106032

fbshipit-source-id: e310ceabd7a95e3cd7b3c894de938704abc8951f

Author: Baohua Shan

third-party/thrift/src/thrift/lib/hack/src/ThriftContextPropState.php

@@ -159,6 +159,21 @@ private static function getTfmFromString(
     if ($skip_experiment_id_ingestion && $tfm->experiment_ids is nonnull) {
       $tfm->experiment_ids = vec[];
     }
+    // Make sure the user ids are valid (non-null, positive) and matches the type
+    $user_ids = $tfm->baggage?->user_ids;
+    if ($user_ids is nonnull) {
+      if ($user_ids->fb_user_id is nonnull) {
+        $user_ids->fb_user_id =
+          self::coerceId($user_ids->fb_user_id, UserIdCategory::FB);
+      }
+      if ($user_ids->ig_user_id is nonnull) {
+        $user_ids->ig_user_id =
+          self::coerceId($user_ids->ig_user_id, UserIdCategory::IG);
+      }
+    }
+    if ($tfm->baggage is nonnull) {
+      $tfm->baggage->user_ids = $user_ids;
+    }
 
     return $tfm;
 
@@ -464,18 +479,6 @@ public function getUserIds()[]: ?ContextProp\UserIds {
     return ($ig_user_id as int);
   }
 
-  // user id setters
-  private function setUserIds(
-    ?ContextProp\UserIds $user_ids,
-  )[write_props]: void {
-    $this->storage->baggage =
-      $this->storage->baggage ?? ContextProp\Baggage::withDefaultValues();
-
-    $baggage = $this->storage->baggage as nonnull;
-    $baggage->user_ids = $user_ids;
-    $this->dirty();
-  }
-
   private function setFBUserId(?int $fb_user_id): void {
     $this->storage->baggage =
       $this->storage->baggage ?? ContextProp\Baggage::withDefaultValues();

third-party/thrift/src/thrift/lib/hack/src/__tests__/ThriftContextPropStateTest.php

@@ -203,6 +203,7 @@ public function testInitialization()[defaults]: void {
 
   public async function testInitializationWithUserIds(
   )[defaults]: Awaitable<void> {
+    self::mockFunction(IgidUtils::isUserFbid<>)->mockReturn(true);
     $tfm = ThriftFrameworkMetadata::withDefaultValues();
     $tfm->baggage = ContextProp\Baggage::withDefaultValues();
     $tfm->baggage->user_ids = ContextProp\UserIds::fromShape(
@@ -253,6 +254,7 @@ public function testInitialization()[defaults]: void {
   public async function testInitializationWithBothTFMandVC(
   )[defaults]: Awaitable<void> {
     MockJustKnobs::setBool('meta_cp/www:enable_user_id_ctx_prop', true);
+    self::mockFunction(IgidUtils::isUserFbid<>)->mockReturn(true);
     $tfm = ThriftFrameworkMetadata::withDefaultValues();
     $tfm->baggage = ContextProp\Baggage::withDefaultValues();
     $tfm->baggage->user_ids = ContextProp\UserIds::fromShape(
@@ -309,6 +311,7 @@ public function testInitialization()[defaults]: void {
   public async function testUpdatedWithExplicitFBUserId(
   )[defaults]: Awaitable<void> {
     MockJustKnobs::setBool('meta_cp/www:enable_user_id_ctx_prop', true);
+    self::mockFunction(IgidUtils::isUserFbid<>)->mockReturn(true);
     $tfm = ThriftFrameworkMetadata::withDefaultValues();
     $tfm->baggage = ContextProp\Baggage::withDefaultValues();
     $tfm->baggage->user_ids = ContextProp\UserIds::fromShape(