From de24206adccf2347addc05d6d62b3bf743fef411 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:19:44 +0100 Subject: [PATCH] POP3: improve detection (#1856) --- src/lib/protocols/mail_pop.c | 2 +- tests/pcap/pop3.pcap | Bin 4435 -> 36176 bytes tests/result/pop3.pcap.out | 21 +++++++++++++-------- tests/result/pop3_stls.pcap.out | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/lib/protocols/mail_pop.c b/src/lib/protocols/mail_pop.c index cbcc65a5b..16190fd15 100644 --- a/src/lib/protocols/mail_pop.c +++ b/src/lib/protocols/mail_pop.c @@ -206,7 +206,7 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct if(flow->l4.tcp.mail_pop_stage > 0) { if((flow->l4.tcp.ftp_imap_pop_smtp.password[0] != '\0') - || (flow->l4.tcp.mail_pop_stage > 3)) { + || (flow->l4.tcp.mail_pop_stage >= 3)) { ndpi_int_mail_pop_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_POP); if(flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0') popInitExtraPacketProcessing(flow); diff --git a/tests/pcap/pop3.pcap b/tests/pcap/pop3.pcap index fef58f4e9225d5b258411584629bdfa552d01ad0..54e1ce5b9e2c3d26e30d3a42ff69208948d92321 100644 GIT binary patch literal 36176 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Ξ8mbpwso=inu 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 L^_RfrYI68*ukX`7 delta 532 zcmXw#ze_?<6vxkdzUR9tul!XF4q4#R&@G~xf@bN*QyQ8?X$S(L2#OX34I&UkZy7~c z);}O=NYK_04S`V5&>+!LP(wjWi=BIP zKkL@!u?ZsR2ozeAY#VuJ13-)@QG#m;abG|*6i&jBP@$+M>Aiq&GS5}cc5$?RV1W2g zR|ux+4iKxhuqmB)gcKf3iHPnOpSC1LT$dP;+w&SXa~L}fxgdhEh^Q!j@uf{OsmAlz za7Hf^6eP%*emiG*bp2Zjh^i3~S^GE%_xm;wP5Tmor-UHm%LZqA7@sI%>8fFw5>j;y zGI%dTwMN+*MQ%~0nJ32CA;!*L@kG!OC1~jA<{a|`zY^s7Zf7UT4Gn6G&TpOUIV7^v zZf?p=>5v@~crZZ+U)&bOu2Aii^l(tX#ONlVK17r9fq}%fGKWT@tT>t<8 diff --git a/tests/result/pop3.pcap.out b/tests/result/pop3.pcap.out index 3842932b3..f276fa6a8 100644 --- a/tests/result/pop3.pcap.out +++ b/tests/result/pop3.pcap.out @@ -1,8 +1,8 @@ -Guessed flow protos: 0 +Guessed flow protos: 2 -DPI Packets (TCP): 10 (10.00 pkts/flow) -Confidence DPI : 1 (flows) -Num dissector calls: 169 (169.00 diss/flow) +DPI Packets (TCP): 83 (13.83 pkts/flow) +Confidence DPI : 6 (flows) +Num dissector calls: 1098 (183.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) @@ -16,10 +16,15 @@ Automa domain: 0/0 (search/found) Automa tls cert: 0/0 (search/found) Automa risk mask: 0/0 (search/found) Automa common alpns: 0/0 (search/found) -Patricia risk mask: 2/0 (search/found) +Patricia risk mask: 14/0 (search/found) Patricia risk: 2/0 (search/found) -Patricia protocols: 2/0 (search/found) +Patricia protocols: 14/0 (search/found) -POP3 31 3915 1 +POP3 144 31172 6 - 1 TCP 143.225.229.181:35287 <-> 74.208.5.28:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][18 pkts/1269 bytes <-> 13 pkts/2646 bytes][Goodput ratio: 6/67][27.32 sec][User: cicciopernacchio@mail.com][Pwd: pippozzo][bytes ratio: -0.352 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 1792/2973 5526/5668 2204/2427][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 70/204 98/1514 8/379][Risk: ** Unsafe Protocol **** Clear-Text Credentials **][Risk Score: 110][Risk Info: Found username (cicciopernacchio@mail.com)][PLAIN TEXT (OK POP server ready H migmxus)][Plen Bins: 60,20,13,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,6,0,0] + 1 TCP 192.168.0.4:26383 <-> 212.227.15.166:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][22 pkts/1338 bytes <-> 30 pkts/21359 bytes][Goodput ratio: 10/92][1.26 sec][bytes ratio: -0.882 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 59/41 97/111 37/39][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 61/712 120/1514 14/680][Risk: ** Unsafe Protocol **][Risk Score: 10][PLAIN TEXT (OK POP server ready H mimap)][Plen Bins: 47,5,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,30,0,0] + 2 TCP 143.225.229.181:35287 <-> 74.208.5.28:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][18 pkts/1269 bytes <-> 13 pkts/2646 bytes][Goodput ratio: 6/67][27.32 sec][User: cicciopernacchio@mail.com][Pwd: pippozzo][bytes ratio: -0.352 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 1792/2973 5526/5668 2204/2427][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 70/204 98/1514 8/379][Risk: ** Unsafe Protocol **** Clear-Text Credentials **][Risk Score: 110][Risk Info: Found username (cicciopernacchio@mail.com)][PLAIN TEXT (OK POP server ready H migmxus)][Plen Bins: 60,20,13,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,6,0,0] + 3 TCP 192.168.0.4:26308 <-> 212.227.15.166:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][9 pkts/594 bytes <-> 10 pkts/881 bytes][Goodput ratio: 16/34][0.59 sec][bytes ratio: -0.195 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 29/0 64/64 81/88 18/29][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 66/88 120/145 20/32][Risk: ** Unsafe Protocol **][Risk Score: 10][PLAIN TEXT (OK POP server ready H mimap)][Plen Bins: 63,9,27,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,0,0] + 4 TCP 192.168.0.4:26284 <-> 212.227.15.166:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][9 pkts/596 bytes <-> 9 pkts/735 bytes][Goodput ratio: 14/28][3.52 sec][bytes ratio: -0.104 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 33/1 484/65 2995/98 1025/32][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 66/82 116/145 18/27][Risk: ** Unsafe Protocol **][Risk Score: 10][PLAIN TEXT (OK POP server ready H mimap)][Plen Bins: 66,22,11,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,0,0] + 5 TCP 192.168.0.4:26272 <-> 212.227.15.166:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][6 pkts/348 bytes <-> 6 pkts/529 bytes][Goodput ratio: 3/33][0.21 sec][bytes ratio: -0.206 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/1 40/32 65/48 24/22][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 58/88 66/145 4/31][Risk: ** Unsafe Protocol **][Risk Score: 10][PLAIN TEXT (OK POP server ready H mimap)][Plen Bins: 60,20,20,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,0,0] + 6 TCP 192.168.0.4:26304 <-> 212.227.15.166:110 [proto: 2/POP3][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Email/3][6 pkts/348 bytes <-> 6 pkts/529 bytes][Goodput ratio: 3/33][0.25 sec][bytes ratio: -0.206 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/1 44/43 73/81 27/33][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 58/88 66/145 4/31][Risk: ** Unsafe Protocol **][Risk Score: 10][PLAIN TEXT (OK POP server ready H mimap)][Plen Bins: 60,20,20,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,0,0] diff --git a/tests/result/pop3_stls.pcap.out b/tests/result/pop3_stls.pcap.out index b7ce73eb4..45750256a 100644 --- a/tests/result/pop3_stls.pcap.out +++ b/tests/result/pop3_stls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 18 (18.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 219 (219.00 diss/flow) +Num dissector calls: 185 (185.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) @@ -27,4 +27,4 @@ JA3 Host Stats: 1 192.168.20.18 1 - 1 TCP 192.168.20.18:50583 <-> 72.249.41.52:110 [proto: 23/POPS][IP: 0/Unknown][Encrypted][Confidence: DPI][cat: Email/3][23 pkts/2059 bytes <-> 30 pkts/9130 bytes][Goodput ratio: 39/82][5.43 sec][Hostname/SNI: pop.lavabit.com][bytes ratio: -0.632 (Download)][IAT c2s/s2c min/avg/max/stddev: 6/0 273/202 2072/2002 508/432][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 90/304 368/1514 69/480][Risk: ** Known Proto on Non Std Port **** Obsolete TLS (v1.1 or older) **][Risk Score: 150][Risk Info: Expected on port 995 / TLSv1][TLSv1][JA3C: 207409c2b30e670ca50e1eac016a4831][ServerNames: *.lavabit.com,lavabit.com][JA3S: 6b96cf9c27b0223177b0e9f135fe4899 (INSECURE)][Issuer: C=US, ST=Arizona, L=Scottsdale, O=GoDaddy.com, Inc., OU=http://certificates.godaddy.com/repository, CN=Go Daddy Secure Certification Authority][Subject: O=*.lavabit.com, OU=Domain Control Validated, CN=*.lavabit.com][Certificate SHA-1: 1D:14:60:3D:5E:0F:A2:EB:61:C5:27:F8:A4:26:80:B3:E5:BB:A2:B2][Validity: 2012-02-17 04:07:46 - 2017-02-17 04:07:46][Cipher: TLS_RSA_WITH_RC4_128_SHA][PLAIN TEXT (ERR Unrecognized command.)][Plen Bins: 34,37,2,2,2,5,0,2,0,2,0,2,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,10,0,0] + 1 TCP 192.168.20.18:50583 <-> 72.249.41.52:110 [proto: 23/POPS][IP: 0/Unknown][Encrypted][Confidence: DPI][cat: Email/3][23 pkts/2059 bytes <-> 30 pkts/9130 bytes][Goodput ratio: 39/82][5.43 sec][Hostname/SNI: pop.lavabit.com][bytes ratio: -0.632 (Download)][IAT c2s/s2c min/avg/max/stddev: 6/0 273/202 2072/2002 508/432][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 90/304 368/1514 69/480][Risk: ** Obsolete TLS (v1.1 or older) **** Unsafe Protocol **][Risk Score: 110][Risk Info: TLSv1][TLSv1][JA3C: 207409c2b30e670ca50e1eac016a4831][ServerNames: *.lavabit.com,lavabit.com][JA3S: 6b96cf9c27b0223177b0e9f135fe4899 (INSECURE)][Issuer: C=US, ST=Arizona, L=Scottsdale, O=GoDaddy.com, Inc., OU=http://certificates.godaddy.com/repository, CN=Go Daddy Secure Certification Authority][Subject: O=*.lavabit.com, OU=Domain Control Validated, CN=*.lavabit.com][Certificate SHA-1: 1D:14:60:3D:5E:0F:A2:EB:61:C5:27:F8:A4:26:80:B3:E5:BB:A2:B2][Validity: 2012-02-17 04:07:46 - 2017-02-17 04:07:46][Cipher: TLS_RSA_WITH_RC4_128_SHA][PLAIN TEXT (ERR Unrecognized command.)][Plen Bins: 34,37,2,2,2,5,0,2,0,2,0,2,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,10,0,0]