BUG: FQDN: handle leading dots

fixes #1022
fixes #1030

CHANGELOG.md

@@ -4,6 +4,11 @@ CHANGELOG
 1.1.0
 -----
 
+1.0.0.rc2 Release candidate
+---------------------------
+### Harmonization
+- leading dots in FQDNs are rejected and removed in sanitation (#1022, #1030)
+
 1.0.0.rc1 Release candidate
 ---------------------------
 ### Core

intelmq/lib/harmonization.py

@@ -351,7 +351,7 @@ def is_valid(value, sanitize=False):
         if not GenericType().is_valid(value):
             return False
 
-        if value.rstrip('.') != value or value != value.lower():
+        if value.strip('.') != value or value != value.lower():
             return False
 
         if IPAddress().is_valid(value):
@@ -369,7 +369,7 @@ def is_valid(value, sanitize=False):
 
     @staticmethod
     def sanitize(value):
-        value = value.rstrip('.')
+        value = value.strip('.')
         if value:
             return value.encode('idna').decode().lower()
 

intelmq/tests/lib/test_harmonization.py

@@ -232,6 +232,7 @@ def test_fqdn_invalid(self):
         self.assertFalse(harmonization.FQDN.is_valid('ö1.at'))
         self.assertFalse(harmonization.FQDN.is_valid('n/a'))
         self.assertFalse(harmonization.FQDN.is_valid('.'))
+        self.assertFalse(harmonization.FQDN.is_valid('.example.com'))
 
     def test_fqdn_sanitize(self):
         """ Test FQDN.sanitize with valid arguments. """
@@ -245,6 +246,8 @@ def test_fqdn_sanitize(self):
         self.assertTrue(harmonization.FQDN.is_valid('212.156.101.43.00-ebgp-atakoy1-k.301-fra-'
                                                     'col-1.statik.turktelekom.com.tr',
                                                     sanitize=True))
+        self.assertTrue(harmonization.FQDN.is_valid('.example.com',
+                                                    sanitize=True))
 
     def test_fqdn_sanitize_invalid(self):
         """Test FQDN.sanitize with invalid arguments. """