Merge pull request #37 from Vasco-jofra/bug-fixes

Fixes the "origin reflected" check and the extractHeaders function

core/requester.py

@@ -10,10 +10,11 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 def requester(url, scheme, headers, origin):
     headers['Origin'] = origin
     try:
-        response = requests.get(url, headers=headers, verify=False).headers
-        for key, value in response.items():
+        response = requests.get(url, headers=headers, verify=False)
+        headers = response.headers
+        for key, value in headers.items():
             if key.lower() == 'access-control-allow-origin':
-                return response
+                return headers
     except requests.exceptions.RequestException as e:
         if 'Failed to establish a new connection' in str(e):
             print ('%s %s is unreachable' % (bad, url))

core/tests.py

@@ -25,16 +25,18 @@ def passive_tests(url, headers):
 def active_tests(url, root, scheme, header_dict, delay):
     origin = scheme + '://' + root
     headers = requester(url, scheme, header_dict, origin)
-    if headers:
-        origin = root + '://' + 'example.com'
+    acao_header, acac_header = headers.get('access-control-allow-origin', None), headers.get('access-control-allow-credentials', None)
+    if acao_header is None:
+        return
+    
+    origin = scheme + '://' + 'example.com'
+    headers = requester(url, scheme, header_dict, origin)
     acao_header, acac_header = headers.get('access-control-allow-origin', None), headers.get('access-control-allow-credentials', None)
     if acao_header and acao_header == (origin):
         info = details['origin reflected']
         info['acao header'] = acao_header
         info['acac header'] = acac_header
         return {url : info}
-        elif not acao_header:
-            return
     time.sleep(delay)
 
     origin = scheme + '://' + root + '.example.com'

core/utils.py

@@ -64,17 +64,13 @@ def prompt(default=None):
             return tmpfile.read().strip()
 
 
-def extractHeaders(headers):
-    headers = headers.replace('\\n', '\n')
+def extractHeaders(headers: str):
     sorted_headers = {}
-    matches = re.findall(r'^?(.*?):\s(.*?)[\n$]', headers)
-    for match in matches:
-        header = match[0]
-        value = match[1]
-        try:
-            if value[-1] == ',':
+    for header in headers.split('\\n'):
+        name, value = header.split(":", 1)
+        name = name.strip()
+        value = value.strip()
+        if len(value) >= 1 and value[-1] == ',':
             value = value[:-1]
-            sorted_headers[header] = value
-        except IndexError:
-            pass
+        sorted_headers[name] = value
     return sorted_headers