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: revert auto guess. let's be explicit here. just double check for nxdomain

This commit is contained in:
Felix Yan 2018-12-14 02:26:51 +08:00
parent a48e3ca08d
commit 11693cf73b
No known key found for this signature in database
GPG Key ID: 786C63F330D7CB92
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cdn-testlist.txt
View File

@ -2,4 +2,8 @@ a1.cdn-hotels.com
cdn.jsdelivr.net cdn.jsdelivr.net
edge.yunjiasu.com edge.yunjiasu.com
ns1.8844dns.com ns1.8844dns.com
www.azure.cn.mschcdn.com www.azure.cn.mschcdn.com
www.gov.cn
www.igoldhk.com
www.travelsky.net
www.xiumu.org

13
verify.py
View File

@ -118,15 +118,12 @@ class ChinaListVerify(object):
except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN, dns.resolver.NoNameservers, dns.exception.Timeout): except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN, dns.resolver.NoNameservers, dns.exception.Timeout):
pass pass
# Try to resolve the "homepage" as CDNList, ignore failures
else:
try:
self.check_cdnlist("www." + domain)
except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN, dns.resolver.NoNameservers, dns.exception.Timeout, CDNListNotVerified):
pass
if nxdomain: if nxdomain:
raise NXDOMAIN # Double check due to false positives
try:
dns.resolver.query("www." + domain, 'A')
except dns.resolver.NXDOMAIN:
raise NXDOMAIN
self.check_blacklist(nameservers) self.check_blacklist(nameservers)