From 3a1cf77ccf393b6bfbc692b8c8b82f09a1000fd9 Mon Sep 17 00:00:00 2001
From: Stacy Brock <brock@oregonstate.edu>
Date: Wed, 3 Nov 2021 15:22:48 -0700
Subject: [PATCH] Update filters

---
 filter-rules.py | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/filter-rules.py b/filter-rules.py
index 72bc0b6..bdb45d6 100644
--- a/filter-rules.py
+++ b/filter-rules.py
@@ -6,7 +6,9 @@ BLOCK_EMAIL = [
     'diversity@oregonstate.edu',
     'jramiro@pagerduty.com',
     'info@snowflake.com',
-    'lisa@duo.com'
+    'lisa@duo.com',
+    'viva-noreply@microsoft.com',
+    'alerts@alerts.mail.hpe.com'
 ]
 
 BLOCK_KEYWORDS = [
@@ -39,6 +41,7 @@ BLOCK_DOMAINS = [
     'bytespeed.com',
     'cmadvantage',
     'customeriomail.com',
+    'exacttarget.com',
     'freshsales.io',
     'informareachmedia.com',
     'mailgun.net',
@@ -110,7 +113,7 @@ def filter_message(self, message):
             'ODProd Row Count Comparison',
             'Oracle ODprod Sessions Older Than Today',
             'UserBase.Users users deactivated due to ORG changes and termination',
-            'SEC_USERS Audit Update',
+            'Audit Update',
             'ScholarUniverse to GRRS load',
             'OACIS Pending Actions Notice',
             'You Have OSUF Disapproved Reimbursements',
@@ -173,18 +176,6 @@ def filter_message(self, message):
         message.delete()
         return
 
-    # delete HP alert spam
-    if normalized_from == 'alerts@alerts.mail.hpe.com':
-        self._log_result(message, 'deleting HP alert spam')
-        message.delete()
-        return
-
-    # delete Microsoft spam
-    if 'viva-noreply@microsoft.com' in normalized_from:
-        self._log_result(message, 'deleting M$ spam')
-        message.delete()
-        return
-
     # delete other spam
     if is_in_message(normalized['BLOCK_ANNOYING'], message):
         self._log_result(message, 'junking spam containing annoying content')