From 40c846ce8f44ae14e8d5cd418bd1fab16d531c6c Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 9 Aug 2022 17:27:51 +0100
Subject: [PATCH] Handle braces within quotes

---
 packages/server/src/integrations/mongodb.ts   | 41 +++++++-------
 .../src/integrations/tests/mongo.spec.js      | 54 +++++++++++++++++++
 2 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts
index 0ae9515a0e..9bfc105144 100644
--- a/packages/server/src/integrations/mongodb.ts
+++ b/packages/server/src/integrations/mongodb.ts
@@ -117,26 +117,31 @@ module MongoDBModule {
     }
 
     parseQueryParams(params: string, mode: string) {
-      let queryParams = params.split(/(?<=}),[\n\s]*(?={)/g)
-      if (queryParams.length > 3) {
-        for (let i = 0; i < queryParams.length; i++) {
-          const openCount = queryParams[i].match(/{/g)?.length ?? 0
-          const closeCount = queryParams[i].match(/}/g)?.length ?? 0
-          if ((openCount + closeCount) % 2 !== 0) {
-            if (openCount > closeCount) {
-              queryParams[i] += `, ${queryParams[i + 1]}`
-              queryParams.splice(i + 1, 1)
-            } else {
-              queryParams[i - 1] += `, ${queryParams[i]}`
-              queryParams.splice(i, 1)
-              i--
-            }
-          }
+      let queryParams = []
+      let openCount = 0
+      let inQuotes = false
+      let i = 0
+      let startIndex = 0
+      for (let c of params) {
+        if (c === '"') {
+          inQuotes = !inQuotes
         }
+        if (c === '{' && !inQuotes) {
+          openCount++
+          if (openCount === 1) {
+            startIndex = i
+          }
+        } else if (c === '}' && !inQuotes) {
+          if (openCount === 1) {
+            queryParams.push(JSON.parse(params.substring(startIndex, i+1)))
+          }
+          openCount--
+        }
+        i++
       }
-      let group1 = queryParams[0] ? JSON.parse(queryParams[0]) : {}
-      let group2 = queryParams[1] ? JSON.parse(queryParams[1]) : {}
-      let group3 = queryParams[2] ? JSON.parse(queryParams[2]) : {}
+      let group1 = queryParams[0] ?? {}
+      let group2 = queryParams[1] ?? {}
+      let group3 = queryParams[2] ?? {}
       if (mode === "update") {
         return {
           filter: group1,
diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js
index 17561723b3..02d37b18a2 100644
--- a/packages/server/src/integrations/tests/mongo.spec.js
+++ b/packages/server/src/integrations/tests/mongo.spec.js
@@ -266,4 +266,58 @@ describe("MongoDB Integration", () => {
       upsert: true
     })
   })
+
+  it("ignores braces within strings when parsing nested objects", async () => {
+    const query = {
+      json: `{
+          "_id": {
+            "$eq": "ObjectId('ACBD12345678ABCD12345678')"
+          }
+        },
+        {
+          "$set": {
+            "value": {
+              "data": [
+                { "cid": 1 },
+                { "cid": 2 },
+                { "nested": {
+                  "name": "te}st"
+                }}
+              ]
+            }
+          }
+        },
+        {
+          "upsert": true,
+          "extra": "ad{d"
+        }`,
+      extra: { collection: "testCollection", actionTypes: "updateOne" },
+    }
+    await config.integration.update(query)
+    expect(config.integration.client.updateOne).toHaveBeenCalled()
+    
+    const args = config.integration.client.updateOne.mock.calls[0]
+    expect(args[0]).toEqual({
+      _id: {
+        $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
+      }
+    })
+    expect(args[1]).toEqual({
+      $set: {
+        value: {
+          data: [
+            { cid: 1 },
+            { cid: 2 },
+            { nested: {
+              name: "te}st"
+            }}
+          ]
+        },
+      },
+    })
+    expect(args[2]).toEqual({
+      upsert: true,
+      extra: "ad{d"
+    })
+  })
 })