Continued:

[fba.git] / fba / csrf.py

diff --git a/fba/csrf.py b/fba/csrf.py
index 401b7cd6ba252fe758bb8b923bb5e76b845f059c..d5a3ecc0d6799c456f995e182ea11dc1af00fe89 100644 (file)
--- a/fba/csrf.py
+++ b/fba/csrf.py
@@ -16,6 +16,8 @@
 
 import logging
 
+from urllib.parse import urlparse
+
 import bs4
 import reqto
 
@@ -25,6 +27,8 @@ from fba.helpers import domain as domain_helper
 
 from fba.http import network
 
+from fba.models import instances
+
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
@@ -43,12 +47,12 @@ def determine(domain: str, headers: dict) -> dict:
     response = reqto.get(
         f"https://{domain}/",
         headers=network.web_headers,
-        timeout=(config.get("connection_timeout"), config.get("read_timeout")),
-        allow_redirects=False
+        timeout=(config.get("connection_timeout"), config.get("read_timeout"))
     )
+    components = urlparse(response.url)
 
     logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text))
-    if response.ok and response.status_code < 300 and response.text != "" and response.text.find("<html") > 0:
+    if response.ok and response.status_code < 300 and response.text.strip() != "" and response.text.find("<html") > 0 and domain == components.netloc:
         # Save cookies
         logger.debug("Parsing response.text()=%d Bytes ...", len(response.text))
         cookies.store(domain, response.cookies.get_dict())
@@ -65,6 +69,9 @@ def determine(domain: str, headers: dict) -> dict:
         if tag is not None:
             logger.debug("Adding CSRF token='%s' for domain='%s'", tag["content"], domain)
             reqheaders["X-CSRF-Token"] = tag["content"]
+    elif domain != components.netloc:
+        logger.warning("domain='%s' doesn't match components.netloc='%s', maybe redirect to other domain?", domain, components.netloc)
+        instances.set_last_error(domain, f"Redirect from domain='{domain}' to components.netloc='{components.netloc}'")
 
     logger.debug("reqheaders()=%d - EXIT!", len(reqheaders))
     return reqheaders