diff --git a/.gitignore b/.gitignore index 71b2e02..44e38aa 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,5 @@ RemoteSystemsTempFiles .project .pydevproject .metadata -.settings \ No newline at end of file +.settings +*.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 37ab90e..9754758 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 +encoding//core/FileExporter.py=UTF-8 +encoding//core/IpGeoLocation.py=UTF-8 +encoding//core/IpGeoLocationLib.py=UTF-8 encoding//core/Logger.py=UTF-8 encoding//core/Menu.py=UTF-8 encoding/ipgeolocation.py=UTF-8 diff --git a/README.md b/README.md index ba4f429..1b63770 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ usage: ipgeolocation.py [-h] [-m] [-t TARGET] [-T file] [-u User-Agent] [-U file] [-g] [--noprint] [-v] [--nolog] [-x PROXY] [-X file] [-e file] [-ec file] [-ex file] -IPGeolocation 2.0 +IPGeolocation 2.0.1 --[ Retrieve IP Geolocation information from ip-api.com --[ Copyright (c) 2015-2016 maldevel (@maldevel) diff --git a/core/IpGeoLocationLib.py b/core/IpGeoLocationLib.py index d3fac6d..80e31f4 100644 --- a/core/IpGeoLocationLib.py +++ b/core/IpGeoLocationLib.py @@ -38,8 +38,7 @@ class IpGeoLocationLib: """Retrieve IP Geolocation information from http://ip-api.com""" - - def __init__(self): + def __init__(self, target, noprint=False, verbose=False, nolog=False): self.URL = 'http://ip-api.com' self.RequestURL = self.URL + '/json/{}' self.BOLD = '\033[1m' @@ -50,22 +49,19 @@ def __init__(self): self.TargetsFile = None self.ProxiesFile = None self.Targets = None - self.Verbose = False - self.NoPrint = False - self.NoLog = False + self.Verbose = verbose + self.NoPrint = noprint + self.NoLog = nolog + self.Target = target - def GetInfo(self, target, userAgent, targetsFile=None, + def GetInfo(self, userAgent, targetsFile=None, userAgentFile=None, proxy=False, proxiesFile=None, - noprint=False, verbose=False, nolog=False, exportToCSVFile=None, - exportToXMLFile=None, exportToTXTFile=None, - googleMaps=False): + exportToCSVFile=None, exportToXMLFile=None, + exportToTXTFile=None, googleMaps=False): """Retrieve information""" self.UserAgent = userAgent - self.Verbose = verbose - self.NoPrint = noprint - self.NoLog = nolog try: @@ -98,7 +94,7 @@ def GetInfo(self, target, userAgent, targetsFile=None, results = self.__retrieveGeolocations() else: - results = self.__retrieveGeolocation(target) + results = self.__retrieveGeolocation(self.Target) #export information if exportToCSVFile and not os.path.exists(exportToCSVFile) and os.access(os.path.dirname(exportToCSVFile), os.W_OK): diff --git a/core/Menu.py b/core/Menu.py index db492ed..924c1bb 100644 --- a/core/Menu.py +++ b/core/Menu.py @@ -27,7 +27,7 @@ __author__ = 'maldevel' __twitter__ = '@maldevel' -__version__ = '2.0' +__version__ = '2.0.1' __year__ = '2015-2016' diff --git a/ipgeolocation.py b/ipgeolocation.py index e081f58..c0543b4 100644 --- a/ipgeolocation.py +++ b/ipgeolocation.py @@ -73,16 +73,15 @@ def main(): #init lib - ipGeoLocRequest = IpGeoLocationLib() + ipGeoLocRequest = IpGeoLocationLib(args.target, args.noprint, args.verbose, args.nolog) print(banner) #retrieve information - if not ipGeoLocRequest.GetInfo(args.target, args.uagent, args.tlist, - args.ulist, args.proxy, args.xlist, - args.noprint, args.verbose, args.nolog, + if not ipGeoLocRequest.GetInfo(args.uagent, args.tlist, + args.ulist, args.proxy, args.xlist, args.csv, args.xml, args.txt, args.g): - PrintError("Retrieving IP Geolocation information failed.") + PrintError("Retrieving IP Geolocation information failed.", args.nolog) sys.exit(8)