Added CLIENT_IP_ADDRESS_HEADER as an optional header that holds client IP addresses

Author: Mike Skutta

middleware/anonymousAccessBlocker.js

@@ -18,29 +18,29 @@ module.exports = function() {
             // Check for IP range allowances.  Requests will be allowed through if the IP address is in range.
             var ipRanges = process.env.ANONYMOUS_ACCESS_BLOCKER_ALLOWED_IP_RANGES;
             if (ipRanges) {
-                // The set of allowed ranges has to be separated by space
-                // characters or a comma.
-                var allowedRanges = ipRanges.split(/\s+|,/);
+                // The set of allowed ranges has to be separated by space characters, a comma, or newline.
+                var allowedRanges = ipRanges.split(/\s+|,|\n/);
 
                 // Using req.ips requires that express 'trust proxy' setting is
                 // true. When it *is* set the value for ips is extracted from the
                 // X-Forwarded-For request header. The originating IP address is
                 // the last one in the array.
-                var requestIP = (req.ips.length > 0) ? req.ips.slice().pop() : req.ip;
-                console.log('Client IP: ' + requestIP);
+                var requestIP = (process.env.CLIENT_IP_ADDRESS_HEADER) ? req.header(process.env.CLIENT_IP_ADDRESS_HEADER) : req.ip;
+                requestIP = rangeCheck.searchIP(requestIP);
 
                 // Deny the request if request IP is not in one of the allowed
                 // IP address ranges.
                 var requestAllowed = range_check.in_range(requestIP, allowedRanges);
 
                 if (requestAllowed) {
-                    
                     // Allow the request to process
+                    console.log('Allowed IP: ' + requestIP);
                     return next();
                 }
             }
 
             // Request is not allowed.  Send the contents of the unauthorized.html file.
+            console.log('Blocked IP: ' + requestIP);
             res.sendfile(__dirname + '/unauthorized.html');
             return;
         }