From 5918a6542d4640e702516fe92d7d23d5a969c73c Mon Sep 17 00:00:00 2001 From: Toni Date: Tue, 11 May 2021 21:38:26 +0200 Subject: [PATCH] Improved SSL certificate name wildcard handling and risk. #1182 (#1183) Signed-off-by: Toni Uhlig --- src/lib/protocols/tls.c | 16 ++++++++++++++-- tests/pcap/ssl-cert-name-mismatch.pcap | Bin 0 -> 5772 bytes tests/result/ssl-cert-name-mismatch.pcap.out | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 tests/pcap/ssl-cert-name-mismatch.pcap create mode 100644 tests/result/ssl-cert-name-mismatch.pcap.out diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 1fdaf5dee..cb8180166 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -497,8 +497,20 @@ static void processCertificateElements(struct ndpi_detection_module_struct *ndpi if(matched_name == 0) { if(flow->protos.tls_quic_stun.tls_quic.client_requested_server_name[0] == '\0') matched_name = 1; /* No SNI */ - else if((dNSName[0] == '*') && strstr(flow->protos.tls_quic_stun.tls_quic.client_requested_server_name, &dNSName[1])) - matched_name = 1; + else if (dNSName[0] == '*') + { + char * label = strstr(flow->protos.tls_quic_stun.tls_quic.client_requested_server_name, &dNSName[1]); + + if (label != NULL) + { + char * first_dot = strchr(flow->protos.tls_quic_stun.tls_quic.client_requested_server_name, '.'); + + if (first_dot == NULL || first_dot >= label) + { + matched_name = 1; + } + } + } else if(strcmp(flow->protos.tls_quic_stun.tls_quic.client_requested_server_name, dNSName) == 0) matched_name = 1; } diff --git a/tests/pcap/ssl-cert-name-mismatch.pcap b/tests/pcap/ssl-cert-name-mismatch.pcap new file mode 100644 index 0000000000000000000000000000000000000000..9fa488c0adb455f65d364c7e824a228ecac9d861 GIT binary patch literal 5772 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 KACEyF&;K8+d;ZP< literal 0 HcmV?d00001 diff --git a/tests/result/ssl-cert-name-mismatch.pcap.out b/tests/result/ssl-cert-name-mismatch.pcap.out new file mode 100644 index 000000000..88fc96aad --- /dev/null +++ b/tests/result/ssl-cert-name-mismatch.pcap.out @@ -0,0 +1,8 @@ +Google 21 5412 1 + +JA3 Host Stats: + IP Address # JA3C + 1 192.168.2.222 1 + + + 1 TCP 192.168.2.222:54772 <-> 104.154.89.105:443 [proto: 91.126/TLS.Google][cat: Web/5][11 pkts/1136 bytes <-> 10 pkts/4276 bytes][Goodput ratio: 35/84][0.72 sec][ALPN: http/1.1][bytes ratio: -0.580 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 79/48 167/160 64/68][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 103/428 311/1474 70/548][Risk: ** TLS Certificate Mismatch **][TLSv1.2][Client: wrong.host.badssl.com][JA3C: 4e69e4e5627c5e4c2846ba3e64d23fb9][ServerNames: *.badssl.com,badssl.com][JA3S: b898351eb5e266aefd3723d466935494][Issuer: C=US, O=DigiCert Inc, CN=DigiCert SHA2 Secure Server CA][Subject: C=US, ST=California, L=Walnut Creek, O=Lucas Garron Torres, CN=*.badssl.com][Certificate SHA-1: 18:45:B2:16:EF:D0:83:9A:18:51:A9:57:32:5D:A3:36:21:70:49:CB][Validity: 2020-03-23 00:00:00 - 2022-05-17 12:00:00][Cipher: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256][Plen Bins: 12,12,12,0,0,0,0,12,12,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0]