Merge branch 'hotfix/1.9.1'

TheHive-Project · Mar 30, 2018 · 9e4985a · 9e4985a
2 parents fa8f84d + 54d5e76
commit 9e4985a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/contrib/cortexutils/extractor.py b/contrib/cortexutils/extractor.py
@@ -121,12 +121,15 @@ def __checktype(self, value):
         """Checks if the given value is a known datatype
 
         :param value: The value to check
-        :type value: str        
+        :type value: str or number
         :return: Data type of value, if known, else empty string
         :rtype: str
         """
-        if self.ignore and self.ignore in value:
-            return ''
+        if self.ignore:
+            if isinstance(value, str) and self.ignore in value:
+                return ''
+            if self.ignore == value:
+                return ''
 
         if isinstance(value, (str, unicode)):
             for r in self.regex:

diff --git a/contrib/setup.py b/contrib/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='cortexutils',
-    version='1.2.1',
+    version='1.2.2',
     description='A Python library for including utility classes for Cortex analyzers',
     long_description=open('README').read(),
     author='TheHive-Project',