Even more coverage

nbs-system · May 25, 2016 · 10076cc · 10076cc
1 parent 6bb2439
commit 10076cc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,11 @@
 from setuptools import setup, find_packages
 
+with open('requirements.txt') as f:
+    required = map(str.strip, f.read().splitlines())
+
 setup(
     name='nxapi',
     packages=find_packages(),
-    version='0.1'
+    version='0.1',
+    install_requires=['python-pcre']
 )
diff --git a/tests/test_processing.py b/tests/test_processing.py
@@ -53,3 +53,27 @@ def test_short_str(self):
                  'var_name0': 'user-agent', 'cscore0': '$UWA', 'id0': '10',
                  'total_processed': '472', 'vers': '0.52'}
         self.assertTrue(processing.check_whitelist(whitelist, nxlog))
+
+        whitelist = {'mz': ['$HEADERS_VAR_X:^user-agent$'], 'wl': [42000227, 10]}
+        nxlog = {'uri': '/phpMyAdmin-2.8.2/scripts/setup.php', 'block': '0',
+                 'total_blocked': '204', 'ip': 'X.X.X.X', 'server': 'Y.Y.Y.Y',
+                 'learning': '0', 'zone0': 'HEADERS', 'score0': '8',
+                 'var_name0': 'user-agent', 'cscore0': '$UWA', 'id0': '10',
+                 'total_processed': '472', 'vers': '0.52'}
+        self.assertTrue(processing.check_whitelist(whitelist, nxlog))
+
+        whitelist = {'mz': ['$HEADERS_VAR_X:^user-agent$'], 'wl': [-40]}
+        nxlog = {'uri': '/phpMyAdmin-2.8.2/scripts/setup.php', 'block': '0',
+                 'total_blocked': '204', 'ip': 'X.X.X.X', 'server': 'Y.Y.Y.Y',
+                 'learning': '0', 'zone0': 'HEADERS', 'score0': '8',
+                 'var_name0': 'user-agent', 'cscore0': '$UWA', 'id0': '10',
+                 'total_processed': '472', 'vers': '0.52'}
+        self.assertTrue(processing.check_whitelist(whitelist, nxlog))
+
+        whitelist = {'mz': ['$HEADERS_VAR_X:^user-agent$'], 'wl': [-40, -10]}
+        nxlog = {'uri': '/phpMyAdmin-2.8.2/scripts/setup.php', 'block': '0',
+                 'total_blocked': '204', 'ip': 'X.X.X.X', 'server': 'Y.Y.Y.Y',
+                 'learning': '0', 'zone0': 'HEADERS', 'score0': '8',
+                 'var_name0': 'user-agent', 'cscore0': '$UWA', 'id0': '10',
+                 'total_processed': '472', 'vers': '0.52'}
+        self.assertTrue(processing.check_whitelist(whitelist, nxlog))