Initial JA3 support (https://github.com/salesforce/ja3) for SSL
This commit is contained in:
+14
-1
@@ -800,10 +800,14 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa
|
||||
flow->dst2src_packets, (long long unsigned int) flow->dst2src_bytes);
|
||||
|
||||
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);
|
||||
|
||||
if(flow->ssh_ssl.client_info[0] != '\0') fprintf(out, "[client: %s]", flow->ssh_ssl.client_info);
|
||||
|
||||
if(flow->ssh_ssl.ja3_client[0] != '\0') fprintf(out, "[JA3C: %s]", flow->ssh_ssl.ja3_client);
|
||||
if(flow->ssh_ssl.server_info[0] != '\0') fprintf(out, "[server: %s]", flow->ssh_ssl.server_info);
|
||||
|
||||
if(flow->ssh_ssl.ja3_server[0] != '\0') fprintf(out, "[JA3S: %s]", flow->ssh_ssl.ja3_server);
|
||||
if(flow->ssh_ssl.server_organization[0] != '\0') fprintf(out, "[organization: %s]", flow->ssh_ssl.server_organization);
|
||||
if(flow->bittorent_hash[0] != '\0') fprintf(out, "[BT Hash: %s]", flow->bittorent_hash);
|
||||
|
||||
@@ -850,6 +854,15 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa
|
||||
if((flow->ssh_ssl.client_info[0] != '\0') || (flow->ssh_ssl.server_info[0] != '\0')) {
|
||||
json_object *sjObj = json_object_new_object();
|
||||
|
||||
if(flow->ssh_ssl.ja3_server[0] != '\0')
|
||||
json_object_object_add(jObj,"ja3s",json_object_new_string(flow->ssh_ssl.ja3_server));
|
||||
|
||||
if(flow->ssh_ssl.ja3_client[0] != '\0')
|
||||
json_object_object_add(jObj,"ja3c",json_object_new_string(flow->ssh_ssl.ja3_client));
|
||||
|
||||
if(flow->ja3_server[0] != '\0')
|
||||
json_object_object_add(jObj,"host.server.ja3",json_object_new_string(flow->ja3_server));
|
||||
|
||||
if(flow->ssh_ssl.client_info[0] != '\0')
|
||||
json_object_object_add(sjObj, "client", json_object_new_string(flow->ssh_ssl.client_info));
|
||||
|
||||
|
||||
+5
-1
@@ -567,7 +567,11 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
snprintf(flow->ssh_ssl.server_info, sizeof(flow->ssh_ssl.server_info), "%s",
|
||||
flow->ndpi_flow->protos.stun_ssl.ssl.server_certificate);
|
||||
snprintf(flow->ssh_ssl.server_organization, sizeof(flow->ssh_ssl.server_organization), "%s",
|
||||
flow->ndpi_flow->protos.stun_ssl.ssl.server_organization);
|
||||
flow->ndpi_flow->protos.stun_ssl.ssl.server_organization);
|
||||
snprintf(flow->ssh_ssl.ja3_client, sizeof(flow->ssh_ssl.ja3_client), "%s",
|
||||
flow->ndpi_flow->protos.stun_ssl.ssl.ja3_client);
|
||||
snprintf(flow->ssh_ssl.ja3_server, sizeof(flow->ssh_ssl.ja3_server), "%s",
|
||||
flow->ndpi_flow->protos.stun_ssl.ssl.ja3_server);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -97,7 +97,8 @@ typedef struct ndpi_flow_info {
|
||||
char bittorent_hash[41];
|
||||
|
||||
struct {
|
||||
char client_info[64], server_info[64], server_organization[64];
|
||||
char client_info[64], server_info[64], server_organization[64],
|
||||
ja3_client[33], ja3_server[33];
|
||||
} ssh_ssl;
|
||||
|
||||
void *src_id, *dst_id;
|
||||
|
||||
Reference in New Issue
Block a user