From 1b26c0f7b16236367ce60c646508994ade40c443 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Sun, 25 Feb 2018 14:50:07 +1100 Subject: [PATCH] This really needs to be refactored, completely. I will start work on DNS-py2: Electric Boogaloo on my nightshifts --- .HTTPy.py.swp | Bin 24576 -> 0 bytes HTTPy.py | 13 +++++++------ notes.txt | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 .HTTPy.py.swp create mode 100644 notes.txt diff --git a/.HTTPy.py.swp b/.HTTPy.py.swp deleted file mode 100644 index dc573ba3571c96c2f962e29e01cec0a711e5ff8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 WadufcF8nz4asCH1iH0Wt diff --git a/HTTPy.py b/HTTPy.py index 8e16c7e..eac4cdc 100755 --- a/HTTPy.py +++ b/HTTPy.py @@ -137,18 +137,19 @@ def options(inputs): def iterate(inArray, pre): count = 0 while count != len(inArray) - 1: + print pre #print checkIfIP(inArray[count].split('.')) if pre == "TXT" or pre == "SOA": print indent + bcolors.CYAN + pre, bcolors.GREEN + inArray[count] + bcolors.RESET else: if checkIfIP(inArray[count].split('.')) == 0: tmpVal = isCNAME(inArray[count]) - recordDict[pre] = pre, inArray[count], tmpVal[0] + recordDict[pre + str(count)] = pre, inArray[count], tmpVal[0] #recordDict[pre] = indent + bcolors.CYAN + pre, bcolors.GREEN + inArray[count] + bcolors.RESET + " -> " + bcolors.GREEN + tmpVal[0] + bcolors.RESET #print indent + bcolors.CYAN + pre, bcolors.GREEN + inArray[count] + bcolors.RESET + " -> " + bcolors.GREEN + tmpVal[0] + bcolors.RESET else: - recordDict[pre] = pre, inArray[count] + recordDict[pre + str(count)] = pre, inArray[count] #recordDict[pre] = indent + bcolors.CYAN + pre, bcolors.GREEN + inArray[count] + bcolors.RESET #print indent + bcolors.CYAN + pre, bcolors.GREEN + inArray[count] + bcolors.RESET count = count + 1 @@ -208,7 +209,7 @@ def dig(inDomain, record): #print str(e) print "========================================================" test = dig.split("\n") - iterate(test, record) + #iterate(test, record) return test def newdig(inDomain, record, sub=""): @@ -298,7 +299,7 @@ while running == 1: if sub != "": tmpDom = sub + "." + inInput subRec, subType, subDomain = newdig(tmpDom, "A", sub) - iterate(subRec, subDomain) + #iterate(subRec, subDomain) for rec in rec2check: if rec != "": if rec == "MX": @@ -307,8 +308,8 @@ while running == 1: else: dnsRec, dnsType, blank = newdig(inInput, rec) iterate(dnsRec, dnsType) - #pprint(recordDict) + print(recordDict) #for data in recordDict: # print recordDict[data] - printDict(recordDict) + #printDict(recordDict) print '\n' diff --git a/notes.txt b/notes.txt new file mode 100644 index 0000000..3cb8cd2 --- /dev/null +++ b/notes.txt @@ -0,0 +1,18 @@ +## NOTES +# I am an idiot +# {'A': ('A', '172.217.25.142'), 'mail': ('mail', '172.217.25.133'), 'www': ('www', '172.217.25.132')} +# ~ MX 10 aspmx.l.google.com. -> 108.177.97.26 +# ~ MX 30 alt2.aspmx.l.google.com. -> 74.125.201.26 +# ~ MX 50 alt4.aspmx.l.google.com. -> 173.194.175.26 +# ~ MX 20 alt1.aspmx.l.google.com. -> 64.233.168.26 +# ~ MX 40 alt3.aspmx.l.google.com. -> 173.194.219.27 +# ~ TXT "docusign=05958488-4752-4ef2-95eb-aa7ba8a3bd0e" +# ~ TXT "v=spf1 include:_spf.google.com ~all" +# {'A': ('A', '172.217.25.142'), 'mail': ('mail', '172.217.25.133'), 'www': ('www', '172.217.25.132')} +# {'A': ('A', '172.217.25.142'), 'mail': ('mail', '172.217.25.133'), 'www': ('www', '172.217.25.132'), 'NS': ('NS', 'ns3.google.com.', '216.239.36.10')} +# {'A': ('A', '172.217.25.142'), 'mail': ('mail', '172.217.25.133'), 'www': ('www', '172.217.25.132'), 'NS': ('NS', 'ns3.google.com.', '216.239.36.10')} +# ~ SOA ns1.google.com. dns-admin.google.com. 186901781 900 900 1800 60 +# {'A': ('A', '172.217.25.142'), 'mail': ('mail', '172.217.25.133'), 'www': ('www', '172.217.25.132'), 'NS': ('NS', 'ns3.google.com.', '216.239.36.10')} + +There are mutiple records added, i need a unique indentifier :( +Maybe just a counter or something #nfi