Fixing minor bugs using subbrute in sublist3r

Author: mrh0wl

lib/tools/subbrute/names.txt data/txt/names.txtlib/tools/subbrute/names.txt renamed to data/txt/names.txt

@@ -19,6 +19,7 @@
 import thirdparty.dns.rdatatype
 import thirdparty.dns.resolver
 
+from lib.utils.colors import tab, warn
 # Python 2.x and 3.x compatiablity
 # We need the Queue library for exception handling
 try:
@@ -422,7 +423,7 @@ def print_target(target,
                  found_subdomains=[],
                  verbose=False):
     subdomains_list = []
-    run(target, record_type, subdomains, resolve_list, process_count)
+    # run(target, record_type, subdomains, resolve_list, process_count)
     for result in run(target, record_type, subdomains, resolve_list, process_count):
         (hostname, record_type, response) = result
         if not record_type:
@@ -437,12 +438,16 @@ def print_target(target,
     return set(subdomains_list)
 
 
-def run(target, record_type=None, subdomains="names.txt", resolve_list="resolvers.txt", process_count=16):
+def run(target,
+        record_type=None,
+        subdomains="data/txt/names.txt",
+        resolve_list="data/txt/resolvers.txt",
+        process_count=16):
     subdomains = check_open(subdomains)
     resolve_list = check_open(resolve_list)
     if (len(resolve_list) / 16) < process_count:
         sys.stderr.write(
-            'Warning: Fewer than 16 resovlers per thread, consider adding more nameservers to resolvers.txt.\n')
+            f'{tab*2}{warn}Fewer than 16 resovlers per thread, consider adding more nameservers to resolvers.txt.\n')
     if os.name == 'nt':
         wildcards = {}
         spider_blacklist = {}

lib/tools/subbrute/resolvers.txt data/txt/resolvers.txtlib/tools/subbrute/resolvers.txt renamed to data/txt/resolvers.txt

@@ -996,11 +996,10 @@ def main(domain, threads, savefile, ports, silent, verbose, enable_bruteforce, e
 
     if enable_bruteforce:
         if not silent:
-            print(tab + warn + "Starting bruteforce module now using subbrute.." + W)
+            print(tab + warn + "Starting bruteforce module now using subbrute" + W)
         record_type = False
-        path_to_file = os.path.dirname(os.path.realpath(__file__))
-        subs = os.path.join(path_to_file, 'subbrute', 'names.txt')
-        resolvers = os.path.join(path_to_file, 'subbrute', 'resolvers.txt')
+        subs = 'data/txt/names.txt'
+        resolvers = 'data/txt/resolvers.txt'
         process_count = threads
         output = False
         json_output = False

lib/tools/subbrute/subbrute.py

@@ -129,19 +129,19 @@ def formatter(prog): return argparse.HelpFormatter(prog, max_help_position=100)
         request.add_argument("--ignore-redirects", dest="ignoreRedirects", action="store_false",
                              help="Ignore Redirection attempts")
 
-        request.add_argument("--threads", dest="threads", nargs="*", default=defaults.threads, type=int,
+        request.add_argument("--threads", dest="threads", default=defaults.threads, type=int,
                              help="Max number of concurrent HTTP(s) requests (default %d)" % defaults.threads)
 
         # Search options
         search = parser.add_argument_group("Search", "These options can be used to perform advanced searches")
 
-        search.add_argument("-sC", "--search-censys", dest="censys", nargs="?", default="data/APIs/api.conf", type=str,
+        search.add_argument("-sC", "--search-censys", dest="censys", default="data/APIs/api.conf", type=str,
                             help="Perform search using Censys API")
 
-        search.add_argument("-sSh", "--search-shodan", dest="shodan", nargs="?", default="data/APIs/api.conf", type=str,
+        search.add_argument("-sSh", "--search-shodan", dest="shodan", default="data/APIs/api.conf", type=str,
                             help="Perform search using Shodan API")
 
-        search.add_argument("-sSt", "--search-st", dest="securitytrails", nargs="?", default="data/APIs/api.conf",
+        search.add_argument("-sSt", "--search-st", dest="securitytrails", default="data/APIs/api.conf",
                             type=str, help="Perform search using Securitytrails API")
 
         # Output options