Quickfix for TheHive-Project#169: added same regex change for fqdn de…

…tection
3c7 · Jan 14, 2018 · 666dd4f · 666dd4f
1 parent 9a7613a
commit 666dd4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/contrib/cortexutils/extractor.py b/contrib/cortexutils/extractor.py
@@ -108,7 +108,7 @@ def __init_regex():
         # fqdn
         regex.append({
             'type': 'fqdn',
-            'regex': re.compile(r'^(?!http\:\/\/|https\:\/\/)^[\w\-\.]+\.[\w\-]+\.\w+$')
+            'regex': re.compile(r'^(?!http\:\/\/|https\:\/\/)^[\w\-\.]+\.[\w\-]+\.[a-zA-Z]+$')
         })
 
         return regex

diff --git a/contrib/tests/test_suite_extractor.py b/contrib/tests/test_suite_extractor.py
@@ -148,9 +148,16 @@ def test_iterable(self):
             'Check_iterable: wrong list returned.'
         )
 
-    def test_float(self):
+    def test_float_domain(self):
         self.assertEqual(
             self.extractor.check_string(value='0.001234'),
             '',
-            'Check_float: float was recognized, but should not.'
+            'Check_float: float was recognized as domain, but should not.'
+        )
+
+    def test_float_fqdn(self):
+        self.assertEqual(
+            self.extractor.check_string(value='0.1234.5678'),
+            '',
+            'Check_float_fqdn: float was recognized as fqdn but should not.'
         )