Adding USER_WHITELIST option

core/common.py

@@ -23,6 +23,7 @@
 from core.settings import STATIC_IPCAT_LOOKUPS
 from core.settings import TIMEOUT
 from core.settings import TRAILS_FILE
+from core.settings import WHITELIST
 
 _ipcat_cursor = {}
 _ipcat_cache = {}
@@ -181,7 +182,8 @@ def load_trails(quiet=False):
                 for row in reader:
                     if row:
                         trail, info, reference = row
-                        retval[trail] = (info, reference)
+                        if trail not in WHITELIST:
+                            retval[trail] = (info, reference)
 
         except Exception, ex:
             exit("[x] something went wrong during trails file read '%s' ('%s')" % (TRAILS_FILE, ex))

core/settings.py

@@ -17,7 +17,7 @@
 trails = {}
 
 NAME = "Maltrail"
-VERSION = "0.8.209"
+VERSION = "0.8.210"
 SERVER_HEADER = "%s/%s" % (NAME, VERSION)
 DATE_FORMAT = "%Y-%m-%d"
 ROTATING_CHARS = ('\\', '|', '|', '/', '-')
@@ -217,6 +217,10 @@ def read_config(config_file):
         if len(entry.split(':')) != 4:
             exit("[!] invalid USERS entry '%s'" % entry)
 
+    if config.USER_WHITELIST:
+        for value in config.USER_WHITELIST.split(','):
+            WHITELIST.add(value.strip())
+
     if not str(config.HTTP_PORT or "").isdigit():
         exit("[!] invalid configuration value for 'HTTP_PORT' ('%s')" % config.HTTP_PORT)
 

maltrail.conf

@@ -74,6 +74,9 @@ CHECK_SHORT_OR_MISSING_USER_AGENT false
 # Capture HTTP requests with missing Host header (introducing potential false positives)
 CHECK_MISSING_HOST false
 
+# Comma delimited (custom user) whitelist (i.e. IP addresses, domain names, etc.)
+USER_WHITELIST 127.0.0.1,localhost
+
 # [All]
 
 # Show debug messages (in console output)