Improved HTTP header parsing skipping lines that won't match
This commit is contained in:
+236
-215
@@ -6799,6 +6799,237 @@ u_int32_t ndpi_bytestream_to_ipv4(const u_int8_t *str, u_int16_t max_chars_to_re
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_parse_single_packet_line(struct ndpi_detection_module_struct *ndpi_str, struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &ndpi_str->packet;
|
||||
|
||||
/* First line of a HTTP response parsing. Expected a "HTTP/1.? ???" */
|
||||
if(packet->parsed_lines == 0 && packet->line[0].len >= NDPI_STATICSTRING_LEN("HTTP/1.X 200 ") &&
|
||||
strncasecmp((const char *) packet->line[0].ptr, "HTTP/1.", NDPI_STATICSTRING_LEN("HTTP/1.")) == 0 &&
|
||||
packet->line[0].ptr[NDPI_STATICSTRING_LEN("HTTP/1.X ")] > '0' && /* response code between 000 and 699 */
|
||||
packet->line[0].ptr[NDPI_STATICSTRING_LEN("HTTP/1.X ")] < '6') {
|
||||
packet->http_response.ptr = &packet->line[0].ptr[NDPI_STATICSTRING_LEN("HTTP/1.1 ")];
|
||||
packet->http_response.len = packet->line[0].len - NDPI_STATICSTRING_LEN("HTTP/1.1 ");
|
||||
packet->http_num_headers++;
|
||||
|
||||
/* Set server HTTP response code */
|
||||
if(packet->payload_packet_len >= 12) {
|
||||
char buf[4];
|
||||
|
||||
/* Set server HTTP response code */
|
||||
strncpy(buf, (char *) &packet->payload[9], 3);
|
||||
buf[3] = '\0';
|
||||
|
||||
flow->http.response_status_code = atoi(buf);
|
||||
/* https://en.wikipedia.org/wiki/List_of_HTTP_status_codes */
|
||||
if((flow->http.response_status_code < 100) || (flow->http.response_status_code > 509))
|
||||
flow->http.response_status_code = 0; /* Out of range */
|
||||
}
|
||||
}
|
||||
|
||||
if((packet->parsed_lines == 0) && (packet->line[0].len > 0)) {
|
||||
/*
|
||||
Check if the file contains a : otherwise ignore the line as this
|
||||
line i slike "GET /....
|
||||
*/
|
||||
|
||||
if(strchr((char*)packet->line[0].ptr, ':') == NULL)
|
||||
return;
|
||||
}
|
||||
|
||||
/* "Server:" header line in HTTP response */
|
||||
if(packet->line[packet->parsed_lines].len > NDPI_STATICSTRING_LEN("Server:") + 1 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr,
|
||||
"Server:", NDPI_STATICSTRING_LEN("Server:")) == 0) {
|
||||
// some stupid clients omit a space and place the servername directly after the colon
|
||||
if(packet->line[packet->parsed_lines].ptr[NDPI_STATICSTRING_LEN("Server:")] == ' ') {
|
||||
packet->server_line.ptr =
|
||||
&packet->line[packet->parsed_lines].ptr[NDPI_STATICSTRING_LEN("Server:") + 1];
|
||||
packet->server_line.len =
|
||||
packet->line[packet->parsed_lines].len - (NDPI_STATICSTRING_LEN("Server:") + 1);
|
||||
} else {
|
||||
packet->server_line.ptr = &packet->line[packet->parsed_lines].ptr[NDPI_STATICSTRING_LEN("Server:")];
|
||||
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) {
|
||||
// some stupid clients omit a space and place the hostname directly after the colon
|
||||
if(packet->line[packet->parsed_lines].ptr[5] == ' ') {
|
||||
packet->host_line.ptr = &packet->line[packet->parsed_lines].ptr[6];
|
||||
packet->host_line.len = packet->line[packet->parsed_lines].len - 6;
|
||||
} else {
|
||||
packet->host_line.ptr = &packet->line[packet->parsed_lines].ptr[5];
|
||||
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) {
|
||||
// some stupid clients omit a space and place the hostname directly after the colon
|
||||
if(packet->line[packet->parsed_lines].ptr[16] == ' ') {
|
||||
packet->forwarded_line.ptr = &packet->line[packet->parsed_lines].ptr[17];
|
||||
packet->forwarded_line.len = packet->line[packet->parsed_lines].len - 17;
|
||||
} else {
|
||||
packet->forwarded_line.ptr = &packet->line[packet->parsed_lines].ptr[16];
|
||||
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 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Authorization: ", 15) == 0)) {
|
||||
packet->authorization_line.ptr = &packet->line[packet->parsed_lines].ptr[15];
|
||||
packet->authorization_line.len = packet->line[packet->parsed_lines].len - 15;
|
||||
|
||||
while((packet->authorization_line.len > 0) && (packet->authorization_line.ptr[0] == ' '))
|
||||
packet->authorization_line.len--, packet->authorization_line.ptr++;
|
||||
if(packet->authorization_line.len == 0)
|
||||
packet->authorization_line.ptr = NULL;
|
||||
|
||||
packet->http_num_headers++;
|
||||
} 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) {
|
||||
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) {
|
||||
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:
|
||||
* - https://tools.ietf.org/html/rfc7230
|
||||
* - https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
|
||||
*/
|
||||
if((packet->line[packet->parsed_lines].len > 6 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Date: ", 6) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Vary: ", 6) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "ETag: ", 6) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 8 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Pragma: ", 8) == 0) ||
|
||||
(packet->line[packet->parsed_lines].len > 9 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Expires: ", 9) == 0) ||
|
||||
(packet->line[packet->parsed_lines].len > 12 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Set-Cookie: ", 12) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Keep-Alive: ", 12) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Connection: ", 12) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 15 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Last-Modified: ", 15) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept-Ranges: ", 15) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 17 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept-Language: ", 17) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept-Encoding: ", 17) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 27 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr,
|
||||
"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++;
|
||||
if(packet->content_line.len == 0)
|
||||
packet->content_line.ptr = NULL;;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/* internal function for every detection to parse one packet and to increase the info buffer */
|
||||
void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str, struct ndpi_flow_struct *flow) {
|
||||
u_int32_t a;
|
||||
@@ -6839,221 +7070,8 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
packet->line[packet->parsed_lines].len =
|
||||
(u_int16_t)(((size_t) &packet->payload[a]) - ((size_t) packet->line[packet->parsed_lines].ptr));
|
||||
|
||||
/* First line of a HTTP response parsing. Expected a "HTTP/1.? ???" */
|
||||
if(packet->parsed_lines == 0 && packet->line[0].len >= NDPI_STATICSTRING_LEN("HTTP/1.X 200 ") &&
|
||||
strncasecmp((const char *) packet->line[0].ptr, "HTTP/1.", NDPI_STATICSTRING_LEN("HTTP/1.")) == 0 &&
|
||||
packet->line[0].ptr[NDPI_STATICSTRING_LEN("HTTP/1.X ")] > '0' && /* response code between 000 and 699 */
|
||||
packet->line[0].ptr[NDPI_STATICSTRING_LEN("HTTP/1.X ")] < '6') {
|
||||
packet->http_response.ptr = &packet->line[0].ptr[NDPI_STATICSTRING_LEN("HTTP/1.1 ")];
|
||||
packet->http_response.len = packet->line[0].len - NDPI_STATICSTRING_LEN("HTTP/1.1 ");
|
||||
packet->http_num_headers++;
|
||||
|
||||
/* Set server HTTP response code */
|
||||
if(packet->payload_packet_len >= 12) {
|
||||
char buf[4];
|
||||
|
||||
/* Set server HTTP response code */
|
||||
strncpy(buf, (char *) &packet->payload[9], 3);
|
||||
buf[3] = '\0';
|
||||
|
||||
flow->http.response_status_code = atoi(buf);
|
||||
/* https://en.wikipedia.org/wiki/List_of_HTTP_status_codes */
|
||||
if((flow->http.response_status_code < 100) || (flow->http.response_status_code > 509))
|
||||
flow->http.response_status_code = 0; /* Out of range */
|
||||
}
|
||||
}
|
||||
|
||||
/* "Server:" header line in HTTP response */
|
||||
if(packet->line[packet->parsed_lines].len > NDPI_STATICSTRING_LEN("Server:") + 1 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr,
|
||||
"Server:", NDPI_STATICSTRING_LEN("Server:")) == 0) {
|
||||
// some stupid clients omit a space and place the servername directly after the colon
|
||||
if(packet->line[packet->parsed_lines].ptr[NDPI_STATICSTRING_LEN("Server:")] == ' ') {
|
||||
packet->server_line.ptr =
|
||||
&packet->line[packet->parsed_lines].ptr[NDPI_STATICSTRING_LEN("Server:") + 1];
|
||||
packet->server_line.len =
|
||||
packet->line[packet->parsed_lines].len - (NDPI_STATICSTRING_LEN("Server:") + 1);
|
||||
} else {
|
||||
packet->server_line.ptr = &packet->line[packet->parsed_lines].ptr[NDPI_STATICSTRING_LEN("Server:")];
|
||||
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) {
|
||||
// some stupid clients omit a space and place the hostname directly after the colon
|
||||
if(packet->line[packet->parsed_lines].ptr[5] == ' ') {
|
||||
packet->host_line.ptr = &packet->line[packet->parsed_lines].ptr[6];
|
||||
packet->host_line.len = packet->line[packet->parsed_lines].len - 6;
|
||||
} else {
|
||||
packet->host_line.ptr = &packet->line[packet->parsed_lines].ptr[5];
|
||||
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) {
|
||||
// some stupid clients omit a space and place the hostname directly after the colon
|
||||
if(packet->line[packet->parsed_lines].ptr[16] == ' ') {
|
||||
packet->forwarded_line.ptr = &packet->line[packet->parsed_lines].ptr[17];
|
||||
packet->forwarded_line.len = packet->line[packet->parsed_lines].len - 17;
|
||||
} else {
|
||||
packet->forwarded_line.ptr = &packet->line[packet->parsed_lines].ptr[16];
|
||||
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 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Authorization: ", 15) == 0)) {
|
||||
packet->authorization_line.ptr = &packet->line[packet->parsed_lines].ptr[15];
|
||||
packet->authorization_line.len = packet->line[packet->parsed_lines].len - 15;
|
||||
|
||||
while((packet->authorization_line.len > 0) && (packet->authorization_line.ptr[0] == ' '))
|
||||
packet->authorization_line.len--, packet->authorization_line.ptr++;
|
||||
if(packet->authorization_line.len == 0)
|
||||
packet->authorization_line.ptr = NULL;
|
||||
|
||||
packet->http_num_headers++;
|
||||
} 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) {
|
||||
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) {
|
||||
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:
|
||||
* - https://tools.ietf.org/html/rfc7230
|
||||
* - https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
|
||||
*/
|
||||
if((packet->line[packet->parsed_lines].len > 6 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Date: ", 6) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Vary: ", 6) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "ETag: ", 6) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 8 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Pragma: ", 8) == 0) ||
|
||||
(packet->line[packet->parsed_lines].len > 9 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Expires: ", 9) == 0) ||
|
||||
(packet->line[packet->parsed_lines].len > 12 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Set-Cookie: ", 12) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Keep-Alive: ", 12) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Connection: ", 12) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 15 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Last-Modified: ", 15) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept-Ranges: ", 15) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 17 &&
|
||||
(strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept-Language: ", 17) == 0 ||
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr, "Accept-Encoding: ", 17) == 0)) ||
|
||||
(packet->line[packet->parsed_lines].len > 27 &&
|
||||
strncasecmp((const char *) packet->line[packet->parsed_lines].ptr,
|
||||
"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++;
|
||||
if(packet->content_line.len == 0)
|
||||
packet->content_line.ptr = NULL;;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
ndpi_parse_single_packet_line(ndpi_str, flow);
|
||||
|
||||
if(packet->line[packet->parsed_lines].len == 0) {
|
||||
packet->empty_line_position = a;
|
||||
packet->empty_line_position_set = 1;
|
||||
@@ -7074,6 +7092,8 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
packet->line[packet->parsed_lines].len =
|
||||
(u_int16_t)(((size_t) &packet->payload[packet->payload_packet_len]) -
|
||||
((size_t) packet->line[packet->parsed_lines].ptr));
|
||||
|
||||
ndpi_parse_single_packet_line(ndpi_str, flow);
|
||||
packet->parsed_lines++;
|
||||
}
|
||||
}
|
||||
@@ -9050,6 +9070,7 @@ char *ndpi_hostname_sni_set(struct ndpi_flow_struct *flow,
|
||||
char *ndpi_user_agent_set(struct ndpi_flow_struct *flow,
|
||||
const u_int8_t *value, size_t value_len) {
|
||||
if(flow->http.user_agent != NULL) {
|
||||
/* Already set: ignore double set */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user