Do not register whitelist middleware if whitelist disabled

3e26b93971afaf4d8cb166cbd2428585165d98fe

Cohee <18619528+Cohee1207@users.noreply.github.com>

server.js+7 -2 Viewed

 app.use(CORS);
-if (listen && basicAuthMode) app.use(basicAuthMiddleware);
+if (listen && basicAuthMode) {
+    app.use(basicAuthMiddleware);
+}
+if (enableWhitelist) {
+    app.use(whitelistMiddleware());
+}
-app.use(whitelistMiddleware(enableWhitelist));
 if (listen) {
     app.use(accessLoggerMiddleware());
+}

src/middleware/whitelist.js+3 -4 Viewed

 /**
  * Returns a middleware function that checks if the client IP is in the whitelist.
- * @param {boolean} whitelistMode If whitelist mode is enabled via config or command line
  * @returns {import('express').RequestHandler} The middleware function
  */
-export default function whitelistMiddleware(whitelistMode) {
+export default function whitelistMiddleware() {
     const forbiddenWebpage = Handlebars.compile(
         safeReadFileSync('./public/error/forbidden-by-whitelist.html') ?? '',
     );

         const userAgent = req.headers['user-agent'];
         //clientIp = req.connection.remoteAddress.split(':').pop();
-        if (whitelistMode === true && !whitelist.some(x => ipMatching.matches(clientIp, ipMatching.getMatch(x)))
+        if (!whitelist.some(x => ipMatching.matches(clientIp, ipMatching.getMatch(x)))
-            || forwardedIp && whitelistMode === true && !whitelist.some(x => ipMatching.matches(forwardedIp, ipMatching.getMatch(x)))
+            || forwardedIp && !whitelist.some(x => ipMatching.matches(forwardedIp, ipMatching.getMatch(x)))
         ) {
             // Log the connection attempt with real IP address
             const ipDetails = forwardedIp