From 93991816c9ff46cfeae06e77c43452aaee9f6018 Mon Sep 17 00:00:00 2001
From: Son <son@son>
Date: Thu, 17 Jun 2021 23:02:25 +0200
Subject: [PATCH 1/4] fix "Received" header is not str

---
 app/email_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/email_utils.py b/app/email_utils.py
index 595c4d07..3583bfc8 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -1202,7 +1202,7 @@ def sl_sendmail(
 
 def get_queue_id(msg: Message) -> Optional[str]:
     """Get the Postfix queue-id from a message"""
-    received_header = msg["Received"]
+    received_header = str(msg["Received"])
     if not received_header:
         return
 

From 2bed79095c9803f5444aa9386fd722605e7023ba Mon Sep 17 00:00:00 2001
From: Son <son@son>
Date: Thu, 17 Jun 2021 23:04:25 +0200
Subject: [PATCH 2/4] ignore 5** error from HIBP

---
 cron.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cron.py b/cron.py
index aeaf5700..3b93a639 100644
--- a/cron.py
+++ b/cron.py
@@ -801,6 +801,9 @@ async def _hibp_check(api_key, queue):
         elif r.status_code == 404:
             # No breaches found
             alias.hibp_breaches = []
+        elif r.status_code > 500:
+            LOG.w("HIBP server 5** error %s", r.status_code)
+            return
         else:
             LOG.error(
                 "An error occured while checking alias %s: %s - %s",

From e14e6972071f0ce733c06afba763cef0378c2c91 Mon Sep 17 00:00:00 2001
From: Son <son@son>
Date: Thu, 17 Jun 2021 23:24:07 +0200
Subject: [PATCH 3/4] fix flake8

---
 tests/api/test_alias_options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/api/test_alias_options.py b/tests/api/test_alias_options.py
index 95fca1c2..51642673 100644
--- a/tests/api/test_alias_options.py
+++ b/tests/api/test_alias_options.py
@@ -51,7 +51,7 @@ def test_different_scenarios_v4(flask_client):
     assert r.json["recommendation"]["hostname"] == "www.test.com"
 
 
-def test_different_scenarios_v4(flask_client):
+def test_different_scenarios_v4_2(flask_client):
     user = User.create(
         email="a@b.c", password="password", name="Test User", activated=True
     )

From 6bc093df3fea835b00641cd53584febbdd58ee35 Mon Sep 17 00:00:00 2001
From: Son <son@son>
Date: Thu, 17 Jun 2021 23:54:14 +0200
Subject: [PATCH 4/4] fix test

---
 tests/api/test_alias_options.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/api/test_alias_options.py b/tests/api/test_alias_options.py
index 51642673..75703f9a 100644
--- a/tests/api/test_alias_options.py
+++ b/tests/api/test_alias_options.py
@@ -29,7 +29,7 @@ def test_different_scenarios_v4(flask_client):
 
     # <<< with hostname >>>
     r = flask_client.get(
-        url_for("api.options_v3", hostname="www.test.com"),
+        url_for("api.options_v4", hostname="www.test.com"),
         headers={"Authentication": api_key.code},
     )
 
@@ -44,7 +44,7 @@ def test_different_scenarios_v4(flask_client):
     db.session.commit()
 
     r = flask_client.get(
-        url_for("api.options_v3", hostname="www.test.com"),
+        url_for("api.options_v4", hostname="www.test.com"),
         headers={"Authentication": api_key.code},
     )
     assert r.json["recommendation"]["alias"] == alias.email