Merge pull request #140 from internetee/139-sanitize-url

Implemented URL sanitization for logger
internetee · Jan 26, 2024 · c200fe4 · c200fe4
2 parents c9e8236 + a648e67
commit c200fe4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/server/routes/apiRoute.js b/server/routes/apiRoute.js
@@ -246,7 +246,13 @@ export default {
             if (e && e.response && e.response.status) {
                 return res.status(e.response.status).json({});
             }
-            return res.status(408).json({});
+            // return res.status(408).json({});
+            if (!res.headersSent) {
+                return res.status(408).json({});
+            } else {
+                // Log or handle the situation where a response was already sent
+                console.error('Response already sent.');
+            }
         }
     },
 

diff --git a/server/utils/logger.js b/server/utils/logger.js
@@ -17,16 +17,26 @@ const logger = {
     ignoreRoute,
     meta: false,
     msg: (req, res) => {
-        return `${req.method} ${req.protocol}://${req.get('host')}${req.originalUrl} (${
-            res.statusCode
-        }) ${Math.floor(res.responseTime / 1000)}, User-Agent: ${req.get(
+        return `${req.method} ${req.protocol}://${req.get('host')}${sanitizeUrl(
+            req.originalUrl
+        )} (${res.statusCode}) ${Math.floor(res.responseTime / 1000)}, User-Agent: ${req.get(
             'User-Agent'
-        )}, Referrer: ${req.get('Referrer')}, IP: ${
+        )}, Referrer: ${sanitizeUrl(req.get('Referrer'))}, IP: ${
             req.ip.indexOf(':') >= 0 ? req.ip.substring(req.ip.lastIndexOf(':') + 1) : req.i
         }`;
     },
 };
 
+function sanitizeUrl(url) {
+    // Implement URL sanitization logic here
+    // For example, removing or encoding certain characters
+    if (typeof url === 'string') {
+        return url.replace(/[{}]/g, match => encodeURIComponent(match));
+    } else {
+        return '';
+    }
+}
+
 export const accessLog = {
     ...logger,
     transports: [