From 6966e0d19b389f78c97f55ab3b2318a5cda41e08 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Wed, 11 Sep 2019 17:13:49 +0200 Subject: [PATCH] Added STUN check to avoid false positives Added fingerprint comments in SSH/TLS Added netflow test pcap --- src/lib/protocols/ssh.c | 9 +++++++-- src/lib/protocols/stun.c | 4 +++- src/lib/protocols/tls.c | 13 +++++++++++++ tests/pcap/netflowv9.pcap | Bin 0 -> 14072 bytes tests/result/netflowv9.pcap.out | 3 +++ 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 tests/pcap/netflowv9.pcap create mode 100644 tests/result/netflowv9.pcap.out diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c index de3b93bc2..5dd6fb0e5 100644 --- a/src/lib/protocols/ssh.c +++ b/src/lib/protocols/ssh.c @@ -39,14 +39,19 @@ 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]) + 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]) + hassh_str = ';'.join([ckex, ceacts, cmacts, ccacts]) + + NOTE + THe ECDSA key fingerprint is SHA256 -> ssh.kex.h_sig (wireshark) + is in the Message Code: Diffie-Hellman Key Exchange Reply (31) + that usually is packet 14 */ /* #define SSH_DEBUG 1 */ diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c index f8e360c3f..0ab3ed805 100644 --- a/src/lib/protocols/stun.c +++ b/src/lib/protocols/stun.c @@ -140,7 +140,9 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct * *is_whatsapp = 0, *is_messenger = 0, *is_duo = 0; - if(payload_length < sizeof(struct stun_packet_header)) { + if(payload_length >= 512) { + return(NDPI_IS_NOT_STUN); + } else if(payload_length < sizeof(struct stun_packet_header)) { /* This looks like an invalid packet */ if(flow->protos.stun_ssl.stun.num_udp_pkts > 0) { diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 3e0e295c5..5c8e2b18b 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -30,6 +30,19 @@ // #define DEBUG_TLS 1 +/* + NOTE + + How to view the certificate fingerprint + 1. Using wireshark save the certificate on certificate.bin file as explained + in https://security.stackexchange.com/questions/123851/how-can-i-extract-the-certificate-from-this-pcap-file + + 2. openssl x509 -inform der -in certificate.bin -text > certificate.der + 3. openssl x509 -noout -fingerprint -sha1 -inform pem -in certificate.der + SHA1 Fingerprint=15:9A:76.... + + */ + #define NDPI_MAX_TLS_REQUEST_SIZE 10000 /* skype.c */ diff --git a/tests/pcap/netflowv9.pcap b/tests/pcap/netflowv9.pcap new file mode 100644 index 0000000000000000000000000000000000000000..e9f34db4256b6d19716c0d898fa9fbf887af9eee GIT binary patch literal 14072 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 Od5>R5B+DvZCH*h4tD 192.168.2.222:2057 [proto: 128/NetFlow][cat: Network/14][10 pkts/13888 bytes -> 0 pkts/0 bytes][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 0.0/0.0 0/0 0.0/0.0][Pkt Len c2s/s2c min/avg/max/stddev: 1362/0 1388.8/0.0 1418/0 23.1/0.0]