fix: skips static files and renames user ip header

migtarx · Dec 9, 2023 · b0668ff · b0668ff
1 parent daf64c1
commit b0668ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/app.js b/src/app.js
@@ -17,7 +17,7 @@ app.use(helmet({
   contentSecurityPolicy: false
 }));
 morgan.token('user-ip', function(req) {
-  return execMode == "pro" ? req.headers['X-Real-IP'] : req.ip;
+  return execMode == "pro" ? req.headers['x-real-ip'] : req.ip;
 });
 morgan.token('accepted-cookies', function(req) {
   return Boolean(req.cookies['cookie-accepted']);

diff --git a/src/middlewares/morgan.js b/src/middlewares/morgan.js
@@ -8,7 +8,12 @@ function assignId(req, res, next) {
 
 function skipStatics(req, res) {
     const staticFilesPrefixes = ['/css', '/js', '/images', '/img', '/fonts'];
-    return staticFilesPrefixes.some(prefix => req.originalUrl.startsWith(prefix));
+    const fileExtensionsToSkip = ['.js', '.css', '.png', '.jpg', '.jpeg'];
+
+    const shouldSkipFileExtension = fileExtensionsToSkip.some(extension => req.originalUrl.endsWith(extension));
+    const shouldSkipStaticFile = staticFilesPrefixes.some(prefix => req.originalUrl.startsWith(prefix));
+
+    return shouldSkipFileExtension || shouldSkipStaticFile;
 }
 
 function skipStatusServer(req, res) {