fix bug in handleUserFiles

fix not detecting file, as originalUrl has no "/"
Merge branch 'master' of https://github.com/002Hub/IPost
2023-07-05 11:27:27 +02:00 · 2023-07-05 11:24:00 +02:00 · 2023-07-05 11:23:57 +02:00 · 2023-07-05 11:19:45 +02:00 · 2023-07-05 11:19:38 +02:00 · 2023-07-05 11:18:51 +02:00
4 changed files with 24 additions and 20 deletions
--- a/error_codes.txt
+++ b/error_codes.txt
@ -4,7 +4,7 @@
 403: login error (no cookie)
 404: invalid url / not found
 410-419: argument/data error
-420: invalid authetication object
+420: invalid authentication object
 429: ratelimit

 500: server error
--- a/package-lock.json
+++ b/package-lock.json
@ -20,8 +20,8 @@
        "hcaptcha": "^0.1.1",
        "hsts": "^2.2.0",
        "html-minifier-terser": "^7.2.0",
-        "lru-cache": "^9.0.1",
-        "mysql2": "^3.2.1",
+        "lru-cache": "^9.0.3",
+        "mysql2": "^3.2.3",
        "newrelic": "^9.11.0",
        "sharp": "^0.30.7",
        "spdy": "^4.0.2",
@ -1418,9 +1418,9 @@
      }
    },
    "node_modules/lru-cache": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.1.tgz",
-      "integrity": "sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.3.tgz",
+      "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==",
      "engines": {
        "node": "14 || >=16.14"
      }
@ -1519,9 +1519,9 @@
      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
    },
    "node_modules/mysql2": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.2.1.tgz",
-      "integrity": "sha512-o/5GH3/NwgOk6fO+AaVoZfyCAliFWUzTXaPUa80ZPzJFHy9kQyR/D2OSJW9gyB1TFATyY3ZsKY3/srZXMZCKUg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.2.3.tgz",
+      "integrity": "sha512-aethLO9cSAGba9gOXzNayuyq2GAVTKc3vwr+uETOX1yjUuH6MS6D5ewhUqkaukmtjzrb5C9ML7YmmmRBjQ3r3Q==",
      "dependencies": {
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
@ -3709,9 +3709,9 @@
      }
    },
    "lru-cache": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.1.tgz",
-      "integrity": "sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg=="
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.3.tgz",
+      "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg=="
    },
    "media-typer": {
      "version": "0.3.0",
@ -3780,9 +3780,9 @@
      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
    },
    "mysql2": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.2.1.tgz",
-      "integrity": "sha512-o/5GH3/NwgOk6fO+AaVoZfyCAliFWUzTXaPUa80ZPzJFHy9kQyR/D2OSJW9gyB1TFATyY3ZsKY3/srZXMZCKUg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.2.3.tgz",
+      "integrity": "sha512-aethLO9cSAGba9gOXzNayuyq2GAVTKc3vwr+uETOX1yjUuH6MS6D5ewhUqkaukmtjzrb5C9ML7YmmmRBjQ3r3Q==",
      "requires": {
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
--- a/package.json
+++ b/package.json
@ -12,8 +12,8 @@
    "hsts": "^2.2.0",
    "newrelic": "^9.15.0",
    "html-minifier-terser": "^7.2.0",
-    "lru-cache": "^9.0.1",
-    "mysql2": "^3.2.1",
+    "lru-cache": "^9.0.3",
+    "mysql2": "^3.2.3",
    "newrelic": "^9.11.0",
    "sharp": "^0.30.7",
    "spdy": "^4.0.2",
--- a/routes/userfiles.js
+++ b/routes/userfiles.js
@ -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,10 +208,14 @@ export const setup = function (router, con, server) {
    /**
    * Handle default URI as /index (interpreted redirect: "localhost" -> "localhost/index" )
    */
-    router.get("/", function (req, res) {
+    router.get("/", (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)
+    });
 }
Author	SHA1	Message	Date
Mystikfluu	a2ef9e0e9f	fix bug in handleUserFiles fix not detecting file, as originalUrl has no "/"	2023-07-05 11:27:27 +02:00
Mystikfluu	503b546470	Merge branch 'master' of https://github.com/002Hub/IPost	2023-07-05 11:24:00 +02:00
Mystikfluu	a550cfde7b	properly serve sub-folders	2023-07-05 11:23:57 +02:00
Code002Lover	344c117938	Merge pull request #85 from 002Hub/snyk-upgrade-9c29503f2b6842bffc0453bc99b44b8e [Snyk] Upgrade lru-cache from 9.0.1 to 9.0.3	2023-07-05 11:19:45 +02:00
Code002Lover	026aa7ac52	Merge branch 'master' into snyk-upgrade-9c29503f2b6842bffc0453bc99b44b8e	2023-07-05 11:19:38 +02:00
Code002Lover	24064990f7	Merge pull request #86 from 002Hub/snyk-upgrade-f3cdf165b2057816c9736f0a060720b8 [Snyk] Upgrade mysql2 from 3.2.1 to 3.2.3	2023-07-05 11:18:51 +02:00
snyk-bot	8446a79a7b	fix: upgrade mysql2 from 3.2.1 to 3.2.3 Snyk has created this PR to upgrade mysql2 from 3.2.1 to 3.2.3. See this package in npm: https://www.npmjs.com/package/mysql2 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-08 04:05:48 +00:00
snyk-bot	90cde02e31	fix: upgrade lru-cache from 9.0.1 to 9.0.3 Snyk has created this PR to upgrade lru-cache from 9.0.1 to 9.0.3. See this package in npm: https://www.npmjs.com/package/lru-cache 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-06 16:56:25 +00:00
Mystikfluu	5c4c1f4690	fix typo in error_codes.txt	2023-05-06 10:46:13 +02:00