deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 13:43:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

handle missing dns.resolver library quietly

Browse Source
This commit is contained in:
Jay Lee
2014-09-23 21:08:58 -04:00
parent 7f6683e21d
commit 37ade0059f
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gam.py
View File

@ -5022,6 +5022,7 @@ def doSiteVerifyAttempt():
print u'Method: %s' % verify_data[u'method'] print u'Method: %s' % verify_data[u'method']
print u'Token: %s' % verify_data[u'token'] print u'Token: %s' % verify_data[u'token']
if verify_data[u'method'] == u'DNS_CNAME': if verify_data[u'method'] == u'DNS_CNAME':
try:
import dns.resolver import dns.resolver
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
resolver.nameservers = nameservers=[u'8.8.8.8', u'8.8.4.4'] resolver.nameservers = nameservers=[u'8.8.8.8', u'8.8.4.4']
@ -5032,9 +5033,12 @@ def doSiteVerifyAttempt():
answers = resolver.query(u'%s.%s' % (cname_subdomain, a_domain), u'A') answers = resolver.query(u'%s.%s' % (cname_subdomain, a_domain), u'A')
for answer in answers: for answer in answers:
print u'DNS Record: %s' % answer print u'DNS Record: %s' % answer
except dns.resolver.NXDOMAIN: except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
print u'ERROR: No such domain found in DNS!' print u'ERROR: No such domain found in DNS!'
except ImportError:
pass
elif verify_data[u'method'] == u'DNS_TXT': elif verify_data[u'method'] == u'DNS_TXT':
try:
import dns.resolver import dns.resolver
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
resolver.nameservers = nameservers=[u'8.8.8.8', u'8.8.4.4'] resolver.nameservers = nameservers=[u'8.8.8.8', u'8.8.4.4']
@ -5044,6 +5048,8 @@ def doSiteVerifyAttempt():
print u'DNS Record: %s' % str(answer).replace(u'"', u'') print u'DNS Record: %s' % str(answer).replace(u'"', u'')
except dns.resolver.NXDOMAIN: except dns.resolver.NXDOMAIN:
print u'ERROR: no such domain found in DNS!' print u'ERROR: no such domain found in DNS!'
except ImportError:
pass
return return
print u'SUCCESS!' print u'SUCCESS!'
print u'Verified: %s' % verify_result[u'site'][u'identifier'] print u'Verified: %s' % verify_result[u'site'][u'identifier']