diff --git a/misp_modules/modules/expansion/dnstrails.py b/misp_modules/modules/expansion/dnstrails.py index d1e6eaa..eab1ae7 100644 --- a/misp_modules/modules/expansion/dnstrails.py +++ b/misp_modules/modules/expansion/dnstrails.py @@ -72,55 +72,57 @@ def handler(q=False): def handle_domain(api, domain, misperrors): result_filtered = {"results": []} - # r, status_ok = expand_domain_info(api, misperrors, domain) + r, status_ok = expand_domain_info(api, misperrors, domain) # - # if status_ok: - # result_filtered['results'].extend(r) - # else: - # misperrors['error'] = misperrors['error'] + ' Error DNS result' - # return misperrors - # - # time.sleep(1) - # r, status_ok = expand_subdomains(api, domain) - # - # if status_ok: - # result_filtered['results'].extend(r) - # else: - # misperrors['error'] = misperrors['error'] + ' Error subdomains result' - # return misperrors - # - # time.sleep(1) + if status_ok: + if r: + result_filtered['results'].extend(r) + else: + misperrors['error'] = misperrors['error'] + ' Error DNS result' + return misperrors + + time.sleep(1) + r, status_ok = expand_subdomains(api, domain) + + if status_ok: + if r: + result_filtered['results'].extend(r) + else: + misperrors['error'] = misperrors['error'] + ' Error subdomains result' + return misperrors + + time.sleep(1) r, status_ok = expand_whois(api, domain) if status_ok: - print(r) - result_filtered['results'].extend(r) + if r: + result_filtered['results'].extend(r) else: misperrors['error'] = misperrors['error'] + ' Error whois result' return misperrors - # - # time.sleep(1) - # r, status_ok = expand_history_ipv4_ipv6(api, domain) - # # - # - # if status_ok: - # print(r) - # result_filtered['results'].extend(r) - # else: - # misperrors['error'] = misperrors['error'] + ' Error history ipv4' - # return misperrors - # time.sleep(1) - - # r, status_ok = expand_history_dns(api, domain) + time.sleep(1) + r, status_ok = expand_history_ipv4_ipv6(api, domain) # - # if status_ok: - # print(r) - # result_filtered['results'].extend(r) - # else: - # misperrors['error'] = misperrors[ - # 'error'] + ' Error in expand History DNS' - # return misperrors + + if status_ok: + if r: + result_filtered['results'].extend(r) + else: + misperrors['error'] = misperrors['error'] + ' Error history ipv4' + return misperrors + + time.sleep(1) + + r, status_ok = expand_history_dns(api, domain) + + if status_ok: + if r: + result_filtered['results'].extend(r) + else: + misperrors['error'] = misperrors[ + 'error'] + ' Error in expand History DNS' + return misperrors return result_filtered