feat: upgrade newrelic from 9.15.0 to 10.0.0

Snyk has created this PR to upgrade newrelic from 9.15.0 to 10.0.0. See this package in npm: https://www.npmjs.com/package/newrelic See this project in Snyk: https://app.snyk.io/org/mystikfluu/project/c5b23892-809c-4121-9c2f-67962c7a4953?utm_source=github&utm_medium=referral&page=upgrade-pr
2023-05-12 01:08:05 +00:00
4 changed files with 105 additions and 42 deletions
@@ -4,7 +4,7 @@
 403: login error (no cookie)
 404: invalid url / not found
 410-419: argument/data error
-420: invalid authentication object
+420: invalid authetication object
 429: ratelimit

 500: server error
@@ -14,15 +14,15 @@
        "compression": "^1.7.4",
        "cookie-parser": "^1.4.6",
        "ejs": "^3.1.9",
-        "express": "^4.18.3",
+        "express": "^4.18.2",
        "express-fileupload": "^1.3.1",
        "express-useragent": "^1.0.15",
        "hcaptcha": "^0.1.1",
        "hsts": "^2.2.0",
        "html-minifier-terser": "^7.2.0",
-        "lru-cache": "^9.1.2",
-        "mysql2": "^3.3.5",
-        "newrelic": "^9.11.0",
+        "lru-cache": "^9.0.1",
+        "mysql2": "^3.2.1",
+        "newrelic": "^10.0.0",
        "sharp": "^0.30.7",
        "spdy": "^4.0.2",
        "swagger-autogen": "^2.23.1",
@@ -873,13 +873,13 @@
      }
    },
    "node_modules/express": {
-      "version": "4.18.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
-      "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.1",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
        "cookie": "0.5.0",
@@ -932,6 +932,43 @@
        "node": ">=4.5"
      }
    },
+    "node_modules/express/node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/express/node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/express/node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -1381,9 +1418,9 @@
      }
    },
    "node_modules/lru-cache": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz",
-      "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.1.tgz",
+      "integrity": "sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg==",
      "engines": {
        "node": "14 || >=16.14"
      }
@@ -1482,9 +1519,9 @@
      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
    },
    "node_modules/mysql2": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.3.5.tgz",
-      "integrity": "sha512-ZTQGAzxGeaX1PyeSiZFCgQ34uiXguaEpn3aTFN9Enm9JDnbwWo+4/CJnDdQZ3n0NaMeysi8vwtW/jNUb9VqVDw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.2.1.tgz",
+      "integrity": "sha512-o/5GH3/NwgOk6fO+AaVoZfyCAliFWUzTXaPUa80ZPzJFHy9kQyR/D2OSJW9gyB1TFATyY3ZsKY3/srZXMZCKUg==",
      "dependencies": {
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
@@ -1570,9 +1607,9 @@
      }
    },
    "node_modules/newrelic": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/newrelic/-/newrelic-9.15.0.tgz",
-      "integrity": "sha512-5bo4JDR76sk6ml8qykqQyUJIJ6IZfZrMWAbSwUVYErSs8faYOac6QpzRB11EvHQKZ8fnz5cRcksgERwY7Ia3zA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/newrelic/-/newrelic-10.0.0.tgz",
+      "integrity": "sha512-FyXsJMUApTVG+neypymDIDcBAdy8CwAmVmaa2gqLektLuX6Z77pKSLOBfpanhTgFEe/XS23tgsnEqx2eOF+GDw==",
      "dependencies": {
        "@grpc/grpc-js": "^1.8.10",
        "@grpc/proto-loader": "^0.7.5",
@@ -3234,13 +3271,13 @@
      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
    },
    "express": {
-      "version": "4.18.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
-      "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
      "requires": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.1",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
        "cookie": "0.5.0",
@@ -3271,6 +3308,36 @@
        "vary": "~1.1.2"
      },
      "dependencies": {
+        "body-parser": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
+        "raw-body": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
+        },
        "statuses": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -3642,9 +3709,9 @@
      }
    },
    "lru-cache": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz",
-      "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ=="
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.1.tgz",
+      "integrity": "sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg=="
    },
    "media-typer": {
      "version": "0.3.0",
@@ -3713,9 +3780,9 @@
      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
    },
    "mysql2": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.3.5.tgz",
-      "integrity": "sha512-ZTQGAzxGeaX1PyeSiZFCgQ34uiXguaEpn3aTFN9Enm9JDnbwWo+4/CJnDdQZ3n0NaMeysi8vwtW/jNUb9VqVDw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.2.1.tgz",
+      "integrity": "sha512-o/5GH3/NwgOk6fO+AaVoZfyCAliFWUzTXaPUa80ZPzJFHy9kQyR/D2OSJW9gyB1TFATyY3ZsKY3/srZXMZCKUg==",
      "requires": {
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
@@ -3784,9 +3851,9 @@
      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
    },
    "newrelic": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/newrelic/-/newrelic-9.15.0.tgz",
-      "integrity": "sha512-5bo4JDR76sk6ml8qykqQyUJIJ6IZfZrMWAbSwUVYErSs8faYOac6QpzRB11EvHQKZ8fnz5cRcksgERwY7Ia3zA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/newrelic/-/newrelic-10.0.0.tgz",
+      "integrity": "sha512-FyXsJMUApTVG+neypymDIDcBAdy8CwAmVmaa2gqLektLuX6Z77pKSLOBfpanhTgFEe/XS23tgsnEqx2eOF+GDw==",
      "requires": {
        "@contrast/fn-inspect": "^3.3.0",
        "@grpc/grpc-js": "^1.8.10",
@@ -5,15 +5,15 @@
    "compression": "^1.7.4",
    "cookie-parser": "^1.4.6",
    "ejs": "^3.1.9",
-    "express": "^4.18.3",
+    "express": "^4.18.2",
    "express-fileupload": "^1.3.1",
    "express-useragent": "^1.0.15",
    "hcaptcha": "^0.1.1",
    "hsts": "^2.2.0",
-    "newrelic": "^9.15.0",
+    "newrelic": "^10.0.0",
    "html-minifier-terser": "^7.2.0",
-    "lru-cache": "^9.1.2",
-    "mysql2": "^3.3.5",
+    "lru-cache": "^9.0.1",
+    "mysql2": "^3.2.1",
    "newrelic": "^9.11.0",
    "sharp": "^0.30.7",
    "spdy": "^4.0.2",
@@ -120,8 +120,8 @@ export const setup = function (router, con, server) {
            || request.originalUrl.split("?").shift(); //backup in case anything goes wrong
    
        let path = ""
-        if (existsSync(dir + "views/" + originalUrl)) {
-            path = dir + "views/" + originalUrl
+        if (existsSync(dir + "views" + originalUrl)) {
+            path = dir + "views" + originalUrl
            //send .txt files as plaintext to help browsers interpret it correctly
            if(originalUrl.endsWith(".txt")) {
                response.set('Content-Type', 'text/plain');
@@ -208,14 +208,10 @@ export const setup = function (router, con, server) {
    /**
    * Handle default URI as /index (interpreted redirect: "localhost" -> "localhost/index" )
    */
-    router.get("/", (req, res) => {
+    router.get("/", function (req, res) {
        req.params.file = "index"
        handleUserFiles(req,res,"/index")
    });

    router.get("/:file", handleUserFiles);
-    router.get("/:folder/:file", (req, res) => {
-        req.params.file = req.params.folder+"/"+req.params.file
-        handleUserFiles(req,res)
-    });
 }