Add files via upload

Author: drlight17

mlp/parser.py

@@ -39,9 +39,8 @@
 # exim regexp
 #exim_to = re.compile(r'.*>.(.*).R=')
 #exim_to = re.compile(r'.*[>|\*].(.*).R=')
-#exim_to = re.compile(r'.*[>|\*].(.*).R=|.*DATA:.*for.([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+)')
-#exim_to = re.compile(r'.*[>|\*]\s?(.*)\s<?([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+).*R=(?:dnslookup|localuser)|.*DATA:.*for.([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+)')
-exim_to = re.compile(r'.*[>|\*]\s?(.*)\s<?([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+).*[R|F]=(?:dnslookup|localuser)?|.*DATA:.*for.([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+)')
+#exim_to = re.compile(r'.*[>|\*]\s?(.*)\s<?([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+).*[R|F]=(?:dnslookup|localuser)?|.*DATA:.*for.([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+)')
+exim_to = re.compile(r'.*[>|\*|=]\s?(.*)\s<?([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+).*[R|F]=(?:dnslookup|localuser)?|.*DATA:.*for.([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+)')
 #exim_from = re.compile(r'.*<=.(.*).[U|H]=|.*F=<(.*)>')
 exim_from = re.compile(r'.*<=.(.*).[U|H]=|.*F=<?([a-zA-Z0-9-+_.=]+@[a-zA-Z0-9-+_.]+)>?')
 #exim_subject = re.compile(r'.*Subject:\s(.*)')
@@ -52,9 +51,8 @@
 exim_message_id = re.compile(r'.*<=.*id=(.*)\s(?:T=)')
 #exim_client = re.compile(r'.*<=.*H=([a-zA-Z0-9-._]+).*\[([a-zA-Z0-9.:]+)')
 #exim_client = re.compile(r'.*<=.*H=([a-zA-Z0-9-._)(]+).*\[([a-zA-Z0-9.:]+)')
-#exim_client = re.compile(r'.*<=.*H=\(?\[?([a-zA-Z0-9-._]+)\)?\]?.*\[([a-zA-Z0-9.:]+)')
-#exim_client = re.compile(r'.*<=.*H=\(?\[?([a-zA-Z0-9-._]+)\)?\]?.*\[([a-zA-Z0-9.:]+)\]?.([0-9]*)?')
-exim_client = re.compile(r'.*H=\(?\[?([a-zA-Z0-9-._]+)\]?\)?.\[?([a-zA-Z0-9.:]+)\]?.([0-9]{3,6}).[I=]')
+#exim_client = re.compile(r'.*H=\(?\[?([a-zA-Z0-9-._]+)\]?\)?.\[?([a-zA-Z0-9.:]+)\]?.([0-9]{3,6}).[I=]')
+exim_client = re.compile(r'.*H=\(?\[?([a-zA-Z0-9-\s()._]+)\]?\)?\s\[?([a-zA-Z0-9.:]+)\]?.([0-9]{3,6}).[I=]')
 #exim_relay = re.compile(r'.*=>.*T=(dovecot)|.*T=remote_smtp.*H=([a-zA-Z0-9-._]+).\[([a-zA-Z0-9.:]+)')
 #exim_relay = re.compile(r'.*=>.*T=(dovecot)|.*T=remote_smtp.*H=([a-zA-Z0-9-._]+).\[?([a-zA-Z0-9.:]+)\]?.([0-9]*)?')
 exim_relay = re.compile(r'.*(?:T=remote_smtp)?\d+\s[?:H|I]=(\(?[a-zA-Z0-9-._]+\)?)?.\[?([a-zA-Z0-9.:]+)\]?.([0-9]{2,3})\s')