Engine advancements

-Added a new function, usage that summarizes the differents flags and their use.
-Done mutex opérations inside the worker threads

Author: root

.gitignore

@@ -0,0 +1,6 @@
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake
+dirbuster-ng
+Makefile
+

Makefile

@@ -36,10 +36,10 @@ CMAKE_COMMAND = /usr/bin/cmake
 RM = /usr/bin/cmake -E remove -f
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/wintermew/Projets/dirbuster-ng
+CMAKE_SOURCE_DIR = /home/cgame/Projects/dirbuster-ng
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/wintermew/Projets/dirbuster-ng
+CMAKE_BINARY_DIR = /home/cgame/Projects/dirbuster-ng
 
 #=============================================================================
 # Targets provided globally by CMake.
@@ -107,9 +107,9 @@ rebuild_cache/fast: rebuild_cache
 
 # The main all target
 all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/wintermew/Projets/dirbuster-ng/CMakeFiles /home/wintermew/Projets/dirbuster-ng/CMakeFiles/progress.marks
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/cgame/Projects/dirbuster-ng/CMakeFiles /home/cgame/Projects/dirbuster-ng/CMakeFiles/progress.marks
 	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/wintermew/Projets/dirbuster-ng/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/cgame/Projects/dirbuster-ng/CMakeFiles 0
 .PHONY : all
 
 # The main clean target

src/dict.h

@@ -3,8 +3,14 @@ const char* def_dict[] = {
 
 "include",
 "config",
+"conf",
 "images",
+"img",
 "js",
+"styles",
+"css",
+"stylesheets",
+"templates",
 "javascript",
 "wp-content",
 "wp-admin"

src/dirbuster-ng

@@ -9,7 +9,7 @@ int parse_arguments(int argc, char **argv)
     int index;
     int c;
     int opterr = 0;	
-    while ((c = getopt(argc, argv, "qvw:d:h:n:")) != -1) {
+    while ((c = getopt(argc, argv, "hqvw:d:n:")) != -1) {
 		switch (c) {
 			case 'v':
 		  		return;
@@ -20,7 +20,7 @@ int parse_arguments(int argc, char **argv)
 				conf0.quiet = 1;
 		    	break;
 			case 'h':
-				conf0.host = optarg;
+				usage();
 		    	break;
 			default:
     			break;
@@ -48,27 +48,67 @@ int load_dict() {
 void* dbng_engine(void* queue_arg) {
 
   struct queue* db_queue = (struct queue*) queue_arg;
+  extern dbng_config conf0;
   char * url;
   CURL *curl;
-  CURLcode response;	
-
+  CURLcode response;
+  char *wl;
   curl = curl_easy_init();
 
   while(db_queue->head) {
-    curl_easy_setopt(curl, CURLOPT_URL,"http://google.com");
+
+    //we lock the queue's mutex, get the entry then unlock
+	pthread_mutex_lock(db_queue->mutex);
+	//memcpy sur entry -> wl sinon pb race cond ??
+    wl = db_queue->head->entry;
+    queue_rem(db_queue);
+	pthread_mutex_unlock(db_queue->mutex);
+
+    //we construct the url given host and wl
+	url = (char*) malloc((strlen(conf0.host) + strlen(wl) +2) * sizeof(char) );
+	strncpy(url,conf0.host,strlen(conf0.host));
+	strncat(url,"/",1 * sizeof(char));  
+	strncat(url,wl,strlen(wl));
+	
+    curl_easy_setopt(curl, CURLOPT_URL,url);
     response = curl_easy_perform(curl);
     if (response != 404 ) {
       output("FOUND %s (response code %d)\n",url,response);    
     }
+
+	curl_easy_cleanup(curl);
+    free(url);
   }		
 }
 
+
+
 int init_workers() {
   extern dbng_config conf0;
   conf0.workers = (pthread_t*) malloc(conf0.nb_workers * sizeof(pthread_t));
 }
 
 
+int init_workloads(struct queue* db_queue) {
+	
+	extern dbng_config conf0;
+	if (NULL == conf0.dict) {
+      
+	}
+}
+
+int usage() {
+
+  printf("Usage: dirbuster-ng [options...] <url>\n\
+Options:\n -w <workers>\tDefines the number of threads to use to make the attack\n\
+ -d <dict>\tLoads an external textfile to use as a dictionary\n\
+ -q\t Enable quiet mode (relevent only with the -W flag)\n\
+ -h\t Prints this help then exits\n\
+ -v\t Prints the program version then exits\n");
+
+  exit(0);
+}
+
 int version() {
   printf("{Dirbuster NG 0.1} (c)2012 WintermeW\n");
 }
@@ -77,6 +117,16 @@ int version() {
 int main(int argc, char **argv)
 {
   extern dbng_config conf0;
+  struct queue* db_queue;
+	
+  if (argc < 2) usage();
+
+  conf0.host = argv[argc -1];
+	
+  db_queue = queue_new();
+  db_queue->mutex = (pthread_mutex_t*) malloc(sizeof(pthread_mutex_t));
+  pthread_mutex_init(db_queue->mutex,NULL);
+
   parse_arguments(argc,argv);
   if (!conf0.quiet) version();
   //debug

src/dirbuster-ng.c

@@ -11,7 +11,7 @@
 #include <curl/curl.h>
 
 
-#define DEFAULT_WORKERS 5
+#define DEFAULT_WORKERS 8
 
 dbng_config conf0;
 

src/dirbuster-ng.h

@@ -3,9 +3,9 @@
 typedef struct dbng_config {
 
   int nb_workers;
-  char external_dict[1024];
   uint8_t quiet;
   pthread_t* workers;
+  char *dict;
   char* host;
 
 } dbng_config;

src/dirbuster-ng_config.h

@@ -11,7 +11,7 @@ struct elt {
 struct queue {
     struct elt *head;
     struct elt *tail;
-	pthread_mutex_t * mutex;
+	pthread_mutex_t* mutex;
 };
 
 struct queue *queue_add(struct queue *,char*);