github/thc-hydra
1
0
Fork 0
mirror of https://github.com/vanhauser-thc/thc-hydra.git synced 2025-07-07 13:31:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

HTTP headers now get freed when they're no longer needed.

Browse source
This commit is contained in:
ajuaristi 2014-06-30 21:03:40 +02:00
parent 70c598ee32
commit db0a25f601
1 changed files with 40 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

137
hydra-http-form.c
View file

@ -134,10 +134,13 @@ int add_header(char *header, char *value){
for(cur_ptr = ptr_head; cur_ptr && cur_ptr->next; cur_ptr = cur_ptr->next); for(cur_ptr = ptr_head; cur_ptr && cur_ptr->next; cur_ptr = cur_ptr->next);
ptr_header_node new_ptr = (ptr_header_node) malloc(sizeof(t_header_node)); ptr_header_node new_ptr = (ptr_header_node) malloc(sizeof(t_header_node));
if(new_ptr){ char * new_header = strdup(header);
char * new_value = strdup(value);
if(new_ptr && new_header && new_value){
// create a new item and append it to the list // create a new item and append it to the list
new_ptr->header = header; new_ptr->header = new_header;
new_ptr->value = value; new_ptr->value = new_value;
new_ptr->next = NULL; new_ptr->next = NULL;
}else{ }else{
// we're out of memory, so forcefully end // we're out of memory, so forcefully end
@ -150,11 +153,6 @@ int add_header(char *header, char *value){
// head is NULL, so the list is empty // head is NULL, so the list is empty
ptr_head = new_ptr; ptr_head = new_ptr;
// TODO Remove the debug messages
// hydra_report(stdout, "[add_header] Added header %s: %s\n", header, value);
// hydra_report(stdout, "[add_header] len(header) = %d", strlen(header));
// hydra_report(stdout, "[add_header] len(value) = %d", strlen(value));
return 1; return 1;
} }
@ -169,25 +167,30 @@ int add_header(char *header, char *value){
* Returns 1 if success, or 0 otherwise (out of memory). * Returns 1 if success, or 0 otherwise (out of memory).
*/ */
int add_or_replace_header(char *header, char *value){ int add_or_replace_header(char *header, char *value){
ptr_header_node cur_ptr = NULL; int ret = 1;
for(cur_ptr = ptr_head; cur_ptr; cur_ptr = cur_ptr->next){ ptr_header_node cur_ptr = NULL;
if(strcmp(cur_ptr->header, header) == 0){ char * new_header = strdup(header);
//free(cur_ptr->value); char * new_value = strdup(value);
cur_ptr->value = value;
break; if(new_header && new_value){
} for(cur_ptr = ptr_head; cur_ptr; cur_ptr = cur_ptr->next){
if(strcmp(cur_ptr->header, new_header) == 0){
free(cur_ptr->value);
cur_ptr->value = new_value;
break;
}
}
} }
if(cur_ptr == NULL) if(cur_ptr == NULL){
return add_header(header, value); ret = add_header(header, value);
// add_header() will create a new copy so we can safely free them
free(new_header);
free(new_value);
}
// TODO Remove the debug messages return ret;
// hydra_report(stdout, "[add_or_replace_header] Added header %s: %s\n", header, value);
// hydra_report(stdout, "[add_or_replace_header] len(header) = %d", strlen(header));
// hydra_report(stdout, "[add_or_replace_header] len(value) = %d", strlen(value));
return 1;
} }
/* /*
@ -209,39 +212,6 @@ void hdrrep(char * oldvalue, char * newvalue){
} }
} }
int add_default_headers(int default_header_opts){
int retval = 0;
char * header = (char *) malloc(sizeof(char) * 80);
char * value = (char *) malloc(sizeof(char) * 80);
if(header && value){
if((default_header_opts & OPT_PROXY_AUTH) == OPT_PROXY_AUTH){
memset(header, 0, 80);
memset(value, 0, 80);
strcpy(header, "Proxy-Authorization");
strcpy(value, "Basic ");
strncat(value, proxy_authentication, 73);
retval &= add_header(header, value);
retval &= add_header("User-Agent", "Mozilla/5.0 (Hydra Proxy Auth)");
}
if((default_header_opts & OPT_PROXY_NOAUTH) == OPT_PROXY_NOAUTH){
retval &= add_or_replace_header("User-Agent", "Mozilla/5.0 (Hydra Proxy)");
}
if((default_header_opts & OPT_NOPROXY) == OPT_NOPROXY){
}
if((default_header_opts & OPT_GETCOOKIES) == OPT_GETCOOKIES){
}
}
return retval;
}
/* /*
* Concat all the headers in the list in a single string, and clean the whole list. * Concat all the headers in the list in a single string, and clean the whole list.
*/ */
@ -275,9 +245,9 @@ char * stringify_headers_and_clean(){
// Clean it up and get to the next header // Clean it up and get to the next header
tmp_ptr = cur_ptr; tmp_ptr = cur_ptr;
cur_ptr = cur_ptr->next; cur_ptr = cur_ptr->next;
//free(tmp_ptr->header); free(tmp_ptr->header);
//free(tmp_ptr->value); free(tmp_ptr->value);
//free(tmp_ptr); free(tmp_ptr);
} }
return headers_str; return headers_str;
@ -565,29 +535,18 @@ void service_http_form(char *ip, int sp, unsigned char options, char *miscptr, F
} }
// Prepare the HTTP requests that will follow // Prepare the HTTP requests that will follow
// Add the default HTTP headers
http_opts = 0; http_opts = 0;
if(use_proxy == 1 && proxy_authentication != NULL){ if(use_proxy == 1 && proxy_authentication != NULL){
// proxy with authentication // proxy with authentication
http_opts = OPT_PROXY_AUTH; // TODO Add default headers here
if(getcookie)
http_opts |= OPT_GETCOOKIES;
}else if(use_proxy == 1){ }else if(use_proxy == 1){
// proxy without authentication // proxy without authentication
http_opts = OPT_PROXY_NOAUTH; // TODO Add default headers here
if(getcookie)
http_opts |= OPT_GETCOOKIES;
}else{ }else{
// direct web server, no proxy // direct web server, no proxy
// char * header = (char *) malloc(255); add_header("Host", webtarget);
// char * value = (char *) malloc(255); add_header("User-Agent", "Mozilla/5.0 (Hydra)");
// strcpy(header, "User-Agent");
// strcpy(value, "Mozilla/5.0 (Hydra)");
// add_header(header, value);
add_header("Host", webtarget);
add_header("User-Agent", "Mozilla/5.0 (Hydra)");
http_opts = OPT_NOPROXY;
if(getcookie)
http_opts |=OPT_GETCOOKIES;
} }
prepare_httpreq(type, url); prepare_httpreq(type, url);
@ -622,18 +581,10 @@ void service_http_form(char *ip, int sp, unsigned char options, char *miscptr, F
* - (optional1 + 2) contains the header's name * - (optional1 + 2) contains the header's name
* - ptr contains the header's value * - ptr contains the header's value
*/ */
header = (char *) malloc(strlen(optional1 + 2)); if(add_header(optional1 + 2, hydra_strrep(ptr, "\\:", ":"))){
value = (char *) malloc(strlen(ptr)); // Success: break the switch and go ahead
if(header && value){ optional1 = ptr2;
strcpy(header, optional1 + 2); break;
strcpy(value, hydra_strrep(ptr, "\\:", ":"));
hydra_report(stdout, "Header: %s\n", header);
hydra_report(stdout, "Value: %s\n", value);
if(add_header(header, value)){
// Success: break the switch and go ahead
optional1 = ptr2;
break;
}
} }
// Error: abort execution // Error: abort execution
hydra_report(stderr, "[ERROR] Out of memory for HTTP headers."); hydra_report(stderr, "[ERROR] Out of memory for HTTP headers.");
@ -656,19 +607,11 @@ void service_http_form(char *ip, int sp, unsigned char options, char *miscptr, F
* - (optional1 + 2) contains the header's name * - (optional1 + 2) contains the header's name
* - ptr contains the header's value * - ptr contains the header's value
*/ */
header = (char *) malloc(strlen(optional1 + 2)); if(add_or_replace_header(optional1 + 2, hydra_strrep(ptr, "\\:", ":"))){
value = (char *) malloc(strlen(ptr));
if(header && value){
strcpy(header, optional1 + 2);
strcpy(value, hydra_strrep(ptr, "\\:", ":"));
hydra_report(stdout, "Header: %s\n", header);
hydra_report(stdout, "Value: %s\n", value);
if(add_or_replace_header(header, value)){
// Success: break the switch and go ahead // Success: break the switch and go ahead
optional1 = ptr2; optional1 = ptr2;
break; break;
} }
}
// Error: abort execution // Error: abort execution
hydra_report(stderr, "[ERROR] Out of memory for HTTP headers."); hydra_report(stderr, "[ERROR] Out of memory for HTTP headers.");
hydra_child_exit(1); hydra_child_exit(1);