From af78b916644b4d9ecb3b220bb8876cfccf6b7de5 Mon Sep 17 00:00:00 2001
From: Alex Yau <alex.yau@thetradedesk.com>
Date: Thu, 15 Aug 2024 10:02:04 +1000
Subject: [PATCH 1/2] Fix lint errors and lint commands

---
 package.json        |  3 ++-
 src/routes/index.ts | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 4b15f3f..a777919 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
     "start:debug": "yarn build -- --build && cross-env NODE_ENV=development node -r dotenv/config ./build/bin/www",
     "uid2": "cross-env NODE_ENV=development VIEW_FOLDER=../views_uid2/ ID_TYPE=UID2 LOCALE_FOLDER=../public/locales_uid2 nodemon -r dotenv/config --watch ./src ./src/bin/www.ts",
     "euid": "cross-env NODE_ENV=development VIEW_FOLDER=../views_euid/ ID_TYPE=EUID LOCALE_FOLDER=../public/locales_euid nodemon -r dotenv/config --watch ./src ./src/bin/www.ts",
-    "lint": "eslint '**/*.ts'",
+    "lint": "eslint .",
+    "lint-fix": "eslint --fix .",
     "build": "tsc",
     "test": "jest"
   },
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 89e03ea..335cad4 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -142,15 +142,14 @@ const defaultRouteHandler: RequestHandler<{}, {}, z.infer<typeof DefaultRouteReq
 
   try {
     step = DefaultRouteRequest.parse(req.body).step; 
-  }
-  catch (e) {
-      logger.log('error', `error while parsing the request`);
-      return;
+  } catch (e) {
+    logger.log('error', 'error while parsing the request');
+    return;
   }
 
   if (!step) {
-      logger.log('error', `no step`);
-      return;
+    logger.log('error', 'no step');
+    return;
   }
   
   const handler = Object.prototype.hasOwnProperty.call(steps, step) && steps[step];

From 6f153fb3633459dec999f70b11210a29f8bd0429 Mon Sep 17 00:00:00 2001
From: Alex Yau <alex.yau@thetradedesk.com>
Date: Thu, 15 Aug 2024 11:07:24 +1000
Subject: [PATCH 2/2] ignore CVE-2022-25883

---
 .trivyignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.trivyignore b/.trivyignore
index 982b5e5..4cda780 100644
--- a/.trivyignore
+++ b/.trivyignore
@@ -2,3 +2,6 @@
 # for more details
 # e.g. 
 # CVE-2022-3996
+
+# https://atlassian.thetradedesk.com/jira/browse/UID2-3953
+CVE-2022-25883