deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 22:53:34 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Handle no dns.resolver (#822)

Browse Source 
* Handle no dns.resolver

* Include python dns library
This commit is contained in:
Ross Scroggs
2018-11-29 08:01:04 -08:00
committed by Jay Lee
parent 5b0439ddb5
commit 9dd0b135b9
94 changed files with 14802 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gam.py
View File

@ -52,6 +52,7 @@ from multiprocessing import Pool
from multiprocessing import freeze_support
import dns.resolver
import googleapiclient
import googleapiclient.discovery
import googleapiclient.errors
@ -9832,27 +9833,26 @@ def doSiteVerifyAttempt():
verify_data = callGAPI(verif.webResource(), u'getToken', body=body)
print u'Method: %s' % verify_data[u'method']
print u'Token: %s' % verify_data[u'token']
if verify_data[u'method'] == u'DNS_CNAME':
if verify_data[u'method'] in [u'DNS_CNAME', u'DNS_TXT']:
resolver = dns.resolver.Resolver()
resolver.nameservers = [u'8.8.8.8', u'8.8.4.4']
cname_token = verify_data[u'token']
cname_list = cname_token.split(u' ')
cname_subdomain = cname_list[0]
try:
answers = resolver.query(u'%s.%s' % (cname_subdomain, a_domain), u'A')
for answer in answers:
print u'DNS Record: %s' % answer
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
print u'ERROR: No such domain found in DNS!'
elif verify_data[u'method'] == u'DNS_TXT':
resolver = dns.resolver.Resolver()
resolver.nameservers = [u'8.8.8.8', u'8.8.4.4']
try:
answers = resolver.query(a_domain, u'TXT')
for answer in answers:
print u'DNS Record: %s' % str(answer).replace(u'"', u'')
except dns.resolver.NXDOMAIN:
print u'ERROR: no such domain found in DNS!'
if verify_data[u'method'] == u'DNS_CNAME':
cname_token = verify_data[u'token']
cname_list = cname_token.split(u' ')
cname_subdomain = cname_list[0]
try:
answers = resolver.query(u'%s.%s' % (cname_subdomain, a_domain), u'A')
for answer in answers:
print u'DNS Record: %s' % answer
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
print u'ERROR: No such domain found in DNS!'
else:
try:
answers = resolver.query(a_domain, u'TXT')
for answer in answers:
print u'DNS Record: %s' % str(answer).replace(u'"', u'')
except dns.resolver.NXDOMAIN:
print u'ERROR: no such domain found in DNS!'
return
print u'SUCCESS!'
print u'Verified: %s' % verify_result[u'site'][u'identifier']