Add ICMP checksum check and set risk if mismatch detected. (#1464)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2022-03-02 13:12:01 +01:00
committed by GitHub
parent 6c4df21238
commit e8559a4127
5 changed files with 42 additions and 0 deletions
+1
View File
@@ -155,6 +155,7 @@ extern "C" {
int ndpi_is_printable_string(char * const str, size_t len);
#define NDPI_ENTROPY_ENCRYPTED_OR_RANDOM(entropy) (entropy > 7.0f)
float ndpi_entropy(u_int8_t const * const buf, size_t len);
u_int16_t ndpi_calculate_icmp4_checksum(u_int8_t const * const buf, size_t len);
void load_common_alpns(struct ndpi_detection_module_struct *ndpi_str);
u_int8_t is_a_common_alpn(struct ndpi_detection_module_struct *ndpi_str,
const char *alpn_to_check, u_int alpn_to_check_len);
+6
View File
@@ -3066,6 +3066,12 @@ u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_str,
if (NDPI_ENTROPY_ENCRYPTED_OR_RANDOM(flow->entropy) != 0) {
ndpi_set_risk(ndpi_str, flow, NDPI_SUSPICIOUS_ENTROPY);
}
struct ndpi_icmphdr * const icmphdr = (struct ndpi_icmphdr *)packet->payload;
u_int16_t chksm = ndpi_calculate_icmp4_checksum(packet->payload, packet->payload_packet_len);
if (icmphdr->checksum != chksm) {
ndpi_set_risk(ndpi_str, flow, NDPI_MALFORMED_PACKET);
}
}
}
}
+27
View File
@@ -2299,6 +2299,33 @@ float ndpi_entropy(u_int8_t const * const buf, size_t len) {
return entropy;
}
/* ******************************************************************** */
u_int16_t ndpi_calculate_icmp4_checksum(u_int8_t const * const buf, size_t len) {
u_int16_t const * sbuf = (u_int16_t *)buf;
u_int32_t checksum = 0;
/*
* The first two bytes of the icmp header are required.
* The next two bytes is the checksum, which we want to ignore.
*/
checksum += *sbuf++; len -= 2; /* icmp->type, icmp->code */
sbuf++; len -= 2; /* icmp->checksum */
for (; len > 1; len -= 2) {
checksum += *sbuf++;
}
if (len == 1) {
checksum += *(u_int8_t *)sbuf;
}
checksum = (checksum >> 16) + (checksum & 0xFFFF);
checksum += (checksum >> 16);
return ~checksum;
}
/* ******************************************* */
char* ndpi_get_flow_name(struct ndpi_flow_struct *flow) {
Binary file not shown.
+8
View File
@@ -0,0 +1,8 @@
Guessed flow protos: 0
DPI Packets (other): 1 (1.00 pkts/flow)
Confidence DPI : 1 (flows)
ICMP 863 190810 1
1 ICMP 192.168.154.131:0 <-> 192.168.154.132:0 [proto: 81/ICMP][ClearText][Confidence: DPI][cat: Network/14][448 pkts/98566 bytes <-> 415 pkts/92244 bytes][Goodput ratio: 81/81][1122.51 sec][bytes ratio: 0.033 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 2578/2731 145505/145505 9091/9494][Pkt Len c2s/s2c min/avg/max/stddev: 74/74 220/222 1075/1070 245/245][Risk: ** Malformed Packet **][Risk Score: 10][PLAIN TEXT (OpenSSH5)][Plen Bins: 0,32,24,24,7,3,3,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]