From 1d0be6c4f4a87e7c6d29aa35e383f7f2ba62a967 Mon Sep 17 00:00:00 2001 From: Toni Date: Wed, 10 Apr 2024 15:36:54 +0200 Subject: [PATCH] Add Shellscript risk detection. (#2375) Signed-off-by: Toni Uhlig --- src/lib/ndpi_main.c | 24 ++++++++++++++++ src/lib/protocols/ftp_data.c | 8 ------ tests/cfgs/default/pcap/shell.pcap | Bin 0 -> 13734 bytes tests/cfgs/default/result/shell.pcap.out | 35 +++++++++++++++++++++++ 4 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 tests/cfgs/default/pcap/shell.pcap create mode 100644 tests/cfgs/default/result/shell.pcap.out diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 06c609606..9bb5010fd 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -8160,6 +8160,29 @@ static int ndpi_is_ntop_protocol(ndpi_protocol *ret) { /* ********************************************************************************* */ +static void ndpi_search_shellscript(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "search Shellscript\n"); + + if (packet->payload_packet_len < 3) + { + return; + } + + if (packet->payload[0] != '#' || + packet->payload[1] != '!' || + (packet->payload[2] != '/' && packet->payload[2] != ' ')) + { + return; + } + + NDPI_LOG_INFO(ndpi_struct, "found Shellscript\n"); + ndpi_set_risk(flow, NDPI_POSSIBLE_EXPLOIT, "Shellscript found"); +} + /* ELF format specs: https://man7.org/linux/man-pages/man5/elf.5.html */ static void ndpi_search_elf(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) @@ -8622,6 +8645,7 @@ static ndpi_protocol ndpi_internal_detection_process_packet(struct ndpi_detectio { ndpi_search_portable_executable(ndpi_str, flow); ndpi_search_elf(ndpi_str, flow); + ndpi_search_shellscript(ndpi_str, flow); } if(flow->first_pkt_fully_encrypted == 0 && diff --git a/src/lib/protocols/ftp_data.c b/src/lib/protocols/ftp_data.c index 048097156..1b5d42ffd 100644 --- a/src/lib/protocols/ftp_data.c +++ b/src/lib/protocols/ftp_data.c @@ -82,10 +82,6 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru if(ndpi_match_strprefix(packet->payload, payload_len, "RIFF")) return 1; - /* MZ is a .exe file */ - if((packet->payload[0] == 'M') && (packet->payload[1] == 'Z') && (packet->payload[3] == 0x00)) - return 1; - /* Ogg files */ if(ndpi_match_strprefix(packet->payload, payload_len, "OggS")) return 1; @@ -118,10 +114,6 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru if((packet->payload[0] == 0x3c) && (packet->payload[1] == 0x3f) && (packet->payload[2] == 0x70) && (packet->payload[3] == 0x68)) return 1; - /* Unix scripts */ - if((packet->payload[0] == 0x23) && (packet->payload[1] == 0x21) && (packet->payload[2] == 0x2f) && (packet->payload[3] == 0x62)) - return 1; - /* PDFs */ if(ndpi_match_strprefix(packet->payload, payload_len, "%PDF")) return 1; diff --git a/tests/cfgs/default/pcap/shell.pcap b/tests/cfgs/default/pcap/shell.pcap new file mode 100644 index 0000000000000000000000000000000000000000..f542e960e275b59e1b5755cbfae58aefd1bdf437 GIT binary patch literal 13734 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 D=YF5W literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/shell.pcap.out b/tests/cfgs/default/result/shell.pcap.out new file mode 100644 index 000000000..75afae9c5 --- /dev/null +++ b/tests/cfgs/default/result/shell.pcap.out @@ -0,0 +1,35 @@ +DPI Packets (TCP): 16 (8.00 pkts/flow) +DPI Packets (UDP): 2 (1.00 pkts/flow) +Confidence Unknown : 4 (flows) +Num dissector calls: 572 (143.00 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/12/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/4/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/2/0 (insert/search/found) +Automa host: 0/0 (search/found) +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: 0/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 8/0 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +Unknown 18 13422 4 + +Unrated 18 13422 4 + + + +Undetected flows: + 1 TCP 127.0.0.1:54970 <-> 127.0.0.1:33333 [proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][DPI packets: 8][5 pkts/5526 bytes <-> 3 pkts/206 bytes][Goodput ratio: 94/0][1.26 sec][bytes ratio: 0.928 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 315/0 1259/0 545/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 1105/69 5254/74 2074/4][Risk: ** Possible Exploit Attempt **][Risk Score: 150][Risk Info: Shellscript found][PLAIN TEXT ( /bin/sh)][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,100] + 2 UDP 127.0.0.1:58538 -> 127.0.0.1:33333 [proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/5230 bytes -> 0 pkts/0 bytes][Goodput ratio: 99/0][< 1 sec][Risk: ** Possible Exploit Attempt **** Unidirectional Traffic **][Risk Score: 160][Risk Info: No server to client traffic / Shellscript found][PLAIN TEXT ( /bin/sh)][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,100] + 3 TCP 127.0.0.1:47638 <-> 127.0.0.1:33333 [proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][DPI packets: 8][4 pkts/1209 bytes <-> 4 pkts/272 bytes][Goodput ratio: 77/0][4.14 sec][bytes ratio: 0.633 (Upload)][IAT c2s/s2c min/avg/max/stddev: 4140/0 1380/0 4140/0 1952/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 302/68 1003/74 405/3][Risk: ** Possible Exploit Attempt **][Risk Score: 150][Risk Info: Shellscript found][PLAIN TEXT (/bin/sh)][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,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 UDP 127.0.0.1:54112 -> 127.0.0.1:33333 [proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/979 bytes -> 0 pkts/0 bytes][Goodput ratio: 96/0][< 1 sec][Risk: ** Possible Exploit Attempt **** Unidirectional Traffic **][Risk Score: 160][Risk Info: No server to client traffic / Shellscript found][PLAIN TEXT (/bin/sh)][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,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]