catch queries that cause TypeError (#10556)

badges · Sep 30, 2024 · da60020 · da60020
1 parent 0f14eed
commit da60020
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/services/dynamic/dynamic-json.tester.js b/services/dynamic/dynamic-json.tester.js
@@ -160,12 +160,25 @@ t.create('query with parse error')
   })
 
 // Example from https://stackoverflow.com/q/11670384/893113
-const badQuery =
+const invalidTokenQuery =
   "$[?(en|**|(@.object.property.one=='other') && (@.object.property.two=='something(abc/def)'))]"
 t.create('query with invalid token')
   .get(
     `.json?url=https://github.com/badges/shields/raw/master/package.json&query=${encodeURIComponent(
-      badQuery,
+      invalidTokenQuery,
+    )}`,
+  )
+  .expectBadge({
+    label: 'custom badge',
+    message: 'query not supported',
+    color: 'red',
+  })
+
+const invalidEscapequery = "$.definitions.common.properties.['@id'].format"
+t.create('query with invalid escape')
+  .get(
+    `.json?url=https://raw.githubusercontent.com/json-ld/json-ld.org/refs/heads/main/schemas/jsonld-schema.json&query=${encodeURIComponent(
+      invalidEscapequery,
     )}`,
   )
   .expectBadge({

diff --git a/services/dynamic/json-path.js b/services/dynamic/json-path.js
@@ -48,7 +48,10 @@ export default superclass =>
         values = jp({ json: data, path: pathExpression, eval: false })
       } catch (e) {
         const { message } = e
-        if (message.includes('prevented in JSONPath expression')) {
+        if (
+          message.includes('prevented in JSONPath expression') ||
+          e instanceof TypeError
+        ) {
           throw new InvalidParameter({
             prettyMessage: 'query not supported',
           })