Continued:

- added needed timeout parameter (pylint)
- removed unused imports (pylint)

diff --git a/daemon.py b/daemon.py
index e7328510213a00885ef3f07b87ff761123577a10..f4d8f434b02ed2d028d239d1e8a5791fbc349e66 100755 (executable)
--- a/daemon.py
+++ b/daemon.py
@@ -45,6 +45,9 @@ from fba.helpers import tidyup
 from fba.models import blocks
 from fba.models import instances
 
+# Timeout
+_timeout = (config.get("connection_timeout"), config.get("read_timeout"))
+
 router = fastapi.FastAPI(docs_url=config.get("base_url") + "/docs", redoc_url=config.get("base_url") + "/redoc")
 router.mount(
     "/static",
@@ -360,7 +363,7 @@ def scoreboard(request: Request, mode: str, amount: int) -> None:
     elif amount <= 0:
         raise HTTPException(status_code=500, detail="Invalid amount specified")
 
-    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode={mode}&amount={amount}")
+    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode={mode}&amount={amount}", timeout=_timeout)
 
     if response is None:
         raise HTTPException(status_code=500, detail="Could not determine scores")
@@ -383,7 +386,7 @@ def list_domains(request: Request, mode: str, value: str, amount: int = config.g
     if mode == "detection_mode" and not instances.valid(value, "detection_mode"):
         raise HTTPException(status_code=500, detail="Invalid detection mode provided")
 
-    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/list.json?mode={mode}&value={value}&amount={amount}")
+    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/list.json?mode={mode}&value={value}&amount={amount}", timeout=_timeout)
 
     domainlist = list()
     if response is not None and response.ok:
@@ -411,7 +414,7 @@ def top(request: Request, mode: str, value: str, amount: int = config.get("api_l
     elif mode in ["domain", "reverse"] and not domain_helper.is_wanted(value):
         raise HTTPException(status_code=500, detail="Invalid or blocked domain specified")
 
-    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/top.json?mode={mode}&value={value}&amount={amount}")
+    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/top.json?mode={mode}&value={value}&amount={amount}", timeout=_timeout)
 
     found = 0
     blocklist = list()
@@ -447,7 +450,7 @@ def infos(request: Request, domain: str) -> None:
     if not domain_helper.is_wanted(domain):
         raise HTTPException(status_code=500, detail=f"domain='{domain}' is not wanted")
 
-    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/domain.json?domain={domain}")
+    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/domain.json?domain={domain}", timeout=_timeout)
 
     if not response.ok or response.status_code > 200 or response.text.strip() == "":
         raise HTTPException(status_code=response.status_code, detail=response.reason)
@@ -533,7 +536,7 @@ def robots(request: Request) -> None:
 @router.get(config.get("base_url") + "/")
 def index(request: Request) -> None:
     # Get info
-    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/info.json")
+    response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/info.json", timeout=_timeout)
 
     if not response.ok:
         raise HTTPException(status_code=response.status_code, detail=response.text)

diff --git a/fba/helpers/domain.py b/fba/helpers/domain.py
index bf400644cce6658ae3c939eb614e0e2438d1f5f8..7d3ad0638c40f3d9d0065d6fd07c430c5fa4e096 100644 (file)
--- a/fba/helpers/domain.py
+++ b/fba/helpers/domain.py
@@ -18,7 +18,6 @@ import logging
 
 from functools import lru_cache
 from urllib.parse import urlparse
-from urllib.parse import urlunparse
 
 import validators
 

diff --git a/fba/http/csrf.py b/fba/http/csrf.py
index 96c02f262b6bae3518f6d86b7c80ef37c365fb8d..b004c163cd4d98fbff7b88ce9b9a771a1f89c0ae 100644 (file)
--- a/fba/http/csrf.py
+++ b/fba/http/csrf.py
@@ -17,7 +17,6 @@
 import logging
 
 import bs4
-import reqto
 import requests
 import validators
 

diff --git a/fba/http/network.py b/fba/http/network.py
index 5ca77bc1b4c5c1cf8ac9faee64e5006814cfcbea..5237d8774ae88fe3c7e2279c1b2909de34867944 100644 (file)
--- a/fba/http/network.py
+++ b/fba/http/network.py
@@ -25,8 +25,6 @@ import requests
 import urllib3
 import validators
 
-from fba import utils
-
 from fba.helpers import blacklist
 from fba.helpers import config
 from fba.helpers import cookies

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 5672494bddad6881284b6f66d388fe0f2ca1d893..d3cde89230c5135de8822f6fcee18e6274de367f 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -28,7 +28,6 @@ from fba.helpers import blacklist
 from fba.helpers import cache
 from fba.helpers import config
 from fba.helpers import domain as domain_helper
-from fba.helpers import tidyup
 
 from fba.http import federation
 from fba.http import network

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index 63123b3558f840a1ce46c4cde6a1ac642810141d..4b5baf0591962bf70d49a820fbb3ac05f0f44731 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -17,7 +17,6 @@
 import logging
 
 from fba.helpers import blacklist
-from fba.helpers import config
 from fba.helpers import domain as domain_helper
 
 from fba.http import csrf

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index ba6f5e40f8fd64d5a2619e36f00dac7be1084b01..3938e53e16906071caa2930ee8affa3c7969a91b 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -20,7 +20,6 @@ import bs4
 import validators
 
 from fba import database
-from fba import utils
 
 from fba.helpers import blacklist
 from fba.helpers import config