From f503c627398c7a6856b5f159fda485ca62ef003a Mon Sep 17 00:00:00 2001 From: missytake Date: Sun, 6 Apr 2025 08:13:21 +0200 Subject: [PATCH] don't crash on wkd ConnectionError --- src/keyserver_bot/wkd.py | 3 +++ tests/test_wkd.py | 1 + 2 files changed, 4 insertions(+) diff --git a/src/keyserver_bot/wkd.py b/src/keyserver_bot/wkd.py index 0502af8..1bf30b1 100644 --- a/src/keyserver_bot/wkd.py +++ b/src/keyserver_bot/wkd.py @@ -18,6 +18,9 @@ def request_from_wkd(email: str, server: str) -> str: 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 "" if b"Too many recent failed key server lookups" in r.content: print(f"Too many failed lookups error when querying {wkd_url}") return "" diff --git a/tests/test_wkd.py b/tests/test_wkd.py index 890331d..73f90a2 100644 --- a/tests/test_wkd.py +++ b/tests/test_wkd.py @@ -12,6 +12,7 @@ import keyserver_bot.wkd "xjMEZ+/HahYJKwYBBAHaRw8BAQdAzRZOcQEkaPGwUYBVHsKTVX+4nP05ZwLQ3wYUod1IQyjNNXNkamlmMm1saWpAcHJvdG9ubWFpbC5jb20gPHNkamlmMm1saWpAcHJvdG9ubWFpbC5jb20+wsARBBMWCgCDBYJn78dqAwsJBwmQ9od3MCAJzKNFFAAAAAAAHAAgc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ3e7fGtn2OkXwNFoBOAEgwoRygRlwr41fcO4LsJ/1HcyAxUKCAQWAAIBAhkBApsDAh4BFiEERU5l1enHSVCTOUnc9od3MCAJzKMAAAuPAQCQ0PFlbngJRtJ36yloWfHwTY168TDlMGeL+nAxJ1GUQAEA31H+NukIwEzCwQWh7aoFeY9eJHXVoaeh0swfvJA5yQ/CwB4EEBYIAJAFgmfvx6cFgwDtTgAJENgGwa9ZeOjHNRQAAAAAABwAEHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmfU5CAfgrGEZMQfk/lTyXT2LBxvcGVucGdwLWNhQHByb3Rvbi5tZSA8b3BlbnBncC1jYUBwcm90b24ubWU+FiEECoZS/l1TOGBXiZ/p2AbBr1l46McAAJCrAP4tMWMSLKAykI/JnR+94aE2+E4dCTslkW/svb1o7zGLbwEAg/fo6sOxa3wHr9xnCbUUrxZ0Dnh/21zJ3atL6zMpYQHOOARn78dqEgorBgEEAZdVAQUBAQdATm5zMhEn2/S+UB3qKfeV424+iyvIr2p3FEzxuzUQKQEDAQgHwr4EGBYKAHAFgmfvx2oJkPaHdzAgCcyjRRQAAAAAABwAIHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmf94HNvbCT5aX/ifcaDK2bIjzmS69JdQo1AcOt3X8AwFQKbDBYhBEVOZdXpx0lQkzlJ3PaHdzAgCcyjAACVUgEA8Agw7R9+a72WsKOq691JIYPGDfNYCKNHFllsQAfHHHYA/3x+rG9YQTbdAuuFi1ciGvgo9DAWVv8Bt7ibBqEVAuQN", ), ("missytake@systemli.org", "openpgpkey.systemli.org", ""), + ("delta@merlinux.eu", "openpgpkey.merlinux.eu", ""), ], ) def test_request_by_email(email, server, public_key):