Prechádzať zdrojové kódy

IMAP-Whitelist ausgelagert

robert 2 rokov pred
rodič
commit
72f62b86b1
2 zmenil súbory, kde vykonal 29 pridanie a 22 odobranie
  1. 4 22
      mailserver/imap.py
  2. 25 0
      mailserver/whitelist.json

+ 4 - 22
mailserver/imap.py

@@ -1,30 +1,11 @@
 from imap_tools import MailBox, AND
 import re
+import json
+import os
 from datetime import datetime, date
 
 
-whitelist = {
-    '@auto-greiner.de': [
-        '@opel-greiner.de'
-    ],
-    '@autohaus-berkemeier.de': [
-        '@auto-berkemeier.de'
-    ],
-    '@mvcmotors.at': [
-        '@mvcautomotive.com'
-    ],
-    '@opel-thomas.de': [
-        'info@auto-steinhaeusser.de',
-        'info@opel-weber.com',
-        'auto-wabner@t-online.de'
-    ],
-    '@autohaus-rueschkamp.de': [
-        'j.rueschkamp@gmail.com'
-    ],
-    '@hedtke.de': [
-        'holger.hedtke@heicosportiv.de'
-    ]
-}
+whitelist = {}
 
 
 def cleanup_folder():
@@ -81,5 +62,6 @@ def is_valid_message(msg, domain):
 
 
 if __name__ == '__main__':
+    whitelist = json.load(open(os.path.dirname(__file__) + '/whitelist.json', 'r'))
     move_mails()
     cleanup_folder()

+ 25 - 0
mailserver/whitelist.json

@@ -0,0 +1,25 @@
+{
+    "@auto-greiner.de": [
+        "@opel-greiner.de"
+    ],
+    "@autohaus-berkemeier.de": [
+        "@auto-berkemeier.de"
+    ],
+    "@mvcmotors.at": [
+        "@mvcautomotive.com"
+    ],
+    "@opel-thomas.de": [
+        "info@auto-steinhaeusser.de",
+        "info@opel-weber.com",
+        "auto-wabner@t-online.de"
+    ],
+    "@autohaus-rueschkamp.de": [
+        "j.rueschkamp@gmail.com"
+    ],
+    "@hedtke.de": [
+        "holger.hedtke@heicosportiv.de"
+    ],
+    "@opel-gerds-grimmen.de": [
+        "verkauf@opel-gerds.de"
+    ]
+}