missytake/publickey-bot
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add a timeout for WKD and KOO requests

Browse source
This commit is contained in:
missytake 2025-04-06 08:52:21 +02:00
parent f503c62739
commit 18ad7ec742
Signed by: missytake
GPG key ID: 04CC6658320518DF
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/keyserver_bot/koo.py
View file

@ -8,7 +8,17 @@ def request_from_koo(email: str) -> str:
:return: the public key of the user, or "" if it isn't found
"""
koo_url = f"https://keys.openpgp.org/vks/v1/by-email/{email}"
r = requests.get(koo_url)
try:
r = requests.get(koo_url, timeout=10)
except requests.exceptions.SSLError:
print(f"SSL Error when querying {koo_url}")
return ""
except requests.exceptions.ConnectionError:
print(f"Connection Error when querying {koo_url}")
return ""
except requests.exceptions.Timeout:
print(f"Timeout while connecting to {koo_url}")
return ""
if "No key found for email address" in r.content.decode():
return ""
keyparts = []

5
src/keyserver_bot/wkd.py
View file

@ -14,13 +14,16 @@ def request_from_wkd(email: str, server: str) -> str:
wkd_hash = wkdhash.userid_to_wkd_hash(email)
wkd_url = f"https://{server}/.well-known/openpgpkey/{domain}/hu/{wkd_hash}?l={localpart}"
try:
r = requests.get(wkd_url)
r = requests.get(wkd_url, timeout=10)
except requests.exceptions.SSLError:
print(f"SSL Error when querying {wkd_url}")
return ""
except requests.exceptions.ConnectionError:
print(f"Connection Error when querying {wkd_url}")
return ""
except requests.exceptions.Timeout:
print(f"Timeout while connecting to {wkd_url}")
return ""
if b"Too many recent failed key server lookups" in r.content:
print(f"Too many failed lookups error when querying {wkd_url}")
return ""