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

fix option parsing

Browse source
This commit is contained in:
vanhauser-thc 2022-05-05 12:45:47 +02:00
parent 7591dcc60b
commit 63e2836e91
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
hydra-http-form.c
View file

@ -404,7 +404,7 @@ int32_t parse_options(char *miscptr, ptr_header_node *ptr_head) {
* Beware of the backslashes (\)! * Beware of the backslashes (\)!
*/ */
while (*miscptr != 0) { while (*miscptr != 0) {
if (strlen(miscptr) < 3 || miscptr[1] != '=') { if (strlen(miscptr) < 2 || miscptr[1] != '=') {
hydra_report(stderr, "[ERROR] optional parameters must have the format X=value: %s\n", miscptr); hydra_report(stderr, "[ERROR] optional parameters must have the format X=value: %s\n", miscptr);
return 0; return 0;
} }
@ -444,6 +444,11 @@ int32_t parse_options(char *miscptr, ptr_header_node *ptr_head) {
break; break;
case '2': case '2':
code_302_is_success = 1; code_302_is_success = 1;
char *tmp = strchr(miscptr, ':');
if (tmp)
miscptr = tmp + 1;
else
miscptr += strlen(miscptr);
break; break;
case 'g': // fall through case 'g': // fall through
case 'G': case 'G':
@ -1281,8 +1286,7 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
ptr = ptr2 = NULL; ptr = ptr2 = NULL;
sprintf(bufferurl, "%.6096s", miscptr); sprintf(bufferurl, "%.6096s", miscptr);
url = bufferurl; ptr = url = bufferurl;
ptr = url;
while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\')) while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\'))
ptr++; ptr++;
@ -1295,15 +1299,19 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
if (*ptr != 0) if (*ptr != 0)
*ptr++ = 0; *ptr++ = 0;
cond = ptr; optional1 = cond = ptr;
if ((ptr2 = strchr(ptr, ':')) != NULL) { ptr2 = ptr + strlen(ptr);
while (ptr2 > ptr && (*ptr2 != ':' || *(ptr2 - 1) == '\\'))
ptr2--;
if (*ptr2 == ':') {
*ptr2++ = 0; *ptr2++ = 0;
if (*ptr2) cond = ptr2;
optional1 = ptr2; }
else
optional1 = NULL; if (optional1 == cond)
} else
optional1 = NULL; optional1 = NULL;
if (strstr(url, "\\:") != NULL) { if (strstr(url, "\\:") != NULL) {
@ -1325,9 +1333,7 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
} }
} }
// printf("ptr: %s ptr2: %s cond: %s url: %s variables: %s optional1: // printf("ptr: %s ptr2: %s cond: %s url: %s variables: %s optional1: %s\n", ptr, ptr2, cond, url, variables, optional1 == NULL ? "null" : optional1);
// %s\n", ptr, ptr2, cond, url, variables, optional1 == NULL ? "null" :
// optional1);
if (url == NULL || variables == NULL || cond == NULL /*|| optional1 == NULL */) if (url == NULL || variables == NULL || cond == NULL /*|| optional1 == NULL */)
hydra_child_exit(2); hydra_child_exit(2);
@ -1351,8 +1357,7 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
success_cond = 0; success_cond = 0;
} }
// printf("miscptr: %s, url=%s, variables=%s, ptr=%s, optional1: %s, cond: %s // printf("miscptr: %s, url=%s, variables=%s, ptr=%s, optional1: %s, cond: %s (%d)\n", miscptr, url, variables, ptr, optional1, cond, success_cond);
// (%d)\n", miscptr, url, variables, ptr, optional1, cond, success_cond);
/* /*
* Parse the user-supplied options. * Parse the user-supplied options.