From 6978764b022ed64102174ba590aa74a2fea89f8e Mon Sep 17 00:00:00 2001 From: terrtia Date: Wed, 11 Oct 2023 14:53:12 +0200 Subject: [PATCH] fix: [module] fix module obj type: language + mail --- bin/modules/Languages.py | 12 +++++++----- bin/modules/Mail.py | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/modules/Languages.py b/bin/modules/Languages.py index b0b87230..53c3c999 100755 --- a/bin/modules/Languages.py +++ b/bin/modules/Languages.py @@ -25,11 +25,13 @@ class Languages(AbstractModule): self.logger.info(f'Module {self.module_name} initialized') def compute(self, message): - item = self.get_obj() - if item.is_crawled(): - domain = Domain(item.get_domain()) - for lang in item.get_languages(min_probability=0.8): - domain.add_language(lang.language) + obj = self.get_obj() + + if obj.type == 'item': + if item.is_crawled(): + domain = Domain(item.get_domain()) + for lang in item.get_languages(min_probability=0.8): + domain.add_language(lang.language) if __name__ == '__main__': diff --git a/bin/modules/Mail.py b/bin/modules/Mail.py index bbdbcfce..82cac546 100755 --- a/bin/modules/Mail.py +++ b/bin/modules/Mail.py @@ -139,7 +139,7 @@ class Mail(AbstractModule): item = self.get_obj() item_date = item.get_date() - mails = self.regex_findall(self.email_regex, item_id, item.get_content()) + mails = self.regex_findall(self.email_regex, item.id, item.get_content()) mxdomains_email = {} for mail in mails: mxdomain = mail.rsplit('@', 1)[1].lower() @@ -172,9 +172,9 @@ class Mail(AbstractModule): # for tld in mx_tlds: # Statistics.add_module_tld_stats_by_date('mail', item_date, tld, mx_tlds[tld]) - msg = f'Mails;{item.get_source()};{item_date};{item.get_basename()};Checked {num_valid_email} e-mail(s);{item_id}' + msg = f'Mails;{item.get_source()};{item_date};{item.get_basename()};Checked {num_valid_email} e-mail(s);{item.id}' if num_valid_email > self.mail_threshold: - print(f'{item_id} Checked {num_valid_email} e-mail(s)') + print(f'{item.id} Checked {num_valid_email} e-mail(s)') self.redis_logger.warning(msg) # Tags tag = 'infoleak:automatic-detection="mail"'