requirements check update

core/ip.py

@@ -3,30 +3,19 @@
 
 import time
 import sys
+import requests
 from core.alert import *
 from core.compatible import version
-
+from netaddr import iprange_to_cidrs
-if version() is 2:
+from netaddr import IPNetwork
-    from urllib2 import urlopen
-elif version is 3:
-    from urllib.request import urlopen
-
-try:
-    from netaddr import iprange_to_cidrs
-    from netaddr import IPNetwork
-except:
-    from core.color import finish
-
-    error('pip install -r requirements.txt')
-    finish()
-    sys.exit(1)
 
 
 def getIPRange(IP):
     n = 0
     while 1:
         try:
-            data = urlopen('http://rest.db.ripe.net/search.json?query-string={0}&flags=no-filtering'.format(IP)).read()
+            data = requests.get(
+                'http://rest.db.ripe.net/search.json?query-string={0}&flags=no-filtering'.format(IP)).content
             for line in data.rsplit('\n'):
                 line = line.rsplit('"')
                 for R in line:

core/load_modules.py

@@ -6,6 +6,7 @@ from glob import glob
 from core.alert import messages
 from core.alert import info
 from core.alert import warn
+from core._die import __die_failure
 
 
 def load_all_graphs():
@@ -52,3 +53,14 @@ def load_all_method_args(language):
         info(imodule.rsplit('.')[2] + '_' + imodule.rsplit('.')[1] + ' --> '
              + ", ".join(modules_args[imodule]))
     return module_names
+
+
+def __check_external_modules():
+    external_modules = ["argparse", "netaddr", "requests", "paramiko", "texttable", "socks", "win_inet_pton",
+                        "flask"]
+    for module in external_modules:
+        try:
+            __import__(module)
+        except:
+            __die_failure("pip install -r requirements.txt")
+    return True

core/log.py

@@ -3,34 +3,24 @@
 
 import json
 import sys
+import texttable
 from core.alert import messages
 from core.alert import info
 from core.alert import error
 from core import compatible
 from core._time import now
-
+from core._die import __die_failure
-try:
-    import texttable
-except:
-    from core.color import finish
-
-    error('pip install -r requirements.txt')
-    finish()
-    sys.exit(1)
 
 
 def build_graph(graph_flag, language, data, _HOST, _USERNAME, _PASSWORD, _PORT, _TYPE, _DESCRIPTION):
     info(messages(language, 88))
     try:
         start = getattr(
-            __import__('lib.graph.%s.engine' % (graph_flag.rsplit('_graph')[0]),
+            __import__('lib.graph.{0}.engine'.format(graph_flag.rsplit('_graph')[0]),
                        fromlist=['start']),
             'start')
     except:
-        error(messages(language, 98).format(graph_flag))
+        __die_failure(messages(language, 98).format(graph_flag))
-        from core.color import finish
-        finish()
-        sys.exit(1)
 
     info(messages(language, 89))
     return start(graph_flag, language, data, _HOST, _USERNAME, _PASSWORD, _PORT, _TYPE, _DESCRIPTION)

core/targets.py

@@ -3,16 +3,11 @@
 
 import socket
 import json
+import netaddr.ip
 from core.ip import *
 from core.alert import *
 from lib.scan.subdomain.engine import __get_subs
 
-try:
-    import netaddr.ip
-except:
-    error('pip install -r requirements.txt')
-    sys.exit(1)
-
 
 def target_to_host(target):
     if target_type(target) == 'HTTP':

nettacker.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from core.load_modules import __check_external_modules
 from core.parse import load
 
-if __name__ == "__main__":
+if __name__ == "__main__" and __check_external_modules():
     load()

requirements.txt

@@ -1,6 +1,5 @@
 argparse
 netaddr
-dnspython
 requests
 paramiko
 texttable