changed project structure and fixed bugs in buildURL

Author: AnonymOnline

URL_Fuzzer/__init__.py renamed to Fuzzix.py

@@ -1,7 +1,8 @@
 import argparse
 
-from Data import Host, URL, Settings, Dir
-from util import WebApi, logger, Content_Worker, Content, TERMINATE_WORKER
+from Fuzzix.Data import Host, URL, Settings, Dir
+from Fuzzix.Util import WebApi, Content_Worker, Content, TERMINATE_WORKER
+from Fuzzix import Logger
 
 settings = None
 
@@ -15,19 +16,19 @@ def __init__(self, host):
         else:
             raise ValueError("wrong type for attribute host!")
 
-        logger.info("fuzzing url", self.host.getURL())
+        Logger.info("fuzzing url", self.host.getURL())
 
     def spider(self):
         """
         spider-routine of the URL_Fuzzer
         return: None
         """
 
-        logger.info("Spidering URL", self.host.getURL())
+        Logger.info("Spidering URL", self.host.getURL())
         rootcontent = Content(self.host.getURL())
         Content_Worker.queue.put(rootcontent)
         for i in range(0, Settings.readAttribute("recursion_depth",0)):
-            logger.info('Processing recursion', i, Content_Worker.queue.qsize(), 'tasks to be done')
+            Logger.info('Processing recursion', i, Content_Worker.queue.qsize(), 'tasks to be done')
             Content_Worker.queue.join()
 
             while not Content_Worker.done.empty():
@@ -49,18 +50,19 @@ def spider(self):
                             self.host.getRootdir().appendPath(path, length)
                             Content_Worker.queue.put(newContent)
                         except ValueError as e:
-                            continue
-
+                            Logger.error(e)
+                else:
+                    Logger.error('received error ' + str(content.getStatus()) + ' for ' + content.getURL().getURL())
         self.host.getRootdir().printDirs()
-        logger.info("spidering completed")
+        Logger.info("spidering completed")
 
 
 
     def fuzz(self):
-        logger.info("fuzzing URL", self.host.getURL())
+        Logger.info("fuzzing URL", self.host.getURL())
 
 
-        logger.info("fuzzing completed")
+        Logger.info("fuzzing completed")
 
 
 
@@ -102,6 +104,7 @@ def startup():
         Settings.writeAttribute("verify_cert",verify_cert)
         Settings.writeAttribute("threads",threads)
         Settings.writeAttribute("recursion_depth",recursion_depth)
+        Settings.readConfig("config/config.ini")
 
         WebApi.setProtocol(URL(Settings.readAttribute("host_url","")).getProto())
     except ValueError as e:
@@ -115,12 +118,12 @@ def startWorkers(amount=4):
     return: None
     """
 
-    logger.info("Starting " + str(amount) + " threads")
+    Logger.info("Starting " + str(amount) + " threads")
     for i in range(0, amount):
         c = Content_Worker()
         c.start()
         Content_Worker.workers.append(c)
-    logger.info("Threads started")
+    Logger.info("Threads started")
 
 
 def stopWorkers():
@@ -129,13 +132,13 @@ def stopWorkers():
     return: None
     """
 
-    logger.info("stopping workers")
+    Logger.info("stopping workers")
     for w in Content_Worker.workers:
         Content_Worker.queue.put(TERMINATE_WORKER)
     for w in Content_Worker.workers:
         w.join()
 
-    logger.info("stopped workers")
+    Logger.info("stopped workers")
 
 
 def shutdown():
@@ -147,9 +150,9 @@ def shutdown():
     try:
         stopWorkers()
     except:
-        logger.error("failed to stop threads!")
+        Logger.error("failed to stop threads!")
 
-    logger.info("finished scan")
+    Logger.info("finished scan")
     exit()
 
 
@@ -159,7 +162,7 @@ def shutdown():
         startup()
         startWorkers(Settings.readAttribute("threads",4))
     except ValueError as e:
-        logger.error(e)
+        Logger.error(e)
         exit()
 
     targetHost = Host(

URL_Fuzzer/Data.py renamed to Fuzzix/Data.py

@@ -202,13 +202,39 @@ def buildURL(proto, host, port, dir, file):
         builds an URL out of the given parameters
         attribute proto: the used protocol as str
         attribute host: the target host as str
-        attribute port: the target port as int
+        attribute port: the target port as int -> warning, currently not supported!
         attribute dir: the target dir as str
         attribute file: the target file as str
         return: the crafted URL of type str
         """
-        return proto + "://" + host + (
-            "/" + dir + "/" + file + ":" + str(port) if len((dir + file).replace('/', '')) > 0 else ":" + str(port))
+        if dir.startswith('/'):
+            dir = dir[1:]
+        if dir.endswith('/'):
+            dir = dir[:-1]
+        file.replace('/','')
+        
+        path = ''
+        if (dir+file).endswith('/'):
+            if not file:
+                path = '/' + dir[:-1]
+            else:
+                if not dir:
+                    path = '/' + file[:-1]
+                else:
+                    path = '/' + dir + '/' + file[:-1]
+        else:
+            if not dir:
+                if not file:
+                    path = ''
+                else:
+                    path = '/' + file
+            else:
+                if not file:
+                    path = '/' + dir
+                else:
+                    path = '/' + dir + '/' + file
+        
+        return proto + "://" + host + path
 
     @staticmethod
     def prettifyURL(host, rootURL, url):
@@ -231,7 +257,7 @@ def prettifyURL(host, rootURL, url):
         try:
             return URL(url)
         except ValueError:
-            raise ValueError('couldn\'t prettify URL' + url + ' it is not valid')
+            raise ValueError('couldn\'t prettify URL' + url + ' found in ' + rootURL.getURL() + ' it is not valid')
 
     @staticmethod
     def isValidURL(url):
@@ -295,7 +321,7 @@ def readConfig(self,path):
         """
         configFile = configparser.ConfigParser()
         configFile.read(path)
-        if configFile.sections() <= 0:
+        if len(configFile.sections()) <= 0:
             raise ValueError("given config empty or not existend")
         for section in configFile.sections():
             for key in configFile[section]:
@@ -328,4 +354,4 @@ def readAttribute(self,key,default):
     def printConfig(self):
         for key in self.config:
             print(key + " : " + self.config[key])
-Settings = __Settings__()
+Settings = __Settings__()

URL_Fuzzer/util.py renamed to Fuzzix/Util.py

@@ -4,16 +4,10 @@
 
 import threading
 from queue import Queue
-from coloredlogger import ColoredLogger
 from bs4 import BeautifulSoup
 
-logger = ColoredLogger(name="MAIN")
-
-from Data import URL
-from Data import HTTP
-from Data import Host
-from Data import Dir
-from Data import File
+from Fuzzix import Logger
+from Fuzzix.Data import URL, HTTP, Host, Dir, File
 
 
 class __WebApi__:

Fuzzix/__init__.py

@@ -0,0 +1,2 @@
+from coloredlogger import ColoredLogger
+Logger = ColoredLogger(name="MAIN")

URL_Fuzzer/config/config.ini

@@ -0,0 +1,5 @@
+[WORDLISTS]
+directories = worlists/directories.txt
+extensions = worlists/extensions.txt
+files = worlists/files.txt
+mutations = worlists/mutations.txt