Commit 11693cf7 authored by Felix Yan's avatar Felix Yan

verify: revert auto guess. let's be explicit here. just double check for nxdomain

parent a48e3ca0
...@@ -2,4 +2,8 @@ a1.cdn-hotels.com ...@@ -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
\ No newline at end of file www.gov.cn
www.igoldhk.com
www.travelsky.net
www.xiumu.org
\ No newline at end of file
...@@ -118,15 +118,12 @@ class ChinaListVerify(object): ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment