hacamer
/
dnsmasq-china-list
mirror of https://github.com/felixonmars/dnsmasq-china-list.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

verify: use resolve() instead of query()

This commit is contained in:
Felix Yan 2020-11-20 19:45:55 +00:00
parent 0299d2f406
commit 6e28f3a632
No known key found for this signature in database
GPG Key ID: 786C63F330D7CB92
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
verify.py
View File

@ -78,7 +78,7 @@ class ChinaListVerify(object):
pass pass
if not answers: if not answers:
answers = dns.resolver.query(domain, 'A') answers = dns.resolver.resolve(domain, 'A')
for answer in answers: for answer in answers:
answer = answer.to_text() answer = answer.to_text()
@ -89,11 +89,11 @@ class ChinaListVerify(object):
def resolve(self, domain, rdtype="A", server=None, authority=False): def resolve(self, domain, rdtype="A", server=None, authority=False):
if not server: if not server:
return dns.resolver.query(domain, rdtype) return dns.resolver.resolve(domain, rdtype)
elif not authority: elif not authority:
return dns.resolver.Resolver(filename=StringIO("nameserver " + server)).query(domain, rdtype) return dns.resolver.Resolver(filename=StringIO("nameserver " + server)).resolve(domain, rdtype)
else: else:
answer = dns.resolver.Resolver(filename=StringIO("nameserver " + server)).query(domain, rdtype, raise_on_no_answer=False) answer = dns.resolver.Resolver(filename=StringIO("nameserver " + server)).resolve(domain, rdtype, raise_on_no_answer=False)
return answer.response return answer.response
def get_ns_for_tld(self, tld): def get_ns_for_tld(self, tld):
@ -161,7 +161,7 @@ class ChinaListVerify(object):
if nxdomain: if nxdomain:
# Double check due to false positives # Double check due to false positives
try: try:
dns.resolver.query("www." + domain, 'A') dns.resolver.resolve("www." + domain, 'A')
except dns.resolver.NXDOMAIN: except dns.resolver.NXDOMAIN:
raise NXDOMAIN raise NXDOMAIN