Skip to content

Landscape fixes #6

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
zebde wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Landscape fixes #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fbdf70
Landscape fixes
zebde Sep 23, 2017
86a7ebe
Landscape fixes
zebde Sep 23, 2017
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
30 changes: 15 additions & 15 deletions iplookup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from joblib import Parallel, delayed
from netaddr import AddrFormatError, IPSet

torcsv = 'Tor_ip_list_ALL.csv'
sfile = 'http://torstatus.blutmagie.de/ip_list_all.php/Tor_ip_list_ALL.csv'
TORCSV = 'Tor_ip_list_ALL.csv'
SFILE = 'http://torstatus.blutmagie.de/ip_list_all.php/Tor_ip_list_ALL.csv'
SUBNET = 0
INPUTDICT = {}
SECTOR_CSV = 'sector.csv'
Expand Down Expand Up @@ -46,14 +46,14 @@ def lookup(value):
return value


def flookup(value, fname, sfile):
def flookup(value, fname, SFILE):
"""Look up a value in a file."""
try:
fhandle = open(fname)
except IOError:
sourceFile = urllib.URLopener()
sourceFile.retrieve(
sfile,
SFILE,
fname)
fhandle = open(fname)
search = mmap.mmap(fhandle.fileno(), 0, access=mmap.ACCESS_READ)
Expand Down Expand Up @@ -119,7 +119,7 @@ def mainlookup(var):
country = match.country
location = match.location

tor = flookup(var, torcsv, sfile)
tor = flookup(var, TORCSV, SFILE)

category = identify(origin[4])
if category == "":
Expand Down Expand Up @@ -162,7 +162,7 @@ def mainlookup(var):

def batch(inputfile):
"""Handle batch lookups using file based input."""
if os.path.isfile(OUTFILE):
if os.path.iSFILE(OUTFILE):
os.remove(OUTFILE)
fhandle = open(OUTFILE, "a")
header = 0
Expand Down Expand Up @@ -211,24 +211,24 @@ def csvout(inputdict):

def main():
import argparse
PARSER = argparse.ArgumentParser()
PARSER.add_argument("-t",
parser = argparse.Argumentparser()
parser.add_argument("-t",
choices=('single', 'batch'),
required="false",
metavar="request-type",
help="Either single or batch request")
PARSER.add_argument("-v",
parser.add_argument("-v",
required="false",
metavar="value",
help="The value of the request")
ARGS = PARSER.parse_args()
args = parser.parse_args()

if ARGS.t == "single":
print(single(ARGS.v))
elif ARGS.t == "batch":
batch(ARGS.v)
if args.t == "single":
print(single(args.v))
elif args.t == "batch":
batch(args.v)
else:
PARSER.print_help()
parser.print_help()


if __name__ == "__main__":
Expand Down