Compare commits

...
2 Commits
Author SHA1 Message Date
benjamyn 2057d2a3fd fixed some py3 errors 2018-09-02 15:58:57 +10:00
benjamyn e7a149781e Fixed up local libs and main.py, waiting on whois lib 2018-08-30 02:18:14 +10:00
15 changed files with 14 additions and 8 deletions

No files matched your search

+2 -2
View File
@@ -1,2 +1,2 @@
import files
import config
from . import files
from . import config
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1,4 +1,4 @@
import files as f
from . import files as f
import json
import os
BIN
View File
Binary file not shown.
+2 -2
View File
@@ -2,7 +2,7 @@ def openFile(path):
try:
myFile = open(path)
except Exception as e:
print e
print(e)
pass
return myFile
@@ -10,6 +10,6 @@ def closeFile(fileObj):
try:
fileObj.close()
except Exception as e:
print e
print(e)
pass
BIN
View File
Binary file not shown.
+6 -3
View File
@@ -43,8 +43,8 @@ ipData = {"asn_country_code":"Country", "asn_description":"Owner"}
CountryDict = cc.parseCSV(cc.openCSV(CSVFile))
def domainWhois(inData):
whoisData = whois.whois(inData).query()
return whois.Parser(inData, whoisData[1]).parse()
whoisData = whois.whois.Whois(inData).query()
return whois.parser.Parser(inData, whoisData[1]).parse()
def signal_handler(singal, frame):
quit()
@@ -123,6 +123,7 @@ def lookupDomain(inData):
subLookup(inData, subs)
def lookupIP(inData):
try:
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=UserWarning)
ipnet = Net(inData)
@@ -139,6 +140,8 @@ def lookupIP(inData):
except Exception as E:
reverseName = E
print('\n' + indent + '%sPTR:%s\t\t%s%s' % (colour_pretty, colour_good, reverseName, colour_default))
except:
None
# Taken and modified from DNSpy 1, I am not asahmed it works
def checkIfIP(in1):
@@ -157,5 +160,5 @@ def checkIfIP(in1):
signal.signal(signal.SIGINT, signal_handler)
while running == 1:
parseInput(raw_input("Please Enter a domain" + prompt) )
parseInput(input("Please Enter a domain" + prompt) )
print('\n')
+3
View File
@@ -0,0 +1,3 @@
dnspython
ipwhois
readline