From e7256adf7634f8562bd5ba29abbf83697ea0bc00 Mon Sep 17 00:00:00 2001 From: Stacy Brock Date: Wed, 29 Jun 2022 11:44:09 -0700 Subject: [PATCH] Update filters & package requirements --- filter-rules.py | 4 +++- requirements.txt | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/filter-rules.py b/filter-rules.py index 36f9d7c..6684e5e 100644 --- a/filter-rules.py +++ b/filter-rules.py @@ -25,6 +25,7 @@ BLOCK_KEYWORDS = [ 'prefer not to receive', 'prefer not to see', 'rather not receive', + 'remove from this list', 'Samsung SDS America', 'sidekickopen', 'subscription preferences', @@ -246,7 +247,8 @@ def filter_message(self, message): # junk known spam headers if (get_header('X-Spam-Flag' == 'YES', headers) - or int(get_header('X-MS-Exchange-Organization-SCL', headers)) >= 5): + or int(get_header('X-MS-Exchange-Organization-SCL', headers)) >= 5 + or get_header('X-Mailgun-List-Address', headers)): self._log_result(message, 'junking spam with known header') move_message(message, 'Junk Email') return diff --git a/requirements.txt b/requirements.txt index b06dc09..7177c0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ backports.zoneinfo==0.2.1 beautifulsoup4==4.11.1 -certifi==2022.5.18.1 -charset-normalizer==2.0.12 +certifi==2022.6.15 +charset-normalizer==2.1.0 idna==3.3 O365==2.0.19 oauthlib==3.2.0 @@ -10,7 +10,7 @@ python-dateutil==2.8.2 pytz==2022.1 pytz-deprecation-shim==0.1.0.post0 pytzdata==2020.1 -requests==2.28.0 +requests==2.28.1 requests-oauthlib==1.3.1 six==1.16.0 soupsieve==2.3.2.post1