From c85f2fb0f44f734a34ac905d4e35fcf479f19901 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:41:43 +0200 Subject: [PATCH] TLS: add basic, basic, detection of Encrypted ClientHello (#2053) --- example/ndpiReader.c | 4 +++ example/reader_util.c | 2 ++ example/reader_util.h | 4 +++ src/include/ndpi_typedefs.h | 5 ++++ src/lib/protocols/tls.c | 11 ++++++- tests/cfgs/default/pcap/tls_ech.pcapng | Bin 0 -> 4948 bytes tests/cfgs/default/result/tls_ech.pcapng.out | 30 +++++++++++++++++++ 7 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/cfgs/default/pcap/tls_ech.pcapng create mode 100644 tests/cfgs/default/result/tls_ech.pcapng.out diff --git a/example/ndpiReader.c b/example/ndpiReader.c index dfde22d61..c37c046f8 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -1819,6 +1819,10 @@ static void printFlow(u_int32_t id, struct ndpi_flow_info *flow, u_int16_t threa ndpi_cipher2str(flow->ssh_tls.encrypted_sni.cipher_suite, unknown_cipher)); } + if(flow->ssh_tls.encrypted_ch.version != 0) { + fprintf(out, "[ECH: version 0x%x]", flow->ssh_tls.encrypted_ch.version); + } + if(flow->ssh_tls.sha1_cert_fingerprint_set) { fprintf(out, "[Certificate SHA-1: "); for(i=0; i<20; i++) diff --git a/example/reader_util.c b/example/reader_util.c index b9112b92e..d8c4b23f3 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -1339,6 +1339,8 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl flow->ssh_tls.encrypted_sni.cipher_suite = flow->ndpi_flow->protos.tls_quic.encrypted_sni.cipher_suite; } + flow->ssh_tls.encrypted_ch.version = flow->ndpi_flow->protos.tls_quic.encrypted_ch.version; + if(flow->ndpi_flow->protos.tls_quic.tls_supported_versions) { if((flow->ssh_tls.tls_supported_versions = ndpi_strdup(flow->ndpi_flow->protos.tls_quic.tls_supported_versions)) != NULL) correct_csv_data_field(flow->ssh_tls.tls_supported_versions); diff --git a/example/reader_util.h b/example/reader_util.h index 4dabbc88d..cce243130 100644 --- a/example/reader_util.h +++ b/example/reader_util.h @@ -276,6 +276,10 @@ typedef struct ndpi_flow_info { char *esni; } encrypted_sni; + struct { + u_int16_t version; + } encrypted_ch; + time_t notBefore, notAfter; u_int16_t server_cipher; ndpi_cipher_weakness client_unsafe_cipher, server_unsafe_cipher; diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 08ba99ef0..9844e7400 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1524,6 +1524,11 @@ struct ndpi_flow_struct { u_int16_t cipher_suite; char *esni; } encrypted_sni; + + struct { + u_int16_t version; + } encrypted_ch; + ndpi_cipher_weakness server_unsafe_cipher; } tls_quic; /* Used also by DTLS and POPS/IMAPS/SMTPS/FTPS */ diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 157e57868..b1c97225f 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -1538,7 +1538,9 @@ static void checkExtensions(struct ndpi_detection_module_struct *ndpi_struct, /* Groups */ 1035, 10794, 16696, 23130, 31354, 35466, 51914, /* Ciphers */ - 102, 129, 52243, 52244, 57363, 65279, 65413 + 102, 129, 52243, 52244, 57363, 65279, 65413, + /* ECH */ + 65037 }; size_t const allowed_non_iana_extensions_size = sizeof(allowed_non_iana_extensions) / sizeof(allowed_non_iana_extensions[0]); @@ -2537,6 +2539,13 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct, } } } + } else if(extension_id == 65037 /* ECH: latest drafts */) { +#ifdef DEBUG_TLS + printf("Client TLS: ECH version 0x%x\n", extension_id; +#endif + /* Beginning with draft-08, the version is the same as the code point + for the "encrypted_client_hello" extension. */ + flow->protos.tls_quic.encrypted_ch.version = extension_id; } else if(extension_id == 65445 || /* QUIC transport parameters (drafts version) */ extension_id == 57) { /* QUIC transport parameters (final version) */ u_int16_t s_offset = offset+extension_offset; diff --git a/tests/cfgs/default/pcap/tls_ech.pcapng b/tests/cfgs/default/pcap/tls_ech.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..7c018b266699c4999ea1323eaa8dc239120824ad GIT binary patch literal 4948 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 Wr&56$3b5Zz_x)jTu>V&hWBd=EptDB+ literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/tls_ech.pcapng.out b/tests/cfgs/default/result/tls_ech.pcapng.out new file mode 100644 index 000000000..048bd7323 --- /dev/null +++ b/tests/cfgs/default/result/tls_ech.pcapng.out @@ -0,0 +1,30 @@ +Guessed flow protos: 0 + +DPI Packets (TCP): 6 (6.00 pkts/flow) +Confidence DPI : 1 (flows) +Num dissector calls: 1 (1.00 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/0/0 (insert/search/found) +LRU cache zoom: 0/0/0 (insert/search/found) +LRU cache stun: 0/0/0 (insert/search/found) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 1/1 (search/found) +Automa domain: 1/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 2/2 (search/found) +Patricia risk mask: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia protocols: 0/0 (search/found) + +Cloudflare 10 4226 1 + +JA3 Host Stats: + IP Address # JA3C + 1 2001:b07:a3d:c112:ce16:b409:3d0a:9177 1 + + + 1 TCP [2001:b07:a3d:c112:ce16:b409:3d0a:9177]:47460 <-> [2606:4700::6812:1e4e]:443 [proto: 91.220/TLS.Cloudflare][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 6][cat: Web/5][6 pkts/1172 bytes <-> 4 pkts/3054 bytes][Goodput ratio: 55/88][0.07 sec][Hostname/SNI: performance.radar.cloudflare.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: GREASE;TLSv1.3;TLSv1.2][bytes ratio: -0.445 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/3 13/5 49/7 18/2][Pkt Len c2s/s2c min/avg/max/stddev: 86/86 195/764 670/2260 213/890][TLSv1.3][JA3C: 6820f114cf3b0809ffdcb30cb277848a][JA3S: eb1d94daa7e0344597e756a1fb6e7054][ECH: version 0xfe0d][Chrome][Cipher: TLS_AES_128_GCM_SHA256][Plen Bins: 0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,25,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,0,25]