Removing the regexp. It can not handle localhost and special TLDs

Author: gabor-boros

rethinkdb/helpers.py

@@ -14,6 +14,10 @@ def chain_to_bytes(*strings):
 
 
 def get_hostname_for_ssl_match(hostname):
-    match = re.match(r'^((?P<subdomain>[^\.]+)\.)?(?P<domain>[^\./]+\.[^/]+)/?.*$', hostname)
-    domain = match.group('domain')
-    return '*.{domain}'.format(domain=domain) if match.group('subdomain') else domain
+    parts = hostname.split('.')
+
+    if len(parts) < 3:
+        return hostname
+
+    parts[0] = '*'
+    return '.'.join(parts)

tests/test_helpers.py

@@ -53,13 +53,23 @@ def test_subdomain_replaced_to_star(self):
 
         assert result == expected_string
 
+    def test_subdomain_replaced_to_star_special_tld(self):
+        expected_string = '*.example.co.uk'
+
+        result = get_hostname_for_ssl_match('test.example.co.uk')
+
+        assert result == expected_string
+
     def test_no_subdomain_to_replace(self):
         expected_string = 'example.com'
 
-        result = get_hostname_for_ssl_match('example.com')
+        result = get_hostname_for_ssl_match(expected_string)
 
         assert result == expected_string
 
-    def test_no_match(self):
-        with pytest.raises(AttributeError) as exc:
-            get_hostname_for_ssl_match('')
+    def test_no_tld(self):
+        expected_string = 'localhost'
+
+        result = get_hostname_for_ssl_match(expected_string)
+
+        assert result == expected_string