Merge branch 'master' into master

core/tests.py

@@ -62,6 +62,15 @@ def active_tests(url, root, scheme, header_dict, delay):
             return {url : info}
         time.sleep(delay)
 
+        headers = requester(url, scheme, header_dict, root + '_.example.com')
+        acao_header, acac_header = headers['access-control-allow-origin'], headers.get('access-control-allow-credentials', None)
+        if acao_header and '_.example.com' in acao_header:
+            info = details['unrecognized underscore']
+            info['acao header'] = acao_header
+            info['acac header'] = acac_header
+            return {url : info}
+        time.sleep(delay)
+
         headers = requester(url, scheme, header_dict, root + '%60.example.com')
         acao_header, acac_header = headers['access-control-allow-origin'], headers.get('access-control-allow-credentials', None)
         if acao_header and '`.example.com' in acao_header:

core/utils.py

@@ -1,13 +1,14 @@
 import os
-import tld
+import re
 import json
 import tempfile
 import re
 
+from urllib.parse import urlparse
 
 def host(string):
     if string and '*' not in string:
-        return tld.get_fld(string, fix_protocol=True, fail_silently=True)
+        return urlparse(string).netloc
 
 
 def load_json(file):