Merge pull request #197 from PerimeterX/bugfix/enforced-routes

enforced routes bug fix

Author: OmerBacharPX

lib/pxenforcer.js

@@ -133,8 +133,6 @@ class PxEnforcer {
     }
 
     shouldFilterRequest(req) {
-        let shouldFilterRoute = false;
-
         if (pxUtil.checkForStatic(req, this._config.STATIC_FILES_EXT)) {
             this.logger.debug(`Found whitelist ext in path: ${req.originalUrl}`);
             return true;
@@ -153,33 +151,8 @@ class PxEnforcer {
                 }
             }
         }
-
-        if (this._config.ENFORCED_ROUTES && this._config.ENFORCED_ROUTES.length > 0) {
-            for (const enforceRoute of this._config.ENFORCED_ROUTES) {
-                if (enforceRoute instanceof RegExp && req.originalUrl.match(enforceRoute)) {
-                    return false;
-                }
-                if (typeof enforceRoute === 'string' && req.originalUrl.startsWith(enforceRoute)) {
-                    return false;
-                }
-            }
-            this.logger.debug(`Route ${req.originalUrl} is not listed in specific routes to enforce`);
-            shouldFilterRoute = true;
-        }
-
-        if (this._config.MONITORED_ROUTES && this._config.MONITORED_ROUTES.length > 0) {
-            for (const monitorRoute of this._config.MONITORED_ROUTES) {
-                if (monitorRoute instanceof RegExp && req.originalUrl.match(monitorRoute)) {
-                    return false;
-                }
-                if (typeof monitorRoute === 'string' && req.originalUrl.startsWith(monitorRoute)) {
-                    return false;
-                }
-            }
-            this.logger.debug(`Route ${req.path} is not listed in specific routes to monitor`);
-        }
-
-        return shouldFilterRoute;
+       
+        return false;
     }
 
     verifyUserScore(ctx, callback) {

lib/pxutil.js

@@ -249,7 +249,7 @@ function generateHMAC(cookieSecret, payload) {
 
 function isReqInMonitorMode(pxConfig, pxCtx) {
     return (
-        (pxConfig.MODULE_MODE === ModuleMode.MONITOR && !pxCtx.shouldBypassMonitor) || pxCtx.monitoredRoute
+        (pxConfig.MODULE_MODE === ModuleMode.MONITOR && !pxCtx.shouldBypassMonitor && !pxCtx.enforcedRoute) || pxCtx.monitoredRoute
     );
 }