Added new risk for clear text credentials
This commit is contained in:
@@ -105,6 +105,7 @@ typedef enum {
|
||||
NDPI_TLS_SUSPICIOUS_EXTENSION,
|
||||
NDPI_TLS_FATAL_ALERT,
|
||||
NDPI_SUSPICIOUS_ENTROPY,
|
||||
NDPI_CLEAR_TEXT_CREDENTIALS,
|
||||
|
||||
/* Leave this as last member */
|
||||
NDPI_MAX_RISK /* must be <= 63 due to (**) */
|
||||
@@ -898,6 +899,7 @@ struct ndpi_packet_struct {
|
||||
struct ndpi_int_one_line_struct content_line;
|
||||
struct ndpi_int_one_line_struct content_disposition_line;
|
||||
struct ndpi_int_one_line_struct accept_line;
|
||||
struct ndpi_int_one_line_struct authorization_line;
|
||||
struct ndpi_int_one_line_struct user_agent_line;
|
||||
struct ndpi_int_one_line_struct http_url_name;
|
||||
struct ndpi_int_one_line_struct http_encoding;
|
||||
|
||||
@@ -106,6 +106,7 @@ static ndpi_risk_info ndpi_known_risks[] = {
|
||||
{ NDPI_TLS_SUSPICIOUS_EXTENSION, NDPI_RISK_HIGH, CLIENT_HIGH_RISK_PERCENTAGE },
|
||||
{ NDPI_TLS_FATAL_ALERT, NDPI_RISK_LOW, CLIENT_FAIR_RISK_PERCENTAGE },
|
||||
{ NDPI_SUSPICIOUS_ENTROPY, NDPI_RISK_MEDIUM, CLIENT_FAIR_RISK_PERCENTAGE },
|
||||
{ NDPI_CLEAR_TEXT_CREDENTIALS, NDPI_RISK_HIGH, CLIENT_HIGH_RISK_PERCENTAGE },
|
||||
|
||||
/* Leave this as last member */
|
||||
{ NDPI_MAX_RISK, NDPI_RISK_LOW, CLIENT_FAIR_RISK_PERCENTAGE }
|
||||
@@ -5166,6 +5167,7 @@ void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_str,
|
||||
static void ndpi_reset_packet_line_info(struct ndpi_packet_struct *packet) {
|
||||
packet->parsed_lines = 0, packet->empty_line_position_set = 0, packet->host_line.ptr = NULL,
|
||||
packet->host_line.len = 0, packet->referer_line.ptr = NULL, packet->referer_line.len = 0,
|
||||
packet->authorization_line.len = 0,
|
||||
packet->content_line.ptr = NULL, packet->content_line.len = 0, packet->accept_line.ptr = NULL,
|
||||
packet->accept_line.len = 0, packet->user_agent_line.ptr = NULL, packet->user_agent_line.len = 0,
|
||||
packet->http_url_name.ptr = NULL, packet->http_url_name.len = 0, packet->http_encoding.ptr = NULL,
|
||||
@@ -5894,6 +5896,19 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
}
|
||||
packet->http_num_headers++;
|
||||
}
|
||||
|
||||
/* "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++;
|
||||
|
||||
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 ||
|
||||
@@ -5906,6 +5921,7 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
|
||||
|
||||
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)) {
|
||||
|
||||
@@ -1783,6 +1783,9 @@ const char* ndpi_risk2str(ndpi_risk_enum risk) {
|
||||
case NDPI_SUSPICIOUS_ENTROPY:
|
||||
return("Suspicious entropy");
|
||||
|
||||
case NDPI_CLEAR_TEXT_CREDENTIALS:
|
||||
return("Clear-text credentials");
|
||||
|
||||
default:
|
||||
snprintf(buf, sizeof(buf), "%d", (int)risk);
|
||||
return(buf);
|
||||
|
||||
@@ -41,7 +41,8 @@ static void ndpi_int_ftp_control_add_connection(struct ndpi_detection_module_str
|
||||
|
||||
/* *************************************************************** */
|
||||
|
||||
static int ndpi_ftp_control_check_request(struct ndpi_flow_struct *flow,
|
||||
static int ndpi_ftp_control_check_request(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
const u_int8_t *payload,
|
||||
size_t payload_len) {
|
||||
#ifdef FTP_DEBUG
|
||||
@@ -52,6 +53,7 @@ static int ndpi_ftp_control_check_request(struct ndpi_flow_struct *flow,
|
||||
ndpi_user_pwd_payload_copy((u_int8_t*)flow->protos.ftp_imap_pop_smtp.username,
|
||||
sizeof(flow->protos.ftp_imap_pop_smtp.username), 5,
|
||||
payload, payload_len);
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -602,7 +604,8 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
|
||||
if(flow->ftp_control_stage == 0) {
|
||||
NDPI_LOG_DBG2(ndpi_struct, "FTP_CONTROL stage 0: \n");
|
||||
|
||||
if((payload_len > 0) && ndpi_ftp_control_check_request(flow, packet->payload, payload_len)) {
|
||||
if((payload_len > 0) && ndpi_ftp_control_check_request(ndpi_struct,
|
||||
flow, packet->payload, payload_len)) {
|
||||
NDPI_LOG_DBG2(ndpi_struct,
|
||||
"Possible FTP_CONTROL request detected, we will look further for the response..\n");
|
||||
|
||||
|
||||
@@ -625,6 +625,13 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
}
|
||||
}
|
||||
|
||||
/* check for authorization line */
|
||||
if(packet->authorization_line.ptr != NULL) {
|
||||
NDPI_LOG_DBG2(ndpi_struct, "Authorization line found %.*s\n",
|
||||
packet->authorization_line.len, packet->authorization_line.ptr);
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
}
|
||||
|
||||
if(packet->content_line.ptr != NULL && packet->content_line.len != 0) {
|
||||
NDPI_LOG_DBG2(ndpi_struct, "Content Type line found %.*s\n",
|
||||
packet->content_line.len, packet->content_line.ptr);
|
||||
|
||||
@@ -162,6 +162,8 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
/* xxxx LOGIN "username" "password" */
|
||||
char str[256], *item;
|
||||
u_int len = packet->payload_packet_len >= sizeof(str) ? sizeof(str)-1 : packet->payload_packet_len;
|
||||
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
|
||||
strncpy(str, (const char*)packet->payload, len);
|
||||
str[len] = '\0';
|
||||
|
||||
@@ -80,7 +80,8 @@ static int ndpi_int_mail_pop_check_for_client_commands(struct ndpi_detection_mod
|
||||
ndpi_user_pwd_payload_copy((u_int8_t*)flow->protos.ftp_imap_pop_smtp.username,
|
||||
sizeof(flow->protos.ftp_imap_pop_smtp.username), 5,
|
||||
packet->payload, packet->payload_packet_len);
|
||||
|
||||
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
flow->l4.tcp.pop_command_bitmask |= POP_BIT_USER;
|
||||
return 1;
|
||||
} else if((packet->payload[0] == 'P' || packet->payload[0] == 'p')
|
||||
@@ -90,7 +91,8 @@ static int ndpi_int_mail_pop_check_for_client_commands(struct ndpi_detection_mod
|
||||
ndpi_user_pwd_payload_copy((u_int8_t*)flow->protos.ftp_imap_pop_smtp.password,
|
||||
sizeof(flow->protos.ftp_imap_pop_smtp.password), 5,
|
||||
packet->payload, packet->payload_packet_len);
|
||||
|
||||
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
flow->l4.tcp.pop_command_bitmask |= POP_BIT_PASS;
|
||||
return 1;
|
||||
} else if((packet->payload[0] == 'C' || packet->payload[0] == 'c')
|
||||
|
||||
@@ -187,6 +187,8 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
ndpi_free(out);
|
||||
}
|
||||
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
} else if(flow->protos.ftp_imap_pop_smtp.password[0] == '\0') {
|
||||
/* Password */
|
||||
u_int8_t buf[48];
|
||||
@@ -210,6 +212,8 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
ndpi_free(out);
|
||||
}
|
||||
|
||||
ndpi_set_risk(ndpi_struct, flow, NDPI_CLEAR_TEXT_CREDENTIALS);
|
||||
} else {
|
||||
flow->host_server_name[0] = '\0';
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
|
||||
Reference in New Issue
Block a user