MISP
/
misp-warninglists
mirror of https://github.com/MISP/misp-warninglists
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [tools] CRL tool updated to support latest version of dnspython 

Add exception handling for some CRL (in China) returning incorrect DNS
response from their authoritative servers.
pull/251/head
Alexandre Dulaunoy 2023-07-28 10:55:30 +02:00
parent 4a4c241d22
commit 11101527c0
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/generate-crl-ip-domains.py
View File

@ -3,12 +3,14 @@ import csv
import logging import logging
import multiprocessing.dummy import multiprocessing.dummy
import urllib.parse import urllib.parse
import sys
from OpenSSL.crypto import FILETYPE_PEM, load_certificate, X509 from OpenSSL.crypto import FILETYPE_PEM, load_certificate, X509
from pyasn1.codec.der.decoder import decode as asn1_decoder from pyasn1.codec.der.decoder import decode as asn1_decoder
from pyasn1_modules.rfc2459 import CRLDistPointsSyntax, AuthorityInfoAccessSyntax from pyasn1_modules.rfc2459 import CRLDistPointsSyntax, AuthorityInfoAccessSyntax
from typing import List, Set from typing import List, Set
from dns.resolver import NoAnswer, NXDOMAIN from dns.resolver import NoAnswer, NXDOMAIN, NoNameservers
from dns.exception import Timeout from dns.exception import Timeout
import dns
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file, create_resolver from generator import download_to_file, get_version, write_to_file, get_abspath_source_file, create_resolver
@ -45,18 +47,19 @@ def get_crl_ocsp_domains(cert: X509) -> List[str]:
def get_ips_from_domain(domain: str) -> Set[str]: def get_ips_from_domain(domain: str) -> Set[str]:
resolver = create_resolver() resolver = create_resolver()
ips = set() ips = set()
try: try:
for rdata in resolver.query(domain, 'A'): answers = dns.resolver.resolve(domain, 'A')
for rdata in answers:
ips.add(str(rdata)) ips.add(str(rdata))
except (NoAnswer, NXDOMAIN, Timeout): except (NoAnswer, NXDOMAIN, NoNameservers, Timeout):
pass pass
try: try:
for rdata in resolver.query(domain, 'AAAA'): answers = dns.resolver.resolve(domain, 'AAAA')
for rdata in answers:
ips.add(str(rdata)) ips.add(str(rdata))
except (NoAnswer, NXDOMAIN, Timeout): except (NoAnswer, NXDOMAIN, NoNameservers, Timeout):
pass pass
return ips return ips