Parsing of receiveds doesn't support via or id

for example:

Received: from XXX.namprd06.prod.outlook.com (2603:10b6:207:3d::31) by XXX.namprd06.prod.outlook.com with HTTPS id 12345 via XXX.NAMPRD02.PROD.OUTLOOK.COM; Mon, 1 Oct 2018 09:49:22 +0000

[dfeinzeig]

@fedelemantuano , i’m thinking something along the lines of

import re
import exceptions
RECEIVED_PATTERNS = [
    r'(?:from\s+(?P<from>.+?)(?:\s+by|\s+with|\s+id|\s+for|\s+via|;))',
    r'(?:by\s+(?P<by>.+?)(?:\s+from|\s+with|\s+id|\s+for|\s+via|;))',
    r'(?:with\s+(?P<with>.+?)(?:\s+from|\s+by|\s+id|\s+for|\s+via|;))',
    r'(?:id\s+(?P<id>.+?)(?:\s+from|\s+by|\s+with|\s+for|\s+via|;))',
    r'(?:for\s+(?P<for>.+?)(?:\s+from|\s+by|\s+with|\s+id|\s+via|;))',
    r'(?:via\s+(?P<via>.+?)(?:\s+from|\s+by|\s+id|\s+for|\s+with|;))',
    r';\s*(?P<datetime>.*)'
]
RECEIVED_PATTERNS_COMPILED = [re.compile(pattern, re.IGNORECASE|re.DOTALL) for pattern in RECEIVED_PATTERNS]
def parse_received(received):
    values_by_clause = {}
    for pattern in RECEIVED_PATTERNS_COMPILED:
        matches = [match for match in pattern.finditer(received)]
        if len(matches) == 0:
            # no matches for this clause, but it's ok! keep going!
            continue
        elif len(matches) > 1:
            # uh, can't have more than one of each clause in a received.
            # so either there's more than one or the current regex is wrong
            raise exceptions.ValueError("More than one match found for %s in %s" % (pattern.pattern, received))
        else:
            # otherwise we have one matching clause!
            match = matches[0].groupdict()
            values_by_clause[match.keys()[0]] = match.values()[0]
    return values_by_clause

I realize that’s incomplete so far, but seems like it’ll be easier to maintain the regexes since each one is only responsible for matching a single clause.

[fedelemantuano]

No, I didn’t have time for this issue. But I will watch it.