diff --git a/config.json b/config.json index 057e9c9..089fcf8 100644 --- a/config.json +++ b/config.json @@ -5,5 +5,6 @@ "colour_good":"green", "colour_pretty":"cyan", "colour_default":"reset", + "colour_none":"", "country_codes":"codes.csv" } diff --git a/libs/config.py b/libs/config.py index 9b0820d..886d42b 100644 --- a/libs/config.py +++ b/libs/config.py @@ -1,9 +1,10 @@ import files as f import json +import os -def readConf(): +def readConf(fileLoc): try: - jsonData = json.loads(f.openFile("config.json").read()) + jsonData = json.loads(f.openFile(os.path.expanduser(fileLoc)).read()) except Exception as e: print e jasonData = "" diff --git a/libs/config.pyc b/libs/config.pyc index 40e9332..df88d28 100644 Binary files a/libs/config.pyc and b/libs/config.pyc differ diff --git a/main.py b/main.py index dc49551..7d0a5fd 100755 --- a/main.py +++ b/main.py @@ -1,10 +1,11 @@ #!/usr/bin/python2.7 import whois -import readline import signal import dns.resolver import json import warnings +import os +import platform from dns import reversename from ipwhois.net import Net from ipwhois.asn import IPASN @@ -13,15 +14,8 @@ from libs import config from libs import colours as gc from libs import cc -running = 1 -prompt = ': ' -indent = '~ ' -whoisrecs = ["NotFound", "DomainName", "Registrar", "Status", "UpdatedDate", "CreationDate", "ExpirationDate", "RegistrantName", "RegistrantEmail", "EligibilityName", "EligibilityType", "EligibilityID", "RegistrantID", "NameServer"] -#ipData = ["asn_country_code", "asn_description"] -ipData = {"asn_country_code":"Country", "asn_description":"Owner"} - # Loaded from the config file -jsonData = config.readConf() +jsonData = config.readConf("~/config.json") subdomains = jsonData["subdomains"] dnsrecords = jsonData["dnsrecords"] @@ -32,6 +26,22 @@ colour_default = gc.getColour(jsonData["colour_default"]) CSVFile = jsonData["country_codes"] # Endconfig block +if platform.system().lower() == "linux": + import readline +else: + #do windows stuff here + colour_attn = "" + colour_good = "" + colour_pretty = "" + colour_default = "" + +running = 1 +prompt = ': ' +indent = '~ ' +whoisrecs = ["NotFound", "DomainName", "Registrar", "Status", "UpdatedDate", "CreationDate", "ExpirationDate", "RegistrantName", "RegistrantEmail", "EligibilityName", "EligibilityType", "EligibilityID", "RegistrantID", "NameServer"] +#ipData = ["asn_country_code", "asn_description"] +ipData = {"asn_country_code":"Country", "asn_description":"Owner"} + CountryDict = cc.parseCSV(cc.openCSV(CSVFile)) def domainWhois(inData):