rra
/
Border-Check
mirror of https://github.com/rscmbbng/Border-Check
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

added user xml exporting options + fixed some logical errors

pull/3/head
psy 11 years ago
parent
452ad91a30
commit
b42c19efbc
2 changed files with 50 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      main.py
  2. 2
      options.py

73
main.py
View File

@ -24,7 +24,7 @@ from xml_exporter import xml_reporting
import webbrowser import webbrowser
# set to emit debug messages about errors (0 = off). # set to emit debug messages about errors (0 = off).
DEBUG = 0 DEBUG = 1
class bc(object): class bc(object):
""" """
@ -96,7 +96,7 @@ class bc(object):
try: try:
return func(*args) return func(*args)
except Exception as e: except Exception as e:
print("[Error] - Something wrong fetching urls. Aborting..."), "\n" print("\n[Error] - Something wrong fetching urls. Aborting..."), "\n"
if DEBUG: if DEBUG:
traceback.print_exc() traceback.print_exc()
sys.exit(2) sys.exit(2)
@ -204,13 +204,13 @@ class bc(object):
print "Browser Options:\n" + '='*45 + "\n" print "Browser Options:\n" + '='*45 + "\n"
if sys.platform.startswith('linux'): if sys.platform.startswith('linux'):
if self.browser == "F": if self.browser == "F":
print "Currently used: Firefox\n" print "Using: Firefox\n"
if self.browser == "C": if self.browser == "C":
print "Currently used: Chrome\n" print "Using: Chrome\n"
if self.browser == "CHROMIUM": if self.browser == "CHROMIUM":
print "Currently used: Chromium\n" print "Using: Chromium\n"
else: else:
print "Currently used:", self.browser_path.split('/')[-1], "\n" print "Using:", self.browser_path.split('/')[-1], "\n"
if self.options.debug == True: if self.options.debug == True:
if sys.platform == 'darwin': if sys.platform == 'darwin':
if self.browser == "F" or self.browser == "C" or self.browser == "CHROMIUM": if self.browser == "F" or self.browser == "C" or self.browser == "CHROMIUM":
@ -330,7 +330,7 @@ class bc(object):
# Set the maxmind geo databases # Set the maxmind geo databases
self.geoip = pygeoip.GeoIP('GeoLiteCity.dat') self.geoip = pygeoip.GeoIP('GeoLiteCity.dat')
self.geoasn = pygeoip.GeoIP('GeoIPASNum.dat') self.geoasn = pygeoip.GeoIP('GeoIPASNum.dat')
print '='*45 + "\n", "Status target:\n" + '='*45 + "\n" print '='*45 + "\n", "Target:\n" + '='*45 + "\n"
print "URL:", self.url[0], "\n" print "URL:", self.url[0], "\n"
url = urlparse(self.getURL()).netloc #changed this for prototyping url = urlparse(self.getURL()).netloc #changed this for prototyping
#url = url.replace('www.','') #--> doing a tracert to example.com and www.example.com yields different results. #url = url.replace('www.','') #--> doing a tracert to example.com and www.example.com yields different results.
@ -375,8 +375,8 @@ class bc(object):
latitude = str(record['latitude']) latitude = str(record['latitude'])
self.latitude = latitude self.latitude = latitude
except: except:
self.longitude = '4.0' self.longitude = '-'
self.latitude = '40.0' self.latitude = '-'
try: try:
if record.has_key('country_name') and record['city'] is not '': if record.has_key('country_name') and record['city'] is not '':
country = record['country_name'] country = record['country_name']
@ -405,6 +405,10 @@ class bc(object):
self.result_list.append(self.vardict) self.result_list.append(self.vardict)
xml_results = xml_reporting(self) xml_results = xml_reporting(self)
xml_results.print_xml_results('data.xml') xml_results.print_xml_results('data.xml')
if self.options.export_xml:
open(self.options.export_xml, 'w') # starting a new xml data container in write mode
xml_results.print_xml_results(self.options.export_xml)
if self.options.debug == True: if self.options.debug == True:
logfile.close() logfile.close()
self.old_url = url self.old_url = url
@ -490,28 +494,36 @@ class bc(object):
match_ip = self.url[0].strip('http://').strip(':8080') match_ip = self.url[0].strip('http://').strip(':8080')
#regex for filtering local network IPs #regex for filtering local network IPs
if re.match(r'^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^10\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^192.168\.\d{1,3}$', match_ip) or re.match(r'^172.(1[6-9]|2[0-9]|3[0-1]).[0-9]{1,3}.[0-9]{1,3}$', match_ip) or match_ip.startswith('file://'): if re.match(r'^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^10\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^192.168\.\d{1,3}$', match_ip) or re.match(r'^172.(1[6-9]|2[0-9]|3[0-1]).[0-9]{1,3}.[0-9]{1,3}$', match_ip) or match_ip.startswith('file://'):
print '='*45 + "\n", "Target:\n" + '='*45 + "\n"
print "URL:", self.url[0], "\n"
print "Warning: This target is not valid!.\n"
pass pass
else: else:
if self.url[0].startswith('file://'): if self.url[0].startswith('file://'):
print '='*45 + "\n", "Target:\n" + '='*45 + "\n"
print "URL:", self.url[0], "\n"
print "Warning: This target is not valid!.\n"
pass pass
else: else:
traces = self.try_running(self.traces, "\nInternal error tracerouting.") traces = self.try_running(self.traces, "\nInternal error tracerouting.")
# start web mode (on a different thread) # start web mode (on a different thread)
try: try:
t = threading.Thread(target=BorderCheckWebserver, args=(self, )) t = threading.Thread(target=BorderCheckWebserver, args=(self, ))
t.daemon = True t.daemon = True
t.start() t.start()
time.sleep(2) time.sleep(2)
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
t.join() t.join()
sys.exit() sys.exit()
# open same browser of history access on a new tab # open same browser of history access on a new tab
try: try:
webbrowser.open('http://127.0.0.1:8080', new=1) webbrowser.open('http://127.0.0.1:8080', new=1)
except: except:
print "Error: Browser is not responding correctly.\n" print "Error: Browser is not responding correctly.\n"
print '='*45 + "\n" print('='*75)
print(str(p.version))
print('='*75 + "\n")
print "Status: Waiting for new urls ...\n" print "Status: Waiting for new urls ...\n"
print "Type 'Control+C' to exit.\n" print "Type 'Control+C' to exit.\n"
print '='*45 + "\n" print '='*45 + "\n"
@ -519,12 +531,23 @@ class bc(object):
while True: while True:
url = urlparse(self.getURL()).netloc url = urlparse(self.getURL()).netloc
#url = url.replace('www.','') #url = url.replace('www.','')
match_ip = url.strip('http://').strip(':8080') try:
match_ip = url.strip('http://').strip(':8080')
except:
print '='*45 + "\n", "Target:\n" + '='*45 + "\n"
print "URL:", self.url[0], "\n"
pass
if url != self.old_url: if url != self.old_url:
if re.match(r'^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^10\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^192.168\.\d{1,3}$', match_ip) or re.match(r'^172.(1[6-9]|2[0-9]|3[0-1]).[0-9]{1,3}.[0-9]{1,3}$', match_ip): if re.match(r'^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^10\.\d{1,3}\.\d{1,3}\.\d{1,3}$', match_ip) or re.match(r'^192.168\.\d{1,3}$', match_ip) or re.match(r'^172.(1[6-9]|2[0-9]|3[0-1]).[0-9]{1,3}.[0-9]{1,3}$', match_ip):
print '='*45 + "\n", "Target:\n" + '='*45 + "\n"
print "URL:", self.url[0], "\n"
print "Warning: This target is not valid!.\n"
pass pass
else: else:
if self.url[0].startswith('file://'): if self.url[0].startswith('file://'):
print '='*45 + "\n", "Target:\n" + '='*45 + "\n"
print "URL:", self.url[0], "\n"
print "Warning: This target is not valid!.\n"
pass pass
else: else:
if os.path.exists('data.xml'): # removing xml data to has a new map each time that bc is launched if os.path.exists('data.xml'): # removing xml data to has a new map each time that bc is launched

2
options.py
View File

@ -15,6 +15,8 @@ class BCOptions(optparse.OptionParser):
self.add_option("-d", "--debug", action="store_true", dest="debug", help="debug mode") self.add_option("-d", "--debug", action="store_true", dest="debug", help="debug mode")
self.add_option("-b", action="store", dest="browser", help="set browser's history path") self.add_option("-b", action="store", dest="browser", help="set browser's history path")
#self.add_option("--proxy", action="store", dest="proxy", help="set proxy server")
self.add_option("--xml", action="store", dest="export_xml", help="export traces to xml (ex: --xml foo.xml)")
def get_options(self, user_args=None): def get_options(self, user_args=None):
(options, args) = self.parse_args(user_args) (options, args) = self.parse_args(user_args)

Write Preview
Loading…
Cancel
Save