Merge pull request #41 from worldcoin/0xkitsune/handle-unexpected-dbs…

…ync-fmt fix(db-sync): handle unexpected db sync payload format
worldcoin · Feb 21, 2024 · 5bc4f44 · 5bc4f44
2 parents 18fb916 + dd254ce
commit 5bc4f44
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/coordinator.rs b/src/coordinator.rs
@@ -461,7 +461,18 @@ impl Coordinator {
                 .receipt_handle
                 .context("Missing receipt handle in message")?;
 
-            let items: Vec<DbSyncPayload> = serde_json::from_str(&body)?;
+            let items = if let Ok(items) =
+                serde_json::from_str::<Vec<DbSyncPayload>>(&body)
+            {
+                items
+            } else {
+                tracing::error!(
+                    ?receipt_handle,
+                    "Failed to parse message body"
+                );
+                continue;
+            };
+
             let masks: Vec<_> =
                 items.into_iter().map(|item| (item.id, item.mask)).collect();
 

diff --git a/src/participant.rs b/src/participant.rs
@@ -179,7 +179,18 @@ impl Participant {
                 .receipt_handle
                 .context("Missing receipt handle in message")?;
 
-            let items: Vec<DbSyncPayload> = serde_json::from_str(&body)?;
+            let items = if let Ok(items) =
+                serde_json::from_str::<Vec<DbSyncPayload>>(&body)
+            {
+                items
+            } else {
+                tracing::error!(
+                    ?receipt_handle,
+                    "Failed to parse message body"
+                );
+                continue;
+            };
+
             let shares: Vec<_> = items
                 .into_iter()
                 .map(|item| (item.id, item.share))