From f1fe588d4a8fa7e4884a8c49c3c6dc7bcb4bd63b Mon Sep 17 00:00:00 2001 From: terrtia Date: Fri, 31 Jan 2025 14:32:00 +0100 Subject: [PATCH] chg: [module mail ectractor] remove DNS check for UI extraction --- bin/modules/Mail.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bin/modules/Mail.py b/bin/modules/Mail.py index 2fd431e4..0d669040 100755 --- a/bin/modules/Mail.py +++ b/bin/modules/Mail.py @@ -117,7 +117,7 @@ def check_mx_record(self, set_mxdomains): print(e) return valid_mxdomain - def extract(self, obj, content, tag): + def extract(self, obj, content, tag, check_mx_record=False): extracted = [] mxdomains = {} mails = self.regex_finditer(self.email_regex, obj.get_global_id(), content) @@ -127,9 +127,14 @@ def extract(self, obj, content, tag): if mxdomain not in mxdomains: mxdomains[mxdomain] = [] mxdomains[mxdomain].append(mail) - for mx in self.check_mx_record(mxdomains.keys()): - for row in mxdomains[mx]: - extracted.append([row[0], row[1], row[2], f'tag:{tag}']) + if check_mx_record: + for mx in self.check_mx_record(mxdomains.keys()): + for row in mxdomains[mx]: + extracted.append([row[0], row[1], row[2], f'tag:{tag}']) + else: + for mx in mxdomains: + for row in mxdomains[mx]: + extracted.append([row[0], row[1], row[2], f'tag:{tag}']) return extracted # # TODO: sanitize mails