From 95ac8fd41a90e2aa8ddb61509160b8281ebb3ff8 Mon Sep 17 00:00:00 2001 From: Nardi Ivan Date: Mon, 23 Aug 2021 14:30:29 +0200 Subject: [PATCH] STUN: fix extraction of Realm attribute While at it, improve detection of Facebook Messenger --- src/lib/protocols/stun.c | 17 ++++++++--------- tests/pcap/stun_facebook.pcapng | Bin 0 -> 13492 bytes tests/result/stun_facebook.pcapng.out | 7 +++++++ 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 tests/pcap/stun_facebook.pcapng create mode 100644 tests/result/stun_facebook.pcapng.out diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c index f89239f7a..2f14639c9 100644 --- a/src/lib/protocols/stun.c +++ b/src/lib/protocols/stun.c @@ -346,17 +346,13 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct * u_int16_t realm_len = ntohs(*((u_int16_t*)&payload[offset+2])); if(flow->host_server_name[0] == '\0') { - u_int j, i = (realm_len > sizeof(flow->host_server_name)) ? sizeof(flow->host_server_name) : realm_len; + u_int i; u_int k = offset+4; - memset(flow->host_server_name, 0, sizeof(flow->host_server_name)); - - for(j=0; jhost_server_name[j] = payload[k++]; - else - break; - } + i = ndpi_min(realm_len, sizeof(flow->host_server_name) - 1); + i = ndpi_min(i, payload_length - k); + memcpy(flow->host_server_name, payload + k, i); + flow->host_server_name[i] = '\0'; #ifdef DEBUG_STUN printf("==> [%s]\n", flow->host_server_name); @@ -368,6 +364,9 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct * } else if(strstr((char*) flow->host_server_name, "whispersystems.org") != NULL) { flow->guessed_host_protocol_id = NDPI_PROTOCOL_SIGNAL; return(NDPI_IS_STUN); + } else if(strstr((char*) flow->host_server_name, "facebook") != NULL) { + flow->guessed_host_protocol_id = NDPI_PROTOCOL_MESSENGER; + return(NDPI_IS_STUN); } } } diff --git a/tests/pcap/stun_facebook.pcapng b/tests/pcap/stun_facebook.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..bb789c71df1aaf67879ab44c6844a1e49a644349 GIT binary patch literal 13492 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 XmK~GBkMV!=n;ZIGoxs|Dz&-vKm;B5` literal 0 HcmV?d00001 diff --git a/tests/result/stun_facebook.pcapng.out b/tests/result/stun_facebook.pcapng.out new file mode 100644 index 000000000..bf7b1dd27 --- /dev/null +++ b/tests/result/stun_facebook.pcapng.out @@ -0,0 +1,7 @@ +Guessed flow protos: 0 + +DPI Packets (UDP): 2 (2.00 pkts/flow) + +Messenger 75 10554 1 + + 1 UDP 192.168.12.169:38123 <-> 31.13.86.54:40003 [proto: 78.157/STUN.Messenger][Encrypted][cat: VoIP/10][40 pkts/6134 bytes <-> 35 pkts/4420 bytes][Goodput ratio: 73/67][10.09 sec][Host: turner.facebook][bytes ratio: 0.162 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 260/331 6004/5997 1040/1126][Pkt Len c2s/s2c min/avg/max/stddev: 70/68 153/126 190/174 31/39][Risk: ** Known protocol on non standard port **][Risk Score: 10][PLAIN TEXT (unauthorized)][Plen Bins: 8,14,9,28,40,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]