From a7b5e0919569d4c54e77969c95a402384596e525 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Fri, 26 Nov 2021 19:07:45 +0100 Subject: [PATCH] Added Salesforce detection --- src/include/ndpi_protocol_ids.h | 1 + src/lib/ndpi_content_match.c.inc | 10 +++++++++- tests/pcap/salesforce.pcap | Bin 0 -> 5469 bytes tests/result/salesforce.pcap.out | 12 ++++++++++++ tests/result/synscan.pcap.out | 4 ++-- 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 tests/pcap/salesforce.pcap create mode 100644 tests/result/salesforce.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 020328f28..963744006 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -294,6 +294,7 @@ typedef enum { NDPI_PROTOCOL_AVAST_SECUREDNS = 263, /* Toni Uhlig */ NDPI_PROTOCOL_CASSANDRA = 264, /* Lucas Santos */ NDPI_PROTOCOL_AMAZON_AWS = 265, + NDPI_PROTOCOL_SALESFORCE = 266, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index 8fe47969c..519f337d0 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -9276,6 +9276,13 @@ static ndpi_network host_protocol_list[] = { { 0x0D600000 /* 13.96.0.0 */, 13, NDPI_PROTOCOL_MICROSOFT }, { 0x0D680000 /* 13.104.0.0 */, 14, NDPI_PROTOCOL_MICROSOFT }, + /* + TODO + + Salesforce + https://help.salesforce.com/s/articleView?id=000321501&type=1 + */ + /* End */ { 0x0, 0, 0 } }; @@ -9358,9 +9365,10 @@ static ndpi_protocol_match host_match[] = { ".aws.", "AmazonAWS", NDPI_PROTOCOL_AMAZON_AWS, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { ".cloudfront.net", "AmazonAWS", NDPI_PROTOCOL_AMAZON_AWS, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { ".us-west-2.compute.amazonaws.com", "AmazonAWS", NDPI_PROTOCOL_AMAZON_AWS, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL }, - { ".teamviewer.com", "Teamviewer", NDPI_PROTOCOL_TEAMVIEWER, NDPI_PROTOCOL_CATEGORY_REMOTE_ACCESS, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL }, + { ".teamviewer.com", "Teamviewer", NDPI_PROTOCOL_TEAMVIEWER, NDPI_PROTOCOL_CATEGORY_REMOTE_ACCESS, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { ".bloombergvault.com", "Bloomberg", NDPI_PROTOCOL_BLOOMBERG, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { ".bloomberg.com", "Bloomberg", NDPI_PROTOCOL_BLOOMBERG, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL }, + { ".salesforce.com", "Salesforce", NDPI_PROTOCOL_SALESFORCE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { ".apple-dns.net", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { "origin-apple.com.akadns.net", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { "e6858.dsce9.akamaiedge.net", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL }, diff --git a/tests/pcap/salesforce.pcap b/tests/pcap/salesforce.pcap new file mode 100644 index 0000000000000000000000000000000000000000..c454c3865fc2bd97e67686e94a5cb9a063b5ff2a GIT binary patch literal 5469 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�x?+AEft9@%WtoG7)SnanpN2=Xgo_gBP_&XAVHh6VUTM0F>%4Sv> z{fcs8;5nY(z**j>+sUp={FZ16dVOJL5jzTrz9*tJch=@3j`Dm3L~adKsVY-N;y!#oe^C``xVV zgLh(vNz0}N9esZ?;ivpjx|J4iwl>1#7^o8+{VAQ5o2=zYM7#eG Paho(m?7v<&7V-Z8T(K2Q literal 0 HcmV?d00001 diff --git a/tests/result/salesforce.pcap.out b/tests/result/salesforce.pcap.out new file mode 100644 index 000000000..d63722968 --- /dev/null +++ b/tests/result/salesforce.pcap.out @@ -0,0 +1,12 @@ +Guessed flow protos: 0 + +DPI Packets (TCP): 8 (8.00 pkts/flow) + +Salesforce 15 5205 1 + +JA3 Host Stats: + IP Address # JA3C + 1 192.168.1.178 1 + + + 1 TCP 192.168.1.178:54399 <-> 85.222.142.6:443 [proto: 91.266/TLS.Salesforce][Encrypted][cat: Cloud/13][8 pkts/1150 bytes <-> 7 pkts/4055 bytes][Goodput ratio: 53/88][0.15 sec][ALPN: h2;h2-16;h2-15;h2-14;spdy/3.1;spdy/3;http/1.1][bytes ratio: -0.558 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 13/5 28/25 13/10][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 144/579 583/1506 169/616][TLSv1.2][Client: help.salesforce.com][JA3C: 7570245c781d7d7a68e31419177e728d][ServerNames: support.salesforce.com,help.salesforce.com][JA3S: 263c859c5391203d774bc0599793d915][Issuer: C=US, O=DigiCert Inc, CN=DigiCert TLS RSA SHA256 2020 CA1][Subject: C=US, ST=California, L=San Francisco, O=salesforce.com, inc., CN=support.salesforce.com][Certificate SHA-1: 69:0B:02:F6:58:63:79:69:21:33:61:1A:5C:3D:6A:BD:FC:55:0C:6F][Safari][Validity: 2021-06-07 00:00:00 - 2022-06-06 23:59:59][Cipher: TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384][Plen Bins: 0,14,28,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,14,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,28,0,0] diff --git a/tests/result/synscan.pcap.out b/tests/result/synscan.pcap.out index 8afbbcc0b..8e0b34337 100644 --- a/tests/result/synscan.pcap.out +++ b/tests/result/synscan.pcap.out @@ -101,7 +101,7 @@ iSCSI 2 116 2 43 TCP 172.16.0.8:36050 -> 64.13.134.52:2605 [proto: 13/BGP][ClearText][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 44 TCP 172.16.0.8:36050 -> 64.13.134.52:3000 [proto: 26/ntop][ClearText][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 45 TCP 172.16.0.8:36050 -> 64.13.134.52:3128 [proto: 131/HTTP_Proxy][ClearText][cat: Web/5][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] - 46 TCP 172.16.0.8:36050 -> 64.13.134.52:3260 [proto: 266/iSCSI][ClearText][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] + 46 TCP 172.16.0.8:36050 -> 64.13.134.52:3260 [proto: 267/iSCSI][ClearText][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 47 TCP 172.16.0.8:36050 -> 64.13.134.52:3306 [proto: 20/MySQL][ClearText][cat: Database/11][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 48 TCP 172.16.0.8:36050 -> 64.13.134.52:3389 [proto: 88/RDP][ClearText][cat: RemoteAccess/12][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Desktop/File Sharing Session **][Risk Score: 10][Plen Bins: 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,0,0,0] 49 TCP 172.16.0.8:36050 -> 64.13.134.52:4343 [proto: 170/Whois-DAS][ClearText][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] @@ -162,7 +162,7 @@ iSCSI 2 116 2 104 TCP 172.16.0.8:36051 -> 64.13.134.52:2605 [proto: 13/BGP][ClearText][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 105 TCP 172.16.0.8:36051 -> 64.13.134.52:3000 [proto: 26/ntop][ClearText][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 106 TCP 172.16.0.8:36051 -> 64.13.134.52:3128 [proto: 131/HTTP_Proxy][ClearText][cat: Web/5][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] - 107 TCP 172.16.0.8:36051 -> 64.13.134.52:3260 [proto: 266/iSCSI][ClearText][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] + 107 TCP 172.16.0.8:36051 -> 64.13.134.52:3260 [proto: 267/iSCSI][ClearText][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 108 TCP 172.16.0.8:36051 -> 64.13.134.52:3306 [proto: 20/MySQL][ClearText][cat: Database/11][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0] 109 TCP 172.16.0.8:36051 -> 64.13.134.52:3389 [proto: 88/RDP][ClearText][cat: RemoteAccess/12][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Desktop/File Sharing Session **][Risk Score: 10][Plen Bins: 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,0,0,0] 110 TCP 172.16.0.8:36051 -> 64.13.134.52:4343 [proto: 170/Whois-DAS][ClearText][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Plen Bins: 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,0,0,0]