Continued:

- ignored more files (tracing, coverage)
- rewrote towards fba.csrf.determine() so it will always be determined, causes
  another request unfortunately
- or can we somehow save the cookie jar ?
- logging of errors can now be disabled for debug purposes

diff --git a/.gitignore b/.gitignore
index 709bb92275b9a2b7bc7052f1702a724e4afbc546..0e3266b456f90ac7e56d17d1e681911b08ba6dab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ blocks.db*
 __pycache__/
 venv/
 config.json
+*.cover
+*.pyc

diff --git a/api.py b/api.py
index 0fb839e41c46279f3055df74e3120650cdd0e5f5..cb3823fa2484c9f3b9844ca9843067dda3cef33c 100644 (file)
--- a/api.py
+++ b/api.py
@@ -14,27 +14,28 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+from datetime import datetime
+from email import utils
+
+import re
+
 from fastapi import Request, HTTPException, Query
 from fastapi.responses import JSONResponse
 from fastapi.responses import PlainTextResponse
-from fastapi.templating import Jinja2Templates
-from datetime import datetime
-from email import utils
 
 import fastapi
 import uvicorn
 import requests
-import re
 import validators
 
 from fba import config
 from fba import fba
 
 router = fastapi.FastAPI(docs_url=config.get("base_url") + "/docs", redoc_url=config.get("base_url") + "/redoc")
-templates = Jinja2Templates(directory="templates")
+templates = fastapi.templating.Jinja2Templates(directory="templates")
 
 @router.get(config.get("base_url") + "/api/info.json", response_class=JSONResponse)
-def info():
+def api_info():
     fba.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'misskey', 'friendica', 'bookwyrm', 'takahe', 'peertube')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_status_code IS NOT NULL)")
     known, indexed, blocklist, errorous = fba.cursor.fetchone()
 
@@ -47,7 +48,7 @@ def info():
     }
 
 @router.get(config.get("base_url") + "/api/top.json", response_class=JSONResponse)
-def top(blocked: int = None, blockers: int = None, reference: int = None, software: int = None, command: int = None, error_code: int = None):
+def api_top(blocked: int = None, blockers: int = None, reference: int = None, software: int = None, command: int = None, error_code: int = None):
     if blocked is not None:
         if blocked > 500:
             raise HTTPException(status_code=400, detail="Too many results")
@@ -77,18 +78,18 @@ def top(blocked: int = None, blockers: int = None, reference: int = None, softwa
 
     scores = fba.cursor.fetchall()
 
-    scoreboard = []
+    scores = []
 
     for domain, highscore in scores:
-        scoreboard.append({
+        scores.append({
             "domain"   : domain,
             "highscore": highscore
         })
 
-    return scoreboard
+    return scores
 
 @router.get(config.get("base_url") + "/api/index.json", response_class=JSONResponse)
-def blocked(domain: str = None, reason: str = None, reverse: str = None):
+def api_blocked(domain: str = None, reason: str = None, reverse: str = None):
     if domain is None and reason is None and reverse is None:
         raise HTTPException(status_code=400, detail="No filter specified")
 
@@ -130,7 +131,7 @@ def blocked(domain: str = None, reason: str = None, reverse: str = None):
     return result
 
 @router.get(config.get("base_url") + "/api/mutual.json", response_class=JSONResponse)
-def mutual(domains: list[str] = Query()):
+def api_mutual(domains: list[str] = Query()):
     """Return 200 if federation is open between the two, 4xx otherwise"""
     fba.cursor.execute(
         "SELECT block_level FROM blocks " \

diff --git a/config.defaults.json b/config.defaults.json
index d99a6daab32a024a63e4829968ea4be024a66d53..f78a756f313348de2854e86dfc7d36e33a4e0166 100644 (file)
--- a/config.defaults.json
+++ b/config.defaults.json
@@ -18,5 +18,6 @@
     "recheck_instance"  : 172800,
     "recheck_block"     : 43200,
     "misskey_limit"     : 100,
-    "error_log_cleanup" : 604800
+    "error_log_cleanup" : 604800,
+    "write_error_log"   : "true"
 }

diff --git a/fba/__init__.py b/fba/__init__.py
index d6d5a6e2c1a13c4b1b2e52a47bc51b45d9c4f1b8..01c1bf649c1362904cebd9e2a780aadfed4792df 100644 (file)
--- a/fba/__init__.py
+++ b/fba/__init__.py
@@ -5,6 +5,7 @@ __all__ = [
     'cache',
     'commands',
     'config',
+    'csrf',
     'federation',
     'fba',
     'instances',

diff --git a/fba/blocks.py b/fba/blocks.py
index 50ceec8156638aed0ee733e936912d67564adf6d..42cc83cbbbf0b37e6b53d023aeac83581403e27f 100644 (file)
--- a/fba/blocks.py
+++ b/fba/blocks.py
@@ -56,8 +56,8 @@ def update_reason(reason: str, blocker: str, blocked: str, block_level: str):
             # DEBUG: print(f"DEBUG: Did not update any rows: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',reason='{reason}' - EXIT!")
             return
 
-    except BaseException as exception:
-        print(f"ERROR: failed SQL query: reason='{reason}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: failed SQL query: reason='{reason}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")
@@ -93,8 +93,8 @@ def update_last_seen(blocker: str, blocked: str, block_level: str):
             # DEBUG: print(f"DEBUG: Did not update any rows: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}' - EXIT!")
             return
 
-    except BaseException as exception:
-        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")
@@ -164,8 +164,8 @@ def add_instance(blocker: str, blocked: str, reason: str, block_level: str):
                  time.time()
              ),
         )
-    except BaseException as exception:
-        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',reason='{reason}',block_level='{block_level}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',reason='{reason}',block_level='{block_level}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")

diff --git a/fba/boot.py b/fba/boot.py
index d0bc4564e58bff11675ded616cc54d02fe7c5cd6..91c2880d59f595f96c9696c13fdee36cc391ee01 100644 (file)
--- a/fba/boot.py
+++ b/fba/boot.py
@@ -31,19 +31,19 @@ _PARSER = None
 def acquire_lock():
     global LOCK
     try:
-        print(f"DEBUG: Acquiring lock: '{lockfile}'")
+        # DEBUG: print(f"DEBUG: Acquiring lock: '{lockfile}'")
         LOCK = zc.lockfile.LockFile(lockfile)
-        print("DEBUG: Lock obtained.")
+        # DEBUG: print("DEBUG: Lock obtained.")
 
     except zc.lockfile.LockError:
         print(f"ERROR: Cannot aquire lock: '{lockfile}'")
         sys.exit(100)
 
 def init_parser():
-    # DEBUG: print("DEBUG: init_parser(): CALLED!")
+    # DEBUG: # DEBUG: print("DEBUG: init_parser(): CALLED!")
     global _PARSER
 
-    # DEBUG: print("DEBUG: Initializing parser ...")
+    # DEBUG: # DEBUG: print("DEBUG: Initializing parser ...")
     _PARSER = argparse.ArgumentParser(
         description="Fetches block reasons from the fediverse",
         epilog="Please note that some commands have optional arguments, you may want to try fba.py <command> --help to find them out.",
@@ -116,24 +116,24 @@ def init_parser():
     parser.add_argument("--single", action="store_true", help="Only fetch given instance.")
     parser.set_defaults(command=commands.fetch_instances)
 
-    # DEBUG: print("DEBUG: init_parser(): EXIT!")
+    # DEBUG: # DEBUG: print("DEBUG: init_parser(): EXIT!")
 
 def run_command():
-    # DEBUG: print("DEBUG: run_command(): CALLED!")
+    # DEBUG: # DEBUG: print("DEBUG: run_command(): CALLED!")
     args = _PARSER.parse_args()
-    # DEBUG: print(f"DEBUG: args[{type(args)}]={args}")
+    # DEBUG: # DEBUG: print(f"DEBUG: args[{type(args)}]={args}")
     status = args.command(args)
-    # DEBUG: print("DEBUG: status={status} - EXIT!")
+    # DEBUG: # DEBUG: print("DEBUG: status={status} - EXIT!")
     return status if isinstance(status, int) else 0
 
 def shutdown():
-    print("DEBUG: Closing database connection ...")
+    # DEBUG: print("DEBUG: Closing database connection ...")
     fba.connection.close()
 
     if LOCK is not None:
-        print("DEBUG: Releasing lock ...")
+        # DEBUG: print("DEBUG: Releasing lock ...")
         LOCK.close()
-        print(f"DEBUG: Deleting lockfile='{lockfile}' ...")
+        # DEBUG: print(f"DEBUG: Deleting lockfile='{lockfile}' ...")
         os.remove(lockfile)
 
-    print("DEBUG: Shutdown completed.")
+    # DEBUG: print("DEBUG: Shutdown completed.")

diff --git a/fba/commands.py b/fba/commands.py
index 089dd2eee801eed0edf9cc9dd0e482bd6e06fb03..03fe16d5a63e555bce6f9d2f40c14a0303c2625c 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -88,8 +88,8 @@ def fetch_bkali(args: argparse.Namespace):
             # DEBUG: print(f"DEBUG: Adding domain='{entry['domain']}' ...")
             domains.append(entry["domain"])
 
-    except BaseException as exception:
-        print(f"ERROR: Cannot fetch graphql,exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: Cannot fetch graphql,exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print(f"DEBUG: domains()={len(domains)}")
@@ -242,8 +242,8 @@ def fetch_blocks(args: argparse.Namespace):
 
                 # DEBUG: print("DEBUG: Committing changes ...")
                 fba.connection.commit()
-            except BaseException as exception:
-                print(f"ERROR: blocker='{blocker}',software='{software}',exception[{type(exception)}]:'{str(exception)}'")
+            except BaseException as exc:
+                print(f"ERROR: blocker='{blocker}',software='{software}',exc[{type(exc)}]:'{str(exc)}'")
         else:
             print("WARNING: Unknown software:", blocker, software)
 
@@ -296,8 +296,8 @@ def fetch_cs(args: argparse.Namespace):
         # DEBUG: print(f"DEBUG: blocked[]={type(blocked)}")
         domains["reject"] = domains["reject"] + fba.find_domains(blocked)
 
-    except BaseException as exception:
-        print(f"ERROR: Cannot fetch from meta.chaos.social,exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: Cannot fetch from meta.chaos.social,exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print(f"DEBUG: domains()={len(domains)}")
@@ -333,7 +333,7 @@ def fetch_fba_rss(args: argparse.Namespace):
 
         # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code='{response.status_code}',response.text()={len(response.text)}")
         if response.ok and response.status_code < 300 and len(response.text) > 0:
-            # DEBUG: print(f"DEBUG: Parsing RSS feed ...")
+            # DEBUG: print(f"DEBUG: Parsing RSS feed ({len(response.text)} Bytes) ...")
             rss = atoma.parse_rss_bytes(response.content)
 
             # DEBUG: print(f"DEBUG: rss[]={type(rss)}")
@@ -354,8 +354,8 @@ def fetch_fba_rss(args: argparse.Namespace):
                 # DEBUG: print(f"DEBUG: Adding domain='{domain}'")
                 domains.append(domain)
 
-    except BaseException as exception:
-        print(f"ERROR: Cannot fetch args.feed='{args.feed}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: Cannot fetch args.feed='{args.feed}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print(f"DEBUG: domains()={len(domains)}")
@@ -380,7 +380,7 @@ def fetch_fbabot_atom(args: argparse.Namespace):
 
         # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code='{response.status_code}',response.text()={len(response.text)}")
         if response.ok and response.status_code < 300 and len(response.text) > 0:
-            # DEBUG: print(f"DEBUG: Parsing ATOM feed ...")
+            # DEBUG: print(f"DEBUG: Parsing ATOM feed ({len(response.text)} Bytes) ...")
             atom = atoma.parse_atom_bytes(response.content)
 
             # DEBUG: print(f"DEBUG: atom[]={type(atom)}")
@@ -407,8 +407,8 @@ def fetch_fbabot_atom(args: argparse.Namespace):
                         # DEBUG: print(f"DEBUG: Adding domain='{domain}',domains()={len(domains)}")
                         domains.append(domain)
 
-    except BaseException as exception:
-        print(f"ERROR: Cannot fetch feed='{feed}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: Cannot fetch feed='{feed}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print(f"DEBUG: domains({len(domains)})={domains}")
@@ -430,7 +430,7 @@ def fetch_instances(args: argparse.Namespace):
     fba.fetch_instances(args.domain, None, None, inspect.currentframe().f_code.co_name)
 
     if args.single:
-        # DEBUG: print(f"DEBUG: Not fetching more instances - EXIT!")
+        # DEBUG: print("DEBUG: Not fetching more instances - EXIT!")
         return
 
     # Loop through some instances
@@ -441,7 +441,7 @@ def fetch_instances(args: argparse.Namespace):
     rows = fba.cursor.fetchall()
     print(f"INFO: Checking {len(rows)} entries ...")
     for row in rows:
-        # DEBUG: print("DEBUG: domain:", row[0])
+        # DEBUG: print(f"DEBUG: domain='{row[0]}'")
         if blacklist.is_blacklisted(row[0]):
             print("WARNING: domain is blacklisted:", row[0])
             continue
@@ -460,7 +460,7 @@ def fetch_federater(args: argparse.Namespace):
     # DEBUG: print(f"DEBUG: response[]='{type(response)}'")
     if response.ok and response.content != "":
         # DEBUG: print(f"DEBUG: Fetched {len(response.content)} Bytes, parsing CSV ...")
-        #print(f"DEBUG: response.content={response.content}")
+        ## DEBUG: print(f"DEBUG: response.content={response.content}")
         reader = csv.DictReader(response.content.decode('utf-8').splitlines(), dialect='unix')
         #, fieldnames='domain,severity,reject_media,reject_reports,public_comment,obfuscate'
         # DEBUG: print(f"DEBUG: reader[]={type(reader)}")

diff --git a/fba/config.py b/fba/config.py
index f682106a53d736bd0712fd89e84a83a367d56f4d..1ae1a25e648a51991b1fc5b6298e7afd71b4b630 100644 (file)
--- a/fba/config.py
+++ b/fba/config.py
@@ -17,6 +17,7 @@
 import json
 
 with open("config.json") as f:
+    # DEBUG: print("DEBUG: Loading configuration file ...")
     _config = json.loads(f.read())
 
 def get(key: str) -> any:

diff --git a/fba/csrf.py b/fba/csrf.py
new file mode 100644 (file)
index 0000000..1bfd1d5
--- /dev/null
+++ b/fba/csrf.py
@@ -0,0 +1,66 @@
+# Fedi API Block - An aggregator for fetching blocking data from fediverse nodes
+# Copyright (C) 2023 Free Software Foundation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+import bs4
+import reqto
+
+from fba import config
+#from fba import instances
+from fba import network
+
+def determine(domain: str, headers: dict) -> dict:
+    # DEBUG: print(f"DEBUG: domain='{domain}',headers()={len(headers)} - CALLED!")
+    if not isinstance(domain, str):
+        raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
+    elif domain == "":
+        raise ValueError("Parameter 'domain' is empty")
+    elif not isinstance(headers, dict):
+        raise ValueError(f"Parameter headers[]='{type(headers)}' is not 'dict'")
+
+    # Default headers with no CSRF
+    reqheaders = headers
+
+    try:
+        # Fetch / to check for meta tag indicating csrf
+        # DEBUG: print(f"DEBUG: Fetching / from domain='{domain}' for CSRF check ...")
+        response = reqto.get(
+            f"https://{domain}/",
+            headers=network.web_headers,
+            timeout=(config.get("connection_timeout"), config.get("read_timeout"))
+        )
+
+        # DEBUG: print(f"DEBUG: response.ok='{response.ok}',response.status_code={response.status_code},response.text()={len(response.text)}")
+        if response.ok and len(response.text) > 0:
+            meta = bs4.BeautifulSoup(
+                response.text,
+                "html.parser"
+            )
+            # DEBUG: print(f"DEBUG: meta[]='{type(meta)}'")
+
+            tag = meta.find("meta", attrs={"name": "csrf-token"})
+            # DEBUG: print(f"DEBUG: tag={tag}")
+
+            csrf = tag["content"]
+            # DEBUG: print(f"DEBUG: Adding CSRF token='{csrf}' for domain='{domain}'")
+
+            reqheaders = {**headers, **{"X-CSRF-Token": csrf}}
+
+    except BaseException as exc:
+        # DEBUG: print(f"DEBUG: No CSRF token found, using normal headers: domain='{domain}',exc[{type(exc)}]={exc}")
+        pass
+
+    # DEBUG: print(f"DEBUG: reqheaders()={len(reqheaders)} - EXIT!")
+    return reqheaders

diff --git a/fba/fba.py b/fba/fba.py
index 1062d17d4c76c6e91c8a23ad72b132e3c83fa692..7f4853daaee98b21c82ee874c902b85729826326 100644 (file)
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -20,12 +20,12 @@ import sqlite3
 import sys
 import time
 
+from urllib.parse import urlparse
+
 import bs4
 import requests
 import validators
 
-from urllib.parse import urlparse
-
 from fba import blacklist
 from fba import config
 from fba import instances
@@ -82,9 +82,9 @@ def fetch_instances(domain: str, origin: str, software: str, script: str, path:
     elif not isinstance(origin, str) and origin is not None:
         raise ValueError(f"Parameter origin[]={type(origin)} is not 'str'")
     elif software is None:
-        print(f"DEBUG: software for domain='{domain}' is not set, determining ...")
+        # DEBUG: print(f"DEBUG: software for domain='{domain}' is not set, determining ...")
         software = determine_software(domain, path)
-        print(f"DEBUG: Determined software='{software}' for domain='{domain}'")
+        # DEBUG: print(f"DEBUG: Determined software='{software}' for domain='{domain}'")
     elif not isinstance(software, str):
         raise ValueError(f"Parameter software[]={type(software)} is not 'str'")
     elif not isinstance(script, str):
@@ -99,7 +99,7 @@ def fetch_instances(domain: str, origin: str, software: str, script: str, path:
     # DEBUG: print("DEBUG: Fetching instances for domain:", domain, software)
     peerlist = fetch_peers(domain, software)
 
-    if (peerlist is None):
+    if peerlist is None:
         print("ERROR: Cannot fetch peers:", domain)
         return
     elif instances.has_pending_instance_data(domain):
@@ -131,8 +131,8 @@ def fetch_instances(domain: str, origin: str, software: str, script: str, path:
             if not instances.is_registered(instance):
                 # DEBUG: print("DEBUG: Adding new instance:", instance, domain)
                 instances.add(instance, domain, script)
-        except BaseException as exception:
-            print(f"ERROR: instance='{instance}',exception[{type(exception)}]:'{str(exception)}'")
+        except BaseException as exc:
+            print(f"ERROR: instance='{instance}',exc[{type(exc)}]:'{str(exc)}'")
             continue
 
     # DEBUG: print("DEBUG: EXIT!")
@@ -308,6 +308,9 @@ def log_error(domain: str, response: requests.models.Response):
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
+    elif config.get("write_error_log").lower() != "true":
+        # DEBUG: print(f"DEBUG: Writing to error_log is disabled in configuruation file - EXIT!")
+        return
 
     try:
         # DEBUG: print("DEBUG: BEFORE response[]:", type(response))
@@ -332,8 +335,8 @@ def log_error(domain: str, response: requests.models.Response):
         # Cleanup old entries
         # DEBUG: print(f"DEBUG: Purging old records (distance: {config.get('error_log_cleanup')})")
         cursor.execute("DELETE FROM error_log WHERE created < ?", [time.time() - config.get("error_log_cleanup")])
-    except BaseException as exception:
-        print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: failed SQL query: domain='{domain}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")
@@ -361,12 +364,13 @@ def fetch_peers(domain: str, software: str) -> list:
     peers = list()
     try:
         response = network.fetch_response(domain, "/api/v1/instance/peers", network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
+        # DEBUG: print(f"DEBUG: response[]='{type(response)}'")
 
         data = json_from_response(response)
-
         # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
+
         if not response.ok or response.status_code >= 400:
-            # DEBUG: print(f"DEBUG: Was not able to fetch peers, trying alternative ...")
+            # DEBUG: print("DEBUG: Was not able to fetch peers, trying alternative ...")
             response = network.fetch_response(domain, "/api/v3/site", network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
 
             data = json_from_response(response)
@@ -388,12 +392,12 @@ def fetch_peers(domain: str, software: str) -> list:
             # DEBUG: print("DEBUG: Querying API was successful:", domain, len(data))
             peers = data
 
-    except BaseException as exception:
-        print("WARNING: Some error during get():", domain, exception)
-        instances.update_last_error(domain, exception)
+    except BaseException as exc:
+        print("WARNING: Some error during fetch_peers():", domain, exc)
+        instances.update_last_error(domain, exc)
 
     # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
-    instances.set("total_peers", domain, len(peers))
+    instances.set_data("total_peers", domain, len(peers))
 
     # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
     instances.update_last_instance_fetch(domain)
@@ -441,8 +445,8 @@ def fetch_nodeinfo(domain: str, path: str = None) -> list:
             # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
             if response.ok and isinstance(data, dict):
                 # DEBUG: print("DEBUG: Success:", request)
-                instances.set("detection_mode", domain, "STATIC_CHECK")
-                instances.set("nodeinfo_url"  , domain, request)
+                instances.set_data("detection_mode", domain, "STATIC_CHECK")
+                instances.set_data("nodeinfo_url"  , domain, request)
                 break
             elif response.ok and isinstance(data, list):
                 print(f"UNSUPPORTED: domain='{domain}' returned a list: '{data}'")
@@ -452,9 +456,9 @@ def fetch_nodeinfo(domain: str, path: str = None) -> list:
                 instances.update_last_error(domain, response)
                 continue
 
-        except BaseException as exception:
+        except BaseException as exc:
             # DEBUG: print("DEBUG: Cannot fetch API request:", request)
-            instances.update_last_error(domain, exception)
+            instances.update_last_error(domain, exc)
             pass
 
     # DEBUG: print(f"DEBUG: data()={len(data)} - EXIT!")
@@ -490,17 +494,17 @@ def fetch_wellknown_nodeinfo(domain: str) -> list:
                         # DEBUG: print("DEBUG: href,response.ok,response.status_code:", link["href"], response.ok, response.status_code)
                         if response.ok and isinstance(data, dict):
                             # DEBUG: print("DEBUG: Found JSON nodeinfo():", len(data))
-                            instances.set("detection_mode", domain, "AUTO_DISCOVERY")
-                            instances.set("nodeinfo_url"  , domain, link["href"])
+                            instances.set_data("detection_mode", domain, "AUTO_DISCOVERY")
+                            instances.set_data("nodeinfo_url"  , domain, link["href"])
                             break
                     else:
                         print("WARNING: Unknown 'rel' value:", domain, link["rel"])
             else:
                 print("WARNING: nodeinfo does not contain 'links':", domain)
 
-    except BaseException as exception:
+    except BaseException as exc:
         print("WARNING: Failed fetching .well-known info:", domain)
-        instances.update_last_error(domain, exception)
+        instances.update_last_error(domain, exc)
         pass
 
     # DEBUG: print("DEBUG: Returning data[]:", type(data))
@@ -538,18 +542,18 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
                 # DEBUG: print("DEBUG: Found generator meta tag:", domain)
                 software = tidyup_domain(generator.get("content"))
                 print(f"INFO: domain='{domain}' is generated by '{software}'")
-                instances.set("detection_mode", domain, "GENERATOR")
+                instances.set_data("detection_mode", domain, "GENERATOR")
                 remove_pending_error(domain)
             elif isinstance(site_name, bs4.element.Tag):
                 # DEBUG: print("DEBUG: Found property=og:site_name:", domain)
                 sofware = tidyup_domain(site_name.get("content"))
                 print(f"INFO: domain='{domain}' has og:site_name='{software}'")
-                instances.set("detection_mode", domain, "SITE_NAME")
+                instances.set_data("detection_mode", domain, "SITE_NAME")
                 remove_pending_error(domain)
 
-    except BaseException as exception:
-        # DEBUG: print(f"DEBUG: Cannot fetch / from '{domain}':", exception)
-        instances.update_last_error(domain, exception)
+    except BaseException as exc:
+        # DEBUG: print(f"DEBUG: Cannot fetch / from '{domain}':", exc)
+        instances.update_last_error(domain, exc)
         pass
 
     # DEBUG: print(f"DEBUG: software[]={type(software)}")
@@ -627,10 +631,10 @@ def determine_software(domain: str, path: str = None) -> str:
         software = "misskey"
     elif software.find("/") > 0:
         print("WARNING: Spliting of slash:", software)
-        software = tidyup_domain(software.split("/")[-1]);
+        software = tidyup_domain(software.split("/")[-1])
     elif software.find("|") > 0:
         print("WARNING: Spliting of pipe:", software)
-        software = tidyup_domain(software.split("|")[0]);
+        software = tidyup_domain(software.split("|")[0])
     elif "powered by" in software:
         # DEBUG: print(f"DEBUG: software='{software}' has 'powered by' in it")
         software = strip_powered_by(software)
@@ -769,7 +773,7 @@ def find_domains(tag: bs4.element.Tag) -> list:
             print(f"WARNING: domain='{domain}' is blacklisted - skipped!")
             continue
         elif domain == "gab.com/.ai, develop.gab.com":
-            # DEBUG: print(f"DEBUG: Multiple domains detected in one row")
+            # DEBUG: print("DEBUG: Multiple domains detected in one row")
             domains.append({
                 "domain": "gab.com",
                 "reason": reason,

diff --git a/fba/federation/lemmy.py b/fba/federation/lemmy.py
index f578abf5a61665ab9650308530d5a5fa6ecbf3bb..f92f5929ebffab8496746edd69a4bd2e79773d17 100644 (file)
--- a/fba/federation/lemmy.py
+++ b/fba/federation/lemmy.py
@@ -47,11 +47,11 @@ def fetch_peers(domain: str) -> list:
             print("WARNING: JSON response does not contain 'federated_instances':", domain)
             instances.update_last_error(domain, response)
 
-    except BaseException as exception:
-        print(f"WARNING: Exception during fetching JSON: domain='{domain}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"WARNING: Exception during fetching JSON: domain='{domain}',exc[{type(exc)}]:'{str(exc)}'")
 
     # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
-    instances.set("total_peers", domain, len(peers))
+    instances.set_data("total_peers", domain, len(peers))
 
     # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
     instances.update_last_instance_fetch(domain)

diff --git a/fba/federation/mastodon.py b/fba/federation/mastodon.py
index 6cbdce42bc1179f64ee26348c6e2086454c713ea..4a6ecff7cb925663ffb5b59d48233dc17e7673f0 100644 (file)
--- a/fba/federation/mastodon.py
+++ b/fba/federation/mastodon.py
@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import bs4
 import inspect
+
+import bs4
 import validators
 
 from fba import blacklist
@@ -71,9 +72,9 @@ def fetch_blocks_from_about(domain: str) -> dict:
             network.fetch_response(domain, "/about/more", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text,
             "html.parser",
         )
-    except BaseException as exception:
-        print("ERROR: Cannot fetch from domain:", domain, exception)
-        instances.update_last_error(domain, exception)
+    except BaseException as exc:
+        print("ERROR: Cannot fetch from domain:", domain, exc)
+        instances.update_last_error(domain, exc)
         return {}
 
     for header in doc.find_all("h3"):
@@ -132,22 +133,11 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                 "report_removal": [],
             }
 
-            # handling CSRF, I've saw at least one server requiring it to access the endpoint
-            # DEBUG: print("DEBUG: Fetching meta:", domain)
-            meta = bs4.BeautifulSoup(
-                network.fetch_response(domain, "/", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text,
-                "html.parser",
-            )
-            try:
-                csrf = meta.find("meta", attrs={"name": "csrf-token"})["content"]
-                # DEBUG: print("DEBUG: Adding CSRF token:", domain, csrf)
-                reqheaders = {**network.api_headers, **{"X-CSRF-Token": csrf}}
-            except BaseException as exception:
-                # DEBUG: print("DEBUG: No CSRF token found, using normal headers:", domain, exception)
-                reqheaders = network.api_headers
-
             # DEBUG: print("DEBUG: Querying API domain_blocks:", domain)
-            blocklist = network.fetch_response(domain, "/api/v1/instance/domain_blocks", reqheaders, (config.get("connection_timeout"), config.get("read_timeout"))).json()
+            response = network.fetch_response(domain, "/api/v1/instance/domain_blocks", network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
+
+            # DEBUG: print(f"DEBUG: response[]='{type(response)}'")
+            blocklist = fba.json_from_response(response)
 
             print(f"INFO: Checking {len(blocklist)} entries from domain='{domain}',software='mastodon' ...")
             for block in blocklist:
@@ -173,8 +163,8 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                 else:
                     print("WARNING: Unknown severity:", block['severity'], block['domain'])
 
-        except BaseException as exception:
-            # DEBUG: print(f"DEBUG: Failed, trying mastodon-specific fetches: domain='{domain}',exception[{type(exception)}]={str(exception)}")
+        except BaseException as exc:
+            # DEBUG: print(f"DEBUG: Failed, trying mastodon-specific fetches: domain='{domain}',exc[{type(exc)}]={str(exc)}")
             rows = fetch_blocks_from_about(domain)
 
         print(f"INFO: Checking {len(rows.items())} entries from domain='{domain}',software='mastodon' ...")
@@ -256,7 +246,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
         # DEBUG: print("DEBUG: Committing changes ...")
         fba.connection.commit()
-    except BaseException as exception:
-        print(f"ERROR: domain='{domain}',software='mastodon',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: domain='{domain}',software='mastodon',exc[{type(exc)}]:'{str(exc)}'")
 
     # DEBUG: print("DEBUG: EXIT!")

diff --git a/fba/federation/misskey.py b/fba/federation/misskey.py
index 0a6ee127da10e5423e4d8b51d75716f7f0789c31..549ff17a2d950b90a5415075cc8469e6cbd31866 100644 (file)
--- a/fba/federation/misskey.py
+++ b/fba/federation/misskey.py
@@ -100,7 +100,7 @@ def fetch_peers(domain: str) -> list:
             break
 
     # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
-    instances.set("total_peers", domain, len(peers))
+    instances.set_data("total_peers", domain, len(peers))
 
     # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
     instances.update_last_instance_fetch(domain)
@@ -177,12 +177,12 @@ def fetch_blocks(domain: str) -> dict:
 
             # DEBUG: print(f"DEBUG: count={count}")
             if count == 0:
-                # DEBUG: print(f"DEBUG: API is no more returning new instances, aborting loop!")
+                # DEBUG: print("DEBUG: API is no more returning new instances, aborting loop!")
                 break
 
-        except BaseException as exception:
-            print("WARNING: Caught error, exiting loop:", domain, exception)
-            instances.update_last_error(domain, exception)
+        except BaseException as exc:
+            print("WARNING: Caught error, exiting loop:", domain, exc)
+            instances.update_last_error(domain, exc)
             offset = 0
             break
 
@@ -234,12 +234,12 @@ def fetch_blocks(domain: str) -> dict:
 
             # DEBUG: print(f"DEBUG: count={count}")
             if count == 0:
-                # DEBUG: print(f"DEBUG: API is no more returning new instances, aborting loop!")
+                # DEBUG: print("DEBUG: API is no more returning new instances, aborting loop!")
                 break
 
-        except BaseException as exception:
-            print("ERROR: Exception during POST:", domain, exception)
-            instances.update_last_error(domain, exception)
+        except BaseException as exc:
+            print("ERROR: Exception during POST:", domain, exc)
+            instances.update_last_error(domain, exc)
             offset = 0
             break
 

diff --git a/fba/federation/peertube.py b/fba/federation/peertube.py
index cff21c89fa2d94ecbd61e109e8e366f3c0d89088..06ffd04fc39324b8e6a2aedbb3257b2cf1c15518 100644 (file)
--- a/fba/federation/peertube.py
+++ b/fba/federation/peertube.py
@@ -33,7 +33,7 @@ def fetch_peers(domain: str) -> list:
         # DEBUG: print(f"DEBUG: domain='{domain}',mode='{mode}'")
         while True:
             try:
-                response = network.fetch_response(domain, "/api/v1/server/{mode}?start={start}&count=100", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout")))
+                response = network.fetch_response(domain, "/api/v1/server/{mode}?start={start}&count=100", network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
 
                 data = fba.json_from_response(response)
                 # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code='{response.status_code}',data[]='{type(data)}'")
@@ -56,11 +56,11 @@ def fetch_peers(domain: str) -> list:
                     # Continue with next row
                     start = start + 100
 
-            except BaseException as exception:
-                print(f"WARNING: Exception during fetching JSON: domain='{domain}',exception[{type(exception)}]:'{str(exception)}'")
+            except BaseException as exc:
+                print(f"WARNING: Exception during fetching JSON: domain='{domain}',exc[{type(exc)}]:'{str(exc)}'")
 
     # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
-    instances.set("total_peers", domain, len(peers))
+    instances.set_data("total_peers", domain, len(peers))
 
     # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
     instances.update_last_instance_fetch(domain)

diff --git a/fba/federation/pleroma.py b/fba/federation/pleroma.py
index 868d93ffec61c22d82bbfb6909b8faa84def1d6c..b063d48abfb4dfd8b33afb4b3ca1bfb01eb76af7 100644 (file)
--- a/fba/federation/pleroma.py
+++ b/fba/federation/pleroma.py
@@ -187,14 +187,14 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                     # DEBUG: print("DEBUG: Updating block reason:", domain, blocked, reason["reason"])
                     blocks.update_reason(reason["reason"], domain, blocked, block_level)
 
-                    # DEBUG: print(f"DEBUG: blockdict()={count(blockdict)")
+                    # DEBUG: print(f"DEBUG: blockdict()={len(blockdict)}")
                     for entry in blockdict:
                         if entry["blocked"] == blocked:
                             # DEBUG: print("DEBUG: Updating entry reason:", blocked)
                             entry["reason"] = reason["reason"]
 
         fba.connection.commit()
-    except BaseException as exception:
-        print(f"ERROR: domain='{domain}',software='pleroma',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: domain='{domain}',software='pleroma',exc[{type(exc)}]:'{str(exc)}'")
 
     # DEBUG: print("DEBUG: EXIT!")

diff --git a/fba/instances.py b/fba/instances.py
index d1c27a989fcd7da10a26d7c130fa8c8218569072..0b8dfeb0d76db8fa2f8b837d6c9985c5e201bb11 100644 (file)
--- a/fba/instances.py
+++ b/fba/instances.py
@@ -15,9 +15,10 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import json
-import requests
 import sys
 import time
+
+import requests
 import validators
 
 from fba import blacklist
@@ -49,7 +50,7 @@ _pending = {
     "last_error_details" : {},
 }
 
-def set(key: str, domain: str, value: any):
+def set_data(key: str, domain: str, value: any):
     # DEBUG: print(f"DEBUG: key='{key}',domain='{domain}',value[]='{type(value)}' - CALLED!")
     if not isinstance(key, str):
         raise ValueError("Parameter key[]='{type(key)}' is not 'str'")
@@ -135,8 +136,8 @@ def update_data(domain: str):
             except:
                 pass
 
-    except BaseException as exception:
-        print(f"ERROR: failed SQL query: domain='{domain}',sql_string='{sql_string}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: failed SQL query: domain='{domain}',sql_string='{sql_string}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")
@@ -149,7 +150,7 @@ def update_last_instance_fetch(domain: str):
         raise ValueError("Parameter 'domain' is empty")
 
     # DEBUG: print("DEBUG: Updating last_instance_fetch for domain:", domain)
-    set("last_instance_fetch", domain, time.time())
+    set_data("last_instance_fetch", domain, time.time())
 
     # Running pending updated
     # DEBUG: print(f"DEBUG: Invoking update_data({domain}) ...")
@@ -164,7 +165,7 @@ def update_last_blocked(domain: str):
         raise ValueError("Parameter 'domain' is empty")
 
     # DEBUG: print("DEBUG: Updating last_blocked for domain", domain)
-    set("last_blocked", domain, time.time())
+    set_data("last_blocked", domain, time.time())
 
     # Running pending updated
     # DEBUG: print(f"DEBUG: Invoking update_data({domain}) ...")
@@ -222,8 +223,8 @@ def add(domain: str, origin: str, command: str, path: str = None):
 
         if has_pending_instance_data(domain):
             # DEBUG: print(f"DEBUG: domain='{domain}' has pending nodeinfo being updated ...")
-            set("last_status_code"  , domain, None)
-            set("last_error_details", domain, None)
+            set_data("last_status_code"  , domain, None)
+            set_data("last_error_details", domain, None)
             update_data(domain)
             fba.remove_pending_error(domain)
 
@@ -232,8 +233,8 @@ def add(domain: str, origin: str, command: str, path: str = None):
             update_last_error(domain, fba.pending_errors[domain])
             fba.remove_pending_error(domain)
 
-    except BaseException as exception:
-        print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"ERROR: failed SQL query: domain='{domain}',exc[{type(exc)}]:'{str(exc)}'")
         sys.exit(255)
     else:
         # DEBUG: print("DEBUG: Updating nodeinfo for domain:", domain)
@@ -249,8 +250,8 @@ def update_last_nodeinfo(domain: str):
         raise ValueError("Parameter 'domain' is empty")
 
     # DEBUG: print("DEBUG: Updating last_nodeinfo for domain:", domain)
-    set("last_nodeinfo", domain, time.time())
-    set("last_updated" , domain, time.time())
+    set_data("last_nodeinfo", domain, time.time())
+    set_data("last_updated" , domain, time.time())
 
     # Running pending updated
     # DEBUG: print(f"DEBUG: Invoking update_data({domain}) ...")
@@ -271,13 +272,13 @@ def update_last_error(domain: str, response: requests.models.Response):
 
     # DEBUG: print("DEBUG: AFTER response[]:", type(response))
     if isinstance(response, str):
-        # DEBUG: print(f"DEBUG: Setting last_error_details='{response}'");
-        set("last_status_code"  , domain, 999)
-        set("last_error_details", domain, response)
+        # DEBUG: print(f"DEBUG: Setting last_error_details='{response}'")
+        set_data("last_status_code"  , domain, 999)
+        set_data("last_error_details", domain, response)
     else:
-        # DEBUG: print(f"DEBUG: Setting last_error_details='{response.reason}'");
-        set("last_status_code"  , domain, response.status_code)
-        set("last_error_details", domain, response.reason)
+        # DEBUG: print(f"DEBUG: Setting last_error_details='{response.reason}'")
+        set_data("last_status_code"  , domain, response.status_code)
+        set_data("last_error_details", domain, response.reason)
 
     # Running pending updated
     # DEBUG: print(f"DEBUG: Invoking update_data({domain}) ...")
@@ -296,14 +297,14 @@ def is_registered(domain: str) -> bool:
 
     # DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
     if not cache.key_exists("is_registered"):
-        # DEBUG: print(f"DEBUG: Cache for 'is_registered' not initialized, fetching all rows ...")
+        # DEBUG: print("DEBUG: Cache for 'is_registered' not initialized, fetching all rows ...")
         try:
             fba.cursor.execute("SELECT domain FROM instances")
 
             # Check Set all
             cache.set_all("is_registered", fba.cursor.fetchall(), True)
-        except BaseException as exception:
-            print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(exception)}]:'{str(exception)}'")
+        except BaseException as exc:
+            print(f"ERROR: failed SQL query: domain='{domain}',exc[{type(exc)}]:'{str(exc)}'")
             sys.exit(255)
 
     # Is cache found?

diff --git a/fba/network.py b/fba/network.py
index 78bb30460cdbbb3ebdcea59db448343179f025d0..7138e8cefdbe9bc900b994e9019e65c354c561fe 100644 (file)
--- a/fba/network.py
+++ b/fba/network.py
@@ -19,6 +19,7 @@ import reqto
 import requests
 
 from fba import config
+from fba import csrf
 from fba import fba
 from fba import instances
 
@@ -46,13 +47,17 @@ def post_json_api(domain: str, path: str, parameter: str, extra_headers: dict =
     elif not isinstance(parameter, str):
         raise ValueError(f"parameter[]={type(parameter)} is not 'str'")
 
-    # DEBUG: print("DEBUG: Sending POST to domain,path,parameter:", domain, path, parameter, extra_headers)
+    # DEBUG: print(f"DEBUG: Determining if CSRF header needs to be sent for domain='{domain}' ...")
+    headers = csrf.determine(domain, {**api_headers, **extra_headers})
+
     data = {}
+
     try:
+        # DEBUG: print(f"DEBUG: Sending POST to domain='{domain}',path='{path}',parameter='{parameter}',extra_headers({len(extra_headers)})={extra_headers}")
         response = reqto.post(
             f"https://{domain}{path}",
             data=parameter,
-            headers={**api_headers, **extra_headers},
+            headers=headers,
             timeout=(config.get("connection_timeout"), config.get("read_timeout"))
         )
 
@@ -62,8 +67,8 @@ def post_json_api(domain: str, path: str, parameter: str, extra_headers: dict =
             print(f"WARNING: Cannot query JSON API: domain='{domain}',path='{path}',parameter()={len(parameter)},response.status_code='{response.status_code}',data[]='{type(data)}'")
             instances.update_last_error(domain, response)
 
-    except BaseException as exception:
-        print(f"WARNING: Some error during post(): domain='{domain}',path='{path}',parameter()={len(parameter)},exception[{type(exception)}]:'{str(exception)}'")
+    except BaseException as exc:
+        print(f"WARNING: Some error during post(): domain='{domain}',path='{path}',parameter()={len(parameter)},exc[{type(exc)}]:'{str(exc)}'")
 
     # DEBUG: print(f"DEBUG: Returning data({len(data)})=[]:{type(data)}")
     return data
@@ -128,9 +133,9 @@ def fetch_friendica_blocks(domain: str) -> dict:
             fetch_response(domain, "/friendica", web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text,
             "html.parser",
         )
-    except BaseException as exception:
-        print("WARNING: Failed to fetch /friendica from domain:", domain, exception)
-        instances.update_last_error(domain, exception)
+    except BaseException as exc:
+        print("WARNING: Failed to fetch /friendica from domain:", domain, exc)
+        instances.update_last_error(domain, exc)
         return {}
 
     blocklist = doc.find(id="about_blocklist")
@@ -173,17 +178,21 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: list) -> requ
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
 
+    # DEBUG: print(f"DEBUG: Determining if CSRF header needs to be sent for domain='{domain}',headers()='{len(headers)}' ...")
+    headers = csrf.determine(domain, headers)
+
     try:
-        # DEBUG: print(f"DEBUG: Sending request to '{domain}{path}' ...")
+        # DEBUG: print(f"DEBUG: Sending GET request to '{domain}{path}' ...")
         response = reqto.get(
             f"https://{domain}{path}",
             headers=headers,
             timeout=timeout
-        );
-    except requests.exceptions.ConnectionError as exception:
-        # DEBUG: print(f"DEBUG: Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
-        instances.update_last_error(domain, exception)
-        raise exception
+        )
+
+    except requests.exceptions.ConnectionError as exc:
+        # DEBUG: print(f"DEBUG: Fetching '{path}' from '{domain}' failed. exc[{type(exc)}]='{str(exc)}'")
+        instances.update_last_error(domain, exc)
+        raise exc
 
     # DEBUG: print(f"DEBUG: response[]='{type(response)}' - EXXIT!")
     return response