Implemented HASSH (https://github.com/salesforce/hassh)
This commit is contained in:
+226
-18
@@ -2,7 +2,7 @@
|
||||
* ssh.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-18 - ntop.org
|
||||
* Copyright (C) 2011-19 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
@@ -19,7 +19,7 @@
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
@@ -27,12 +27,134 @@
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SSH
|
||||
|
||||
#include "ndpi_api.h"
|
||||
#include "ndpi_md5.h"
|
||||
|
||||
/*
|
||||
HASSH - https://github.com/salesforce/hassh
|
||||
|
||||
https://github.com/salesforce/hassh/blob/master/python/hassh.py
|
||||
|
||||
[server]
|
||||
skex = packet.ssh.kex_algorithms
|
||||
seastc = packet.ssh.encryption_algorithms_server_to_client
|
||||
smastc = packet.ssh.mac_algorithms_server_to_client
|
||||
scastc = packet.ssh.compression_algorithms_server_to_client
|
||||
hasshs_str = ';'.join([skex, seastc, smastc, scastc])
|
||||
|
||||
[client]
|
||||
ckex = packet.ssh.kex_algorithms
|
||||
ceacts = packet.ssh.encryption_algorithms_client_to_server
|
||||
cmacts = packet.ssh.mac_algorithms_client_to_server
|
||||
ccacts = packet.ssh.compression_algorithms_client_to_server
|
||||
hassh_str = ';'.join([ckex, ceacts, cmacts, ccacts])
|
||||
*/
|
||||
|
||||
/* #define SSH_DEBUG 1 */
|
||||
|
||||
/* ************************************************************************ */
|
||||
|
||||
static void ndpi_int_ssh_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow){
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSH, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
/* ************************************************************************ */
|
||||
|
||||
static u_int16_t concat_hash_string(struct ndpi_packet_struct *packet,
|
||||
char *buf, u_int8_t client_hash) {
|
||||
u_int16_t offset = 22, buf_out_len = 0;
|
||||
u_int32_t len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
if(len < (packet->payload_packet_len-offset)) {
|
||||
/* ssh.kex_algorithms [C/S] */
|
||||
offset += 4;
|
||||
strncpy(buf, (const char *)&packet->payload[offset], buf_out_len = len);
|
||||
buf[buf_out_len++] = ';';
|
||||
offset += len;
|
||||
|
||||
/* ssh.server_host_key_algorithms [None] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.encryption_algorithms_client_to_server [C] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
if(client_hash) {
|
||||
offset += 4;
|
||||
strncpy(&buf[buf_out_len], (const char *)&packet->payload[offset], len);
|
||||
buf_out_len += len;
|
||||
buf[buf_out_len++] = ';';
|
||||
offset += len;
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.encryption_algorithms_server_to_client [S] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
if(!client_hash) {
|
||||
offset += 4;
|
||||
strncpy(&buf[buf_out_len], (const char *)&packet->payload[offset], len);
|
||||
buf_out_len += len;
|
||||
buf[buf_out_len++] = ';';
|
||||
offset += len;
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.mac_algorithms_client_to_server [C] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
if(client_hash) {
|
||||
offset += 4;
|
||||
strncpy(&buf[buf_out_len], (const char *)&packet->payload[offset], len);
|
||||
buf_out_len += len;
|
||||
buf[buf_out_len++] = ';';
|
||||
offset += len;
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.mac_algorithms_server_to_client [S] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
if(!client_hash) {
|
||||
offset += 4;
|
||||
strncpy(&buf[buf_out_len], (const char *)&packet->payload[offset], len);
|
||||
buf_out_len += len;
|
||||
buf[buf_out_len++] = ';';
|
||||
offset += len;
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.compression_algorithms_client_to_server [C] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
if(client_hash) {
|
||||
offset += 4;
|
||||
strncpy(&buf[buf_out_len], (const char *)&packet->payload[offset], len);
|
||||
buf_out_len += len;
|
||||
offset += len;
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.compression_algorithms_server_to_client [S] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
if(!client_hash) {
|
||||
offset += 4;
|
||||
strncpy(&buf[buf_out_len], (const char *)&packet->payload[offset], len);
|
||||
buf_out_len += len;
|
||||
offset += len;
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
/* ssh.languages_client_to_server [None] */
|
||||
|
||||
/* ssh.languages_server_to_client [None] */
|
||||
}
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
printf("\n[SSH] %s\n", buf);
|
||||
#endif
|
||||
|
||||
return(buf_out_len);
|
||||
}
|
||||
|
||||
/* ************************************************************************ */
|
||||
|
||||
static void ndpi_ssh_zap_cr(char *str, int len) {
|
||||
len--;
|
||||
|
||||
@@ -45,46 +167,132 @@ static void ndpi_ssh_zap_cr(char *str, int len) {
|
||||
}
|
||||
}
|
||||
|
||||
void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
/* ************************************************************************ */
|
||||
|
||||
if (flow->l4.tcp.ssh_stage == 0) {
|
||||
if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
|
||||
void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
printf("\n[SSH] [stage: %u]\n", flow->l4.tcp.ssh_stage);
|
||||
#endif
|
||||
|
||||
if(flow->l4.tcp.ssh_stage == 0) {
|
||||
if(packet->payload_packet_len > 7 && packet->payload_packet_len < 100
|
||||
&& memcmp(packet->payload, "SSH-", 4) == 0) {
|
||||
if(!ndpi_struct->disable_metadata_export) {
|
||||
int len = ndpi_min(sizeof(flow->protos.ssh.client_signature)-1, packet->payload_packet_len);
|
||||
int len = ndpi_min(sizeof(flow->protos.ssh.client_signature)-1, packet->payload_packet_len);
|
||||
|
||||
strncpy(flow->protos.ssh.client_signature, (const char *)packet->payload, len);
|
||||
flow->protos.ssh.client_signature[len] = '\0';
|
||||
ndpi_ssh_zap_cr(flow->protos.ssh.client_signature, len);
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
printf("\n[SSH] [client_signature: %s]\n", flow->protos.ssh.client_signature);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
NDPI_LOG_DBG2(ndpi_struct, "ssh stage 0 passed\n");
|
||||
flow->l4.tcp.ssh_stage = 1 + packet->packet_direction;
|
||||
flow->guessed_host_protocol_id = flow->guessed_protocol_id = NDPI_PROTOCOL_SSH;
|
||||
return;
|
||||
}
|
||||
} else if (flow->l4.tcp.ssh_stage == (2 - packet->packet_direction)) {
|
||||
if (packet->payload_packet_len > 7 && packet->payload_packet_len < 500
|
||||
} else if(flow->l4.tcp.ssh_stage == (2 - packet->packet_direction)) {
|
||||
if(packet->payload_packet_len > 7 && packet->payload_packet_len < 500
|
||||
&& memcmp(packet->payload, "SSH-", 4) == 0) {
|
||||
if(!ndpi_struct->disable_metadata_export) {
|
||||
int len = ndpi_min(sizeof(flow->protos.ssh.server_signature)-1, packet->payload_packet_len);
|
||||
|
||||
strncpy(flow->protos.ssh.server_signature, (const char *)packet->payload, len);
|
||||
flow->protos.ssh.server_signature[len] = '\0';
|
||||
ndpi_ssh_zap_cr(flow->protos.ssh.server_signature, len);
|
||||
}
|
||||
|
||||
NDPI_LOG_INFO(ndpi_struct, "found ssh\n");
|
||||
|
||||
ndpi_int_ssh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
printf("\n[SSH] [server_signature: %s]\n", flow->protos.ssh.server_signature);
|
||||
#endif
|
||||
|
||||
NDPI_LOG_DBG2(ndpi_struct, "ssh stage 1 passed\n");
|
||||
flow->l4.tcp.ssh_stage++;;
|
||||
flow->guessed_host_protocol_id = flow->guessed_protocol_id = NDPI_PROTOCOL_SSH;
|
||||
} else {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found ssh\n");
|
||||
ndpi_int_ssh_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
printf("\n[SSH] [completed stage: %u]\n", flow->l4.tcp.ssh_stage);
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
u_int8_t msgcode = *(packet->payload + 5);
|
||||
ndpi_MD5_CTX ctx;
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
printf("\n[SSH] [stage: %u][msg: %u]\n", flow->l4.tcp.ssh_stage, msgcode);
|
||||
#endif
|
||||
|
||||
if(msgcode == 20 /* key exchange init */) {
|
||||
char *hassh_buf = calloc(packet->payload_packet_len, sizeof(char));
|
||||
u_int i, len;
|
||||
|
||||
if(hassh_buf) {
|
||||
if(flow->l4.tcp.ssh_stage == 3) {
|
||||
u_char fingerprint_client[16];
|
||||
|
||||
len = concat_hash_string(packet, hassh_buf, 1 /* client */);
|
||||
|
||||
ndpi_MD5Init(&ctx);
|
||||
ndpi_MD5Update(&ctx, (const unsigned char *)hassh_buf, len);
|
||||
ndpi_MD5Final(fingerprint_client, &ctx);
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
{
|
||||
printf("\n[SSH] [client][%s][", hassh_buf);
|
||||
for(i=0; i<16; i++) printf("%02X", fingerprint_client[i]);
|
||||
printf("]\n");
|
||||
}
|
||||
#endif
|
||||
for(i=0; i<16; i++) sprintf(&flow->protos.ssh.hassh_client[i*2], "%02X", fingerprint_client[i] & 0xFF);
|
||||
flow->protos.ssh.hassh_client[32] = '\0';
|
||||
} else {
|
||||
u_char fingerprint_server[16];
|
||||
|
||||
len = concat_hash_string(packet, hassh_buf, 0 /* server */);
|
||||
|
||||
ndpi_MD5Init(&ctx);
|
||||
ndpi_MD5Update(&ctx, (const unsigned char *)hassh_buf, len);
|
||||
ndpi_MD5Final(fingerprint_server, &ctx);
|
||||
|
||||
#ifdef SSH_DEBUG
|
||||
{
|
||||
printf("\n[SSH] [server][%s][", hassh_buf);
|
||||
for(i=0; i<16; i++) printf("%02X", fingerprint_server[i]);
|
||||
printf("]\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
for(i=0; i<16; i++) sprintf(&flow->protos.ssh.hassh_server[i*2], "%02X", fingerprint_server[i] & 0xFF);
|
||||
flow->protos.ssh.hassh_server[32] = '\0';
|
||||
}
|
||||
|
||||
free(hassh_buf);
|
||||
}
|
||||
}
|
||||
|
||||
if(flow->l4.tcp.ssh_stage++ == 4) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found ssh\n");
|
||||
ndpi_int_ssh_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "excluding ssh at stage %d\n", flow->l4.tcp.ssh_stage);
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSH);
|
||||
}
|
||||
|
||||
/* ************************************************************************ */
|
||||
|
||||
void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user