Skip to content

Return multiple records for domain #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jordimassaguerpla wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return multiple records for domain #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/dnsServer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import getopt
import traceback
import threading
import types

from utils import *
from common import *
Expand Down Expand Up @@ -189,10 +190,16 @@ def format_question(question, qtype, qclass):
return q

def format_resource(resource, question):
if type(resource) == types.DictType:
tmp_r = resource
if type(resource) == types.ListType:
if len(resource) != 1:
raise Exception("Resource has more than one element and don't know what to do", resource)
tmp_r = resource[0]
r = ''
r += labels2str(question)
r += struct.pack("!HHIH", resource['qtype'], resource['qclass'], resource['ttl'], len(resource['rdata']))
r += resource['rdata']
r += struct.pack("!HHIH", tmp_r['qtype'], tmp_r['qclass'], tmp_r['ttl'], len(tmp_r['rdata']))
r += tmp_r['rdata']
return r

#def read_config():
Expand Down
79 changes: 41 additions & 38 deletions lib/dnsServer/namecoindns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,45 +102,48 @@ def get_response(self, query, domain, qtype, qclass, src_addr):
if domain.endswith(".bit") or domain.endswith(".tor") :
#response = listdns.lookup(self.sp, {"query":query, "domain":domain, "qtype":qtype, "qclass":qclass, "src_addr":src_addr})
#response = self.sp.lookup({"query":query, "domain":domain, "qtype":qtype, "qclass":qclass, "src_addr":src_addr})
response = answers
results = []
if type(response) == types.DictType :
tempresults = {"qtype":response["type"], "qclass":response["class"], "ttl":response["ttl"]}
if response["type"] == 1 :
#if answers == [] :
# return self.get_response(query, domain, 5, qclass, src_addr)
tempresults["rdata"] = struct.pack("!I", ipstr2int(response["data"]))
elif response["type"] == 2 or response["type"] == 5:
tempresults["rdata"] = labels2str(response["data"].split("."))
elif response["type"] == 16 :
tempresults["rdata"] = labels2str(response["data"])
elif response["type"] == 15 :
tempresult = struct.pack("!H", response["data"][0])
tempresult += labels2str(response["data"][1].split("."))
tempresults["rdata"] = tempresult
elif response["type"] == 28 :
tempresults["rdata"] = response["data"]
elif response["type"] == 52 :
tempresult = '\x03\x00'
tempresult += chr(int(response["data"][0][0]))
tempresult += bytearray.fromhex(response["data"][0][1])
tempresults["rdata"] = tempresult
#else : return 3, []
results.append(tempresults)
return 0, results
if type(response) == types.StringType :
if self.isIP(response) :
return 0, [{"qtype":1, "qclass":qclass, "ttl":300, "rdata":struct.pack("!I", ipstr2int(response))}]
return 3, []
#if query not in self._answers:
#return 3, []
#if qtype in self._answers[query]:
#if domain == "sonicrules.bit":
# results = [{'qtype': 1, 'qclass':qclass, 'ttl': 300, 'rdata': struct.pack("!I", ipstr2int(self.reqobj.req("sonicrules.org", qtype=1).answers[0]["data"]))}]
# return 0, results
#elif qtype == 1:
# if they asked for an A record and we didn't find one, check for a CNAME
#return self.get_response(query, domain, 5, qclass, src_addr)
for response in answers:
print "response", response
print "type", type(response)
if type(response) == types.DictType:
print "dictype"
tempresults = {"qtype":response["type"], "qclass":response["class"], "ttl":response["ttl"]}
if response["type"] == 1 :
#if answers == [] :
# return self.get_response(query, domain, 5, qclass, src_addr)
tempresults["rdata"] = struct.pack("!I", ipstr2int(response["data"]))
elif response["type"] == 2 or response["type"] == 5:
tempresults["rdata"] = labels2str(response["data"].split("."))
elif response["type"] == 16 :
tempresults["rdata"] = labels2str(response["data"])
elif response["type"] == 15 :
tempresult = struct.pack("!H", response["data"][0])
tempresult += labels2str(response["data"][1].split("."))
tempresults["rdata"] = tempresult
elif response["type"] == 28 :
tempresults["rdata"] = response["data"]
elif response["type"] == 52 :
tempresult = '\x03\x00'
tempresult += chr(int(response["data"][0][0]))
tempresult += bytearray.fromhex(response["data"][0][1])
tempresults["rdata"] = tempresult
#else : return 3, []
results.append(tempresults)
if type(response) == types.StringType or type(response) == types.UnicodeType :
print "string type"
if self.isIP(response) :
results.append([{"qtype":1, "qclass":qclass, "ttl":300, "rdata":struct.pack("!I", ipstr2int(response))}])
#if query not in self._answers:
#return 3, []
#if qtype in self._answers[query]:
#if domain == "sonicrules.bit":
# results = [{'qtype': 1, 'qclass':qclass, 'ttl': 300, 'rdata': struct.pack("!I", ipstr2int(self.reqobj.req("sonicrules.org", qtype=1).answers[0]["data"]))}]
# return 0, results
#elif qtype == 1:
# if they asked for an A record and we didn't find one, check for a CNAME
#return self.get_response(query, domain, 5, qclass, src_addr)
return 0, results
else:
#server = self.servers[random.randrange(0, len(self.servers)-1)]
#answers = self.reqobj.req(name=domain, qtype=qtype, server=server).answers
Expand Down
8 changes: 4 additions & 4 deletions plugin/pluginNamespaceDomain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def _bitLookup(self,qdict):
answers = app['plugins']['dns'].getIp4(qdict["domain"])
if answers != '[]':
nameData = json.loads(answers)
answers = str(nameData[0])
answers = nameData
#did we get an IP address or nothing?
if answers:
return answers
Expand All @@ -237,7 +237,7 @@ def _bitLookup(self,qdict):
answers = app['plugins']['dns'].getIp6(qdict["domain"])
if answers != '[]':
nameData = json.loads(answers)
answers = str(nameData[0])
answers = nameData
#did we get an IP address or nothing?
if answers:
return answers
Expand All @@ -247,15 +247,15 @@ def _bitLookup(self,qdict):
protocol = qdict["domain"].split(".")[1][1:]
answers = app['plugins']['dns'].getTlsFingerprint(qdict["domain"], protocol, port)
answers = json.loads(answers)
return {"type":52, "class":1, "ttl":300, "data":answers}
return [{"type":52, "class":1, "ttl":300, "data":answers}]
return

def _torLookup(self,qdict):

answers = app['plugins']['dns'].getOnion(qdict["domain"])
if answers != '[]':
nameData = json.loads(answers)
answers = str(nameData[0])
answers = nameData
#did we get an IP address or nothing?
if answers:
#if TXT record
Expand Down