From e8492cc96ffc19204f8f41abebd3ceaaecc7f70c Mon Sep 17 00:00:00 2001 From: AntoniaBK Date: Mon, 8 Apr 2024 10:59:10 +0200 Subject: [PATCH] Concatenate the whois-lookups\n when contact_email_only is false the abuse-c-lookup is added to the initial lookup --- lookyloo/modules/uwhois.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lookyloo/modules/uwhois.py b/lookyloo/modules/uwhois.py index bb06cf10..86f5afaa 100644 --- a/lookyloo/modules/uwhois.py +++ b/lookyloo/modules/uwhois.py @@ -90,11 +90,16 @@ class UniversalWhois(AbstractModule): if not data: break bytes_whois += data - #if an abuse-c-Object is found in the whois entry, the result of its lookup will be returned + + #if an abuse-c-Object is found in the whois entry, it will take precedence abuse_c = re.search(rb'abuse-c:\s+(.*)\s', bytes_whois) - if abuse_c is not None: - return self.whois(abuse_c.group(1).decode(), contact_email_only) - + if abuse_c: + abuse_c_query = self.whois(abuse_c.group(1).decode(), contact_email_only) + if contact_email_only: + return abuse_c_query + else: + return bytes_whois.decode() + abuse_c_query + if not contact_email_only: return bytes_whois.decode() emails = list(set(re.findall(EMAIL_REGEX, bytes_whois)))