Implemented telnet password export

This commit is contained in:
Luca Deri
2019-11-21 19:36:01 +01:00
parent e98b994a39
commit fc82cdfa4a
6 changed files with 41 additions and 9 deletions
+1
View File
@@ -1089,6 +1089,7 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa
fprintf(out, "[< 1 sec]");
if(flow->telnet.username[0] != '\0') fprintf(out, "[Username: %s]", flow->telnet.username);
if(flow->telnet.password[0] != '\0') fprintf(out, "[Password: %s]", flow->telnet.password);
if(flow->host_server_name[0] != '\0') fprintf(out, "[Host: %s]", flow->host_server_name);
if(flow->info[0] != '\0') fprintf(out, "[%s]", flow->info);
+1
View File
@@ -997,6 +997,7 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
}
} else if(is_ndpi_proto(flow, NDPI_PROTOCOL_TELNET)) {
snprintf(flow->telnet.username, sizeof(flow->telnet.username), "%s", flow->ndpi_flow->protos.telnet.username);
snprintf(flow->telnet.password, sizeof(flow->telnet.password), "%s", flow->ndpi_flow->protos.telnet.password);
} else if(is_ndpi_proto(flow, NDPI_PROTOCOL_SSH)) {
snprintf(flow->ssh_tls.client_info, sizeof(flow->ssh_tls.client_info), "%s",
flow->ndpi_flow->protos.ssh.client_signature);
+2 -3
View File
@@ -201,14 +201,13 @@ typedef struct ndpi_flow_info {
} http;
struct {
char username[32];
char username[32], password[32];
} telnet;
void *src_id, *dst_id;
struct ndpi_entropy entropy;
struct ndpi_entropy last_entropy;
struct ndpi_entropy last_entropy;
} ndpi_flow_info_t;
+5 -3
View File
@@ -1234,9 +1234,11 @@ struct ndpi_flow_struct {
} imo;
struct {
u_int8_t username_detected:1, username_found:1, skip_next:1, _pad:5;
u_int8_t username_detected:1, username_found:1,
password_detected:1, password_found:1,
skip_next:1, _pad:3;
u_int8_t character_id;
char username[32];
char username[32], password[32];
} telnet;
struct {
@@ -1255,7 +1257,7 @@ struct ndpi_flow_struct {
} http;
struct {
u_int8_t auth_found;
u_int8_t auth_found:1;
char username[16], password[16];
} ftp_imap_pop_smtp;
+1 -1
View File
@@ -6580,7 +6580,7 @@ u_int8_t ndpi_extra_dissection_possible(struct ndpi_detection_module_struct *ndp
break;
case NDPI_PROTOCOL_TELNET:
if(!flow->protos.telnet.username_detected)
if(!flow->protos.telnet.password_detected)
return(1);
break;
}
+31 -2
View File
@@ -1,8 +1,8 @@
/*
* telnet.c
*
* Copyright (C) 2009-2011 by ipoque GmbH
* Copyright (C) 2011-19 - ntop.org
* Copyright (C) 2009-2011 by ipoque GmbH
*
* This file is part of nDPI, an open source deep packet inspection
* library based on the OpenDPI and PACE technology by ipoque GmbH
@@ -47,6 +47,34 @@ static int search_telnet_again(struct ndpi_detection_module_struct *ndpi_struct,
if(packet->payload_packet_len > 0) {
int i;
if(flow->protos.telnet.username_detected) {
if((!flow->protos.telnet.password_found)
&& (packet->payload_packet_len > 6)) {
if(strncasecmp((char*)packet->payload, "password:", 9) == 0) {
flow->protos.telnet.password_found = 1;
}
return(1);
}
if(packet->payload[0] == '\r') {
if(!flow->protos.telnet.password_found)
return(1);
flow->protos.telnet.password_detected = 1;
flow->protos.telnet.password[flow->protos.telnet.character_id] = '\0';
return(0);
}
for(i=0; i<packet->payload_packet_len; i++) {
if(flow->protos.telnet.character_id < (sizeof(flow->protos.telnet.password)-1))
flow->protos.telnet.password[flow->protos.telnet.character_id++] = packet->payload[i];
}
return(1);
}
if((!flow->protos.telnet.username_found)
&& (packet->payload_packet_len > 6)) {
@@ -60,7 +88,8 @@ static int search_telnet_again(struct ndpi_detection_module_struct *ndpi_struct,
if(packet->payload[0] == '\r') {
flow->protos.telnet.username_detected = 1;
flow->protos.telnet.username[flow->protos.telnet.character_id] = '\0';
return(0);
flow->protos.telnet.character_id = 0;
return(1);
}
for(i=0; i<packet->payload_packet_len; i++) {