Update ndpi_main.c for HTTP line parser optimization and cleaning (#1372)
* Update ndpi_main.c HTTP line parser: optimization and cleaning * Update ndpi_main.c
This commit is contained in:
+48
-53
@@ -5831,7 +5831,7 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
packet->server_line.len = packet->line[packet->parsed_lines].len - NDPI_STATICSTRING_LEN("Server:");
|
||||
}
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Host:" header line in HTTP request */
|
||||
if(packet->line[packet->parsed_lines].len > 6 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Host:", 5) == 0) {
|
||||
@@ -5844,7 +5844,7 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
packet->host_line.len = packet->line[packet->parsed_lines].len - 5;
|
||||
}
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "X-Forwarded-For:" header line in HTTP request. Commonly used for HTTP proxies. */
|
||||
if(packet->line[packet->parsed_lines].len > 17 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "X-Forwarded-For:", 16) == 0) {
|
||||
@@ -5857,7 +5857,7 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
packet->forwarded_line.len = packet->line[packet->parsed_lines].len - 16;
|
||||
}
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
|
||||
/* "Authorization:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 15 &&
|
||||
@@ -5869,114 +5869,77 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
packet->authorization_line.len--, packet->authorization_line.ptr++;
|
||||
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
|
||||
/* "Content-Type:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 14 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-Type: ", 14) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-type: ", 14) == 0)) {
|
||||
packet->content_line.ptr = &packet->line[packet->parsed_lines].ptr[14];
|
||||
packet->content_line.len = packet->line[packet->parsed_lines].len - 14;
|
||||
|
||||
while((packet->content_line.len > 0) && (packet->content_line.ptr[0] == ' '))
|
||||
packet->content_line.len--, packet->content_line.ptr++;
|
||||
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
|
||||
/* "Content-Type:" header line in HTTP AGAIN. Probably a bogus response without space after ":" */
|
||||
if((packet->content_line.len == 0) && (packet->line[packet->parsed_lines].len > 13) &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-type:", 13) == 0)) {
|
||||
packet->content_line.ptr = &packet->line[packet->parsed_lines].ptr[13];
|
||||
packet->content_line.len = packet->line[packet->parsed_lines].len - 13;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
|
||||
if(packet->content_line.len > 0) {
|
||||
/* application/json; charset=utf-8 */
|
||||
char separator[] = {';', '\r', '\0'};
|
||||
int i;
|
||||
|
||||
for(i = 0; separator[i] != '\0'; i++) {
|
||||
char *c = memchr((char *) packet->content_line.ptr, separator[i], packet->content_line.len);
|
||||
|
||||
if(c != NULL)
|
||||
packet->content_line.len = c - (char *) packet->content_line.ptr;
|
||||
}
|
||||
}
|
||||
|
||||
} else
|
||||
/* "Accept:" header line in HTTP request. */
|
||||
if(packet->line[packet->parsed_lines].len > 8 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept: ", 8) == 0) {
|
||||
packet->accept_line.ptr = &packet->line[packet->parsed_lines].ptr[8];
|
||||
packet->accept_line.len = packet->line[packet->parsed_lines].len - 8;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Referer:" header line in HTTP request. */
|
||||
if(packet->line[packet->parsed_lines].len > 9 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Referer: ", 9) == 0) {
|
||||
packet->referer_line.ptr = &packet->line[packet->parsed_lines].ptr[9];
|
||||
packet->referer_line.len = packet->line[packet->parsed_lines].len - 9;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "User-Agent:" header line in HTTP request. */
|
||||
if(packet->line[packet->parsed_lines].len > 12 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "User-Agent: ", 12) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "User-agent: ", 12) == 0)) {
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "User-agent: ", 12) == 0) {
|
||||
packet->user_agent_line.ptr = &packet->line[packet->parsed_lines].ptr[12];
|
||||
packet->user_agent_line.len = packet->line[packet->parsed_lines].len - 12;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Content-Encoding:" header line in HTTP response (and request?). */
|
||||
if(packet->line[packet->parsed_lines].len > 18 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-Encoding: ", 18) == 0) {
|
||||
packet->http_encoding.ptr = &packet->line[packet->parsed_lines].ptr[18];
|
||||
packet->http_encoding.len = packet->line[packet->parsed_lines].len - 18;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Transfer-Encoding:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 19 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Transfer-Encoding: ", 19) == 0) {
|
||||
packet->http_transfer_encoding.ptr = &packet->line[packet->parsed_lines].ptr[19];
|
||||
packet->http_transfer_encoding.len = packet->line[packet->parsed_lines].len - 19;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Content-Length:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 16 &&
|
||||
((strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-Length: ", 16) == 0) ||
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "content-length: ", 16) == 0))) {
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "content-length: ", 16) == 0) {
|
||||
packet->http_contentlen.ptr = &packet->line[packet->parsed_lines].ptr[16];
|
||||
packet->http_contentlen.len = packet->line[packet->parsed_lines].len - 16;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Content-Disposition"*/
|
||||
if(packet->line[packet->parsed_lines].len > 21 &&
|
||||
((strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-Disposition: ", 21) == 0))) {
|
||||
packet->content_disposition_line.ptr = &packet->line[packet->parsed_lines].ptr[21];
|
||||
packet->content_disposition_line.len = packet->line[packet->parsed_lines].len - 21;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Cookie:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 8 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Cookie: ", 8) == 0) {
|
||||
packet->http_cookie.ptr = &packet->line[packet->parsed_lines].ptr[8];
|
||||
packet->http_cookie.len = packet->line[packet->parsed_lines].len - 8;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "Origin:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 8 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Origin: ", 8) == 0) {
|
||||
packet->http_origin.ptr = &packet->line[packet->parsed_lines].ptr[8];
|
||||
packet->http_origin.len = packet->line[packet->parsed_lines].len - 8;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* "X-Session-Type:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 16 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "X-Session-Type: ", 16) == 0) {
|
||||
packet->http_x_session_type.ptr = &packet->line[packet->parsed_lines].ptr[16];
|
||||
packet->http_x_session_type.len = packet->line[packet->parsed_lines].len - 16;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
} else
|
||||
/* Identification and counting of other HTTP headers.
|
||||
* We consider the most common headers, but there are many others,
|
||||
* which can be seen at references below:
|
||||
@@ -6006,6 +5969,38 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
"Upgrade-Insecure-Requests: ", 27) == 0)) {
|
||||
/* Just count. In the future, if needed, this if can be splited to parse these headers */
|
||||
packet->http_num_headers++;
|
||||
} else
|
||||
/* "Content-Type:" header line in HTTP. */
|
||||
if(packet->line[packet->parsed_lines].len > 14 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-Type: ", 14) == 0 ) {
|
||||
packet->content_line.ptr = &packet->line[packet->parsed_lines].ptr[14];
|
||||
packet->content_line.len = packet->line[packet->parsed_lines].len - 14;
|
||||
|
||||
while((packet->content_line.len > 0) && (packet->content_line.ptr[0] == ' '))
|
||||
packet->content_line.len--, packet->content_line.ptr++;
|
||||
|
||||
packet->http_num_headers++;
|
||||
} else
|
||||
|
||||
/* "Content-Type:" header line in HTTP AGAIN. Probably a bogus response without space after ":" */
|
||||
if((packet->content_line.len == 0) && (packet->line[packet->parsed_lines].len > 13) &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Content-type:", 13) == 0)) {
|
||||
packet->content_line.ptr = &packet->line[packet->parsed_lines].ptr[13];
|
||||
packet->content_line.len = packet->line[packet->parsed_lines].len - 13;
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
|
||||
if(packet->content_line.len > 0) {
|
||||
/* application/json; charset=utf-8 */
|
||||
char separator[] = {';', '\r', '\0'};
|
||||
int i;
|
||||
|
||||
for(i = 0; separator[i] != '\0'; i++) {
|
||||
char *c = memchr((char *) packet->content_line.ptr, separator[i], packet->content_line.len);
|
||||
|
||||
if(c != NULL)
|
||||
packet->content_line.len = c - (char *) packet->content_line.ptr;
|
||||
}
|
||||
}
|
||||
|
||||
if(packet->line[packet->parsed_lines].len == 0) {
|
||||
|
||||
Reference in New Issue
Block a user