Merge pull request #563 from privacy-tech-lab/issue-559

Issue 559
privacy-tech-lab · Mar 15, 2024 · 824001a · 824001a
2 parents 2b3c335 + d49a748
commit 824001a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/background/analysis/analyze.js b/src/background/analysis/analyze.js
@@ -202,11 +202,11 @@ async function analyze(request, userData) {
     const parent = tagParent(reqUrl);
 
     // push the job to the Queue (will add the evidence for one HTTP request at a time)
-    evidenceQ.push(function (cb) {
+    evidenceQ.push(async function (cb) {
       //@ts-ignore
       cb(
         undefined,
-        addToEvidenceStore(
+        await addToEvidenceStore(
           allEvidence,
           parent,
           rootUrl,

diff --git a/src/background/analysis/buildUserData/structuredRoutines.js b/src/background/analysis/buildUserData/structuredRoutines.js
@@ -135,11 +135,7 @@ export function buildGeneralRegex(genString) {
   for (let i = 0; i < genString.length; i++) {
     const c = genString.charAt(i);
     // add digits regularly
-    if (
-      (c >= "0" && c <= "9") ||
-      (c >= "A" && c <= "Z") ||
-      (c >= "a" && c <= "z")
-    ) {
+    if (new RegExp(/[\p{L}\p{N}]/, "u").test(c)){
       regexString.push(c);
     }
     // optional non-digit otherwise

diff --git a/src/background/analysis/interactDB/addEvidence.js b/src/background/analysis/interactDB/addEvidence.js
@@ -107,7 +107,7 @@ function updateFetchedDict(evidenceDict, e) {
  * @param {string|undefined} parent Parent company of the request Url, if possible
  * @param {string} rootU The rootUrl of the request
  * @param {string} requestU The requestUrl of the request
- * @returns {Promise<string|void>} Side effects only
+ * @returns {Promise<string>} Side effects only
  *
  */
 

diff --git a/src/background/analysis/requestAnalysis/scanHTTP.js b/src/background/analysis/requestAnalysis/scanHTTP.js
@@ -46,6 +46,13 @@ export function getAllEvidenceForRequest(request, userData) {
     "requestBody",
     "responseData",
   ]);
+  request.reqUrl = decodeURI(request.reqUrl);
+  const decodedStrReq = JSON.stringify(request, [
+    "reqUrl",
+    "requestBody",
+    "responseData",
+  ]);
+  //console.log(strRequest);
 
   /**
    * @type {Evidence[]|any[]}
@@ -126,7 +133,7 @@ export function getAllEvidenceForRequest(request, userData) {
       watchlistDict[typeEnum.userKeyword].forEach((keyword) => {
         executeAndPush(
           regexSearch(
-            strRequest,
+            decodedStrReq,
             keyword,
             rootUrl,
             reqUrl,

diff --git a/src/libs/indexed-db/settings/index.js b/src/libs/indexed-db/settings/index.js
@@ -43,7 +43,7 @@ export const setDefaultSettings = async () => {
     browser.tabs.create({ url: browser.runtime.getURL("options.html") });
   }
 
-  loadModel();
+  await loadModel();
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ export const setDefaultSettings = async () => { @@
         browser.tabs.create({ url: browser.runtime.getURL("options.html") });
       }
-      loadModel();
+      await loadModel();
     }
     /**
@@ Expand Down @@