From 53f18a456770a03d3b1e0d8c31de918626d9f8f7 Mon Sep 17 00:00:00 2001 From: Nithya-3035 Date: Thu, 12 Nov 2026 14:01:58 +0530 Subject: [PATCH] fix: strengthen CSRF token validation middleware Improved CSRF protection in `backend/middlewares/csrfHeaderCheck.js`. - Added input type validation for cookie and header tokens. - Improved handling of missing or invalid CSRF tokens. - Used Node.js `crypto.timingSafeEqual()` for secure token comparison. - Added buffer length checks before comparing tokens. - Added error handling to prevent unexpected middleware failures. - Standardized HTTP 403 error responses. - Preserved the existing CommonJS middleware export. These changes improve CSRF token validation, security, and backend reliability. --- backend/middlewares/csrfHeaderCheck.js | 55 +++++++++++++++++++++----- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/backend/middlewares/csrfHeaderCheck.js b/backend/middlewares/csrfHeaderCheck.js index 3d54599b..fae28200 100644 --- a/backend/middlewares/csrfHeaderCheck.js +++ b/backend/middlewares/csrfHeaderCheck.js @@ -1,12 +1,49 @@ +/** + * CSRF Header Validation Middleware + * Protects state-changing requests against Cross-Site Request Forgery. + */ + +const crypto = require("crypto"); + const csrfTokenCheck = (req, res, next) => { - const cookieToken = req.cookies?.csrfToken; - const headerToken = req.headers["x-csrf-token"]; - - if (!cookieToken || !headerToken || cookieToken !== headerToken) { - return res.status(403).json({ success: false, message: "CSRF token missing or invalid." }); + try { + const cookieToken = req.cookies?.csrfToken; + const headerToken = req.get("x-csrf-token"); + + // Reject missing or invalid tokens. + if ( + typeof cookieToken !== "string" || + typeof headerToken !== "string" || + !cookieToken || + !headerToken + ) { + return res.status(403).json({ + success: false, + message: "CSRF token missing or invalid.", + }); + } + + // Compare tokens safely without timing-based string comparison. + const cookieBuffer = Buffer.from(cookieToken, "utf8"); + const headerBuffer = Buffer.from(headerToken, "utf8"); + + if ( + cookieBuffer.length !== headerBuffer.length || + !crypto.timingSafeEqual(cookieBuffer, headerBuffer) + ) { + return res.status(403).json({ + success: false, + message: "CSRF token missing or invalid.", + }); + } + + return next(); + } catch (error) { + return res.status(403).json({ + success: false, + message: "CSRF token validation failed.", + }); } - - next(); }; - -module.exports = csrfTokenCheck; \ No newline at end of file + +module.exports = csrfTokenCheck;