Added auth failed support with FTP

This commit is contained in:
Luca Deri
2019-11-21 23:31:52 +01:00
parent fc82cdfa4a
commit bdc0719e76
6 changed files with 29 additions and 413 deletions
+3 -2
View File
@@ -972,9 +972,10 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|| /* POP */ is_ndpi_proto(flow, NDPI_PROTOCOL_MAIL_POP)
|| /* SMTP */ is_ndpi_proto(flow, NDPI_PROTOCOL_MAIL_SMTP)) {
if(flow->ndpi_flow->protos.ftp_imap_pop_smtp.username[0] != '\0')
snprintf(flow->info, sizeof(flow->info), "User: %s][Pwd: %s",
snprintf(flow->info, sizeof(flow->info), "User: %s][Pwd: %s%s",
flow->ndpi_flow->protos.ftp_imap_pop_smtp.username,
flow->ndpi_flow->protos.ftp_imap_pop_smtp.password);
flow->ndpi_flow->protos.ftp_imap_pop_smtp.password,
flow->ndpi_flow->protos.ftp_imap_pop_smtp.auth_failed ? "][Auth Failed" : "");
}
/* KERBEROS */
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_KERBEROS)) {
+1 -1
View File
@@ -1257,7 +1257,7 @@ struct ndpi_flow_struct {
} http;
struct {
u_int8_t auth_found:1;
u_int8_t auth_found:1, auth_failed:1, _pad:5;
char username[16], password[16];
} ftp_imap_pop_smtp;
+2
View File
@@ -970,6 +970,7 @@ int ndpi_flow2json(struct ndpi_detection_module_struct *ndpi_struct,
case NDPI_PROTOCOL_TELNET:
ndpi_serialize_start_of_block(serializer, "telnet");
ndpi_serialize_string_string(serializer, "username", flow->protos.telnet.username);
ndpi_serialize_string_string(serializer, "password", flow->protos.telnet.password);
ndpi_serialize_end_of_block(serializer);
break;
@@ -1009,6 +1010,7 @@ int ndpi_flow2json(struct ndpi_detection_module_struct *ndpi_struct,
ndpi_serialize_start_of_block(serializer, "ftp");
ndpi_serialize_string_string(serializer, "user", flow->protos.ftp_imap_pop_smtp.username);
ndpi_serialize_string_string(serializer, "password", flow->protos.ftp_imap_pop_smtp.password);
ndpi_serialize_string_uint32(serializer, "auth_failed", flow->protos.ftp_imap_pop_smtp.auth_failed);
ndpi_serialize_end_of_block(serializer);
break;
+20 -410
View File
@@ -553,411 +553,21 @@ static int ndpi_ftp_control_check_response(struct ndpi_flow_struct *flow,
printf("%s() [%s]\n", __FUNCTION__, payload);
#endif
if(ndpi_match_strprefix(payload, payload_len, "110-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "120-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "125-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "150-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "202-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "211-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "212-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "213-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "214-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "215-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "220-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "221-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "225-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "226-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "227-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "228-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "229-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "230-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "231-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "232-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "250-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "257-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "331-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "332-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "350-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "421-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "425-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "426-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "430-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "434-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "450-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "451-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "452-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "501-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "502-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "503-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "504-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "530-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "532-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "550-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "551-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "552-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "553-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "631-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "632-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "633-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10054-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10060-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10061-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10066-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10068-")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "110 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "120 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "125 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "150 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "202 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "211 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "212 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "213 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "214 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "215 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "220 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "221 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "225 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "226 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "227 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "228 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "229 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "230 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "231 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "232 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "250 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "257 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "331 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "332 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "350 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "421 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "425 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "426 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "430 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "434 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "450 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "451 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "452 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "501 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "502 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "503 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "504 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "530 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "532 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "550 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "551 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "552 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "553 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "631 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "632 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "633 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10054 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10060 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10061 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10066 ")) {
return 1;
}
if(ndpi_match_strprefix(payload, payload_len, "10068 ")) {
return 1;
if(payload_len == 0) return(1);
switch(payload[0]) {
case '1':
case '2':
case '3':
case '6':
return(1);
break;
case '4':
case '5':
flow->protos.ftp_imap_pop_smtp.auth_failed = 1;
return(1);
break;
}
return 0;
@@ -972,8 +582,10 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
/* Check connection over TCP */
if(packet->tcp) {
u_int16_t twentyfive = htons(25);
/* Exclude SMTP, which uses similar commands. */
if(packet->tcp->dest == htons(25) || packet->tcp->source == htons(25)) {
if(packet->tcp->dest == twentyfive || packet->tcp->source == twentyfive) {
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
@@ -988,8 +600,7 @@ 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(flow, packet->payload, payload_len)) {
NDPI_LOG_DBG2(ndpi_struct,
"Possible FTP_CONTROL request detected, we will look further for the response..\n");
@@ -1011,8 +622,7 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
}
/* This is a packet in another direction. Check if we find the proper response. */
if((payload_len > 0)
&& ndpi_ftp_control_check_response(flow, packet->payload, payload_len)) {
if((payload_len > 0) && ndpi_ftp_control_check_response(flow, packet->payload, payload_len)) {
NDPI_LOG_INFO(ndpi_struct, "found FTP_CONTROL\n");
#ifdef FTP_DEBUG
Binary file not shown.
+3
View File
@@ -0,0 +1,3 @@
FTP_CONTROL 18 1700 1
1 TCP [2a00:d40:1:3:192:12:193:11]:44724 <-> [2a00:800:1010::1]:21 [proto: 1/FTP_CONTROL][cat: Download-FileTransfer-FileSharing/7][10 pkts/892 bytes <-> 8 pkts/808 bytes][Goodput ratio: 2.7/13.8][7.24 sec][User: hello][Pwd: ][Auth Failed][bytes ratio: 0.049 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 895.6/1441.8 5304/5318 1756.8/2052.2][Pkt Len c2s/s2c min/avg/max/stddev: 86/86 89.2/101.0 98/126 4.2/15.4][PLAIN TEXT (vsFTPd 3.0.3)]