From c287eb835b537ce64d9293a52ca13e670b6d3b0d Mon Sep 17 00:00:00 2001 From: Toni Date: Sat, 18 Jun 2022 17:19:16 +0200 Subject: [PATCH] Improved SOAP via HTTP. (#1605) Signed-off-by: lns --- src/lib/ndpi_main.c | 2 +- src/lib/protocols/soap.c | 28 +++++++++++++++++- tests/pcap/soap.pcap | Bin 0 -> 11292 bytes ...match_string_subprotocol__error.pcapng.out | 4 +-- tests/result/soap.pcap.out | 11 +++++++ 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 tests/pcap/soap.pcap create mode 100644 tests/result/soap.pcap.out diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 182ad45e5..f22887d6a 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -991,7 +991,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp ndpi_build_default_ports(ports_a, 80, 0 /* ntop */, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_subprotocols(ndpi_str, NDPI_PROTOCOL_HTTP, - NDPI_PROTOCOL_AIMINI, NDPI_PROTOCOL_CROSSFIRE, + NDPI_PROTOCOL_AIMINI, NDPI_PROTOCOL_CROSSFIRE, NDPI_PROTOCOL_SOAP, NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, NDPI_PROTOCOL_GNUTELLA, NDPI_PROTOCOL_MAPLESTORY, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_WORLDOFWARCRAFT, NDPI_PROTOCOL_THUNDER, NDPI_PROTOCOL_IRC, diff --git a/src/lib/protocols/soap.c b/src/lib/protocols/soap.c index da8d10fef..8ba885974 100644 --- a/src/lib/protocols/soap.c +++ b/src/lib/protocols/soap.c @@ -27,7 +27,14 @@ static void ndpi_int_soap_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOAP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); + if (flow->guessed_host_protocol_id == NDPI_PROTOCOL_HTTP) + { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOAP, NDPI_PROTOCOL_HTTP, + NDPI_CONFIDENCE_DPI); + } else { + ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, NDPI_PROTOCOL_SOAP, + NDPI_CONFIDENCE_DPI); + } } void ndpi_search_soap(struct ndpi_detection_module_struct *ndpi_struct, @@ -37,6 +44,25 @@ void ndpi_search_soap(struct ndpi_detection_module_struct *ndpi_struct, NDPI_LOG_DBG(ndpi_struct, "search soap\n"); + if (packet->parsed_lines == 0) + { + ndpi_parse_packet_line_info(ndpi_struct, flow); + } + + if (packet->parsed_lines > 0) + { + size_t i; + + for (i = 0; i < packet->parsed_lines && packet->line[i].len > 0; ++i) + { + if (LINE_STARTS(packet->line[i], "SOAPAction") != 0) + { + ndpi_int_soap_add_connection(ndpi_struct, flow); + return; + } + } + } + if (flow->packet_counter > 3) { if (flow->l4.tcp.soap_stage == 1) diff --git a/tests/pcap/soap.pcap b/tests/pcap/soap.pcap new file mode 100644 index 0000000000000000000000000000000000000000..0eeb84285c3d6e367a6882796917cdc7938177bd GIT binary patch literal 11292 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 10.68.137.118:8091 [proto: 7/HTTP][ClearText][Confidence: DPI][cat: Web/5][7 pkts/1546 bytes <-> 6 pkts/1389 bytes][Goodput ratio: 73/76][3438.13 sec][Hostname/SNI: 10.68.137.118][bytes ratio: 0.053 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 7/29 687620/24940 3382709/49851 1347715/24911][Pkt Len c2s/s2c min/avg/max/stddev: 60/54 221/232 1180/739 392/263][URL: 10.68.137.118:8091/Apcn/ApcRemoteService][StatusCode: 200][User-Agent: Jakarta Commons-HttpClient/3.0.1][Risk: ** Known Proto on Non Std Port **** HTTP Numeric IP Address **][Risk Score: 60][Risk Info: Found host 10.68.137.118][PLAIN TEXT (POST /Apcn/ApcRemoteService HTT)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0] + 1 TCP 10.3.9.19:40632 <-> 10.68.137.118:8091 [proto: 7.253/HTTP.SOAP][ClearText][Confidence: DPI][cat: RPC/16][7 pkts/1546 bytes <-> 6 pkts/1389 bytes][Goodput ratio: 73/76][3438.13 sec][Hostname/SNI: 10.68.137.118][bytes ratio: 0.053 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 7/29 687620/24940 3382709/49851 1347715/24911][Pkt Len c2s/s2c min/avg/max/stddev: 60/54 221/232 1180/739 392/263][URL: 10.68.137.118:8091/Apcn/ApcRemoteService][StatusCode: 200][User-Agent: Jakarta Commons-HttpClient/3.0.1][Risk: ** Known Proto on Non Std Port **** HTTP Numeric IP Address **][Risk Score: 60][Risk Info: Found host 10.68.137.118][PLAIN TEXT (POST /Apcn/ApcRemoteService HTT)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/soap.pcap.out b/tests/result/soap.pcap.out new file mode 100644 index 000000000..ab1528d7d --- /dev/null +++ b/tests/result/soap.pcap.out @@ -0,0 +1,11 @@ +Guessed flow protos: 0 + +DPI Packets (TCP): 11 (3.67 pkts/flow) +Confidence DPI : 3 (flows) + +Microsoft 1 1506 1 +SOAP 19 9442 2 + + 1 TCP 192.168.2.100:50100 <-> 23.2.213.165:80 [proto: 253/SOAP][ClearText][Confidence: DPI][cat: RPC/16][7 pkts/4746 bytes <-> 7 pkts/752 bytes][Goodput ratio: 92/39][5.01 sec][bytes ratio: 0.726 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/1 989/1236 2486/2486 1098/1096][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 678/107 1506/362 717/104][PLAIN TEXT (POST /fwlink/)][Plen Bins: 0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,75,0,0] + 2 TCP 185.32.192.30:80 <-> 85.154.114.113:56028 [VLAN: 808][proto: 253/SOAP][ClearText][Confidence: DPI][cat: RPC/16][3 pkts/2487 bytes <-> 2 pkts/1457 bytes][Goodput ratio: 92/92][0.34 sec][PLAIN TEXT (xml version)][Plen Bins: 0,0,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,0,25,0,0,0,0,50,0,0,0,0,0,0,0,0,0] + 3 TCP 192.168.2.100:50100 -> 23.2.213.165:4176 [proto: 253.212/SOAP.Microsoft][ClearText][Confidence: DPI][cat: Cloud/13][1 pkts/1506 bytes -> 0 pkts/0 bytes][Goodput ratio: 96/0][< 1 sec][Hostname/SNI: go.microsoft.com][User-Agent: MICROSOFT_DEVICE_METADATA_RETRIEVAL_CLIENT][PLAIN TEXT (POST /fwlink/)][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,100,0,0]