HTTP: fix user-agent parsing (#1124)
User-agent information is used to try to detect the user OS; since the UA is extracted for QUIC traffic too, the "detected_os" field must be generic and not associated to HTTP flows only. Otherwise, you might overwrite some "tls_quic_stun" fields (SNI...) with random data. Strangely enough, the "detected_os" field is never used: it is never logged, or printed, or exported...
This commit is contained in:
+2
-2
@@ -1068,6 +1068,8 @@ struct ndpi_flow_struct {
|
||||
uint8_t num_request_headers, num_response_headers;
|
||||
uint8_t request_version; /* 0=1.0 and 1=1.1. Create an enum for this? */
|
||||
uint16_t response_status_code; /* 200, 404, etc. */
|
||||
uint8_t detected_os[32]; /* Via HTTP/QUIC User-Agent */
|
||||
|
||||
} http;
|
||||
|
||||
/*
|
||||
@@ -1145,8 +1147,6 @@ struct ndpi_flow_struct {
|
||||
} ubntac2;
|
||||
|
||||
struct {
|
||||
/* Via HTTP User-Agent */
|
||||
uint8_t detected_os[32];
|
||||
/* Via HTTP X-Forwarded-For */
|
||||
uint8_t nat_ip[24];
|
||||
} http;
|
||||
|
||||
@@ -456,6 +456,7 @@ class Http(Structure):
|
||||
("num_response_headers", c_uint8),
|
||||
("request_version", c_uint8),
|
||||
("response_status_code", c_uint16),
|
||||
("detected_os", c_char * 32),
|
||||
]
|
||||
|
||||
|
||||
@@ -535,7 +536,6 @@ class Ubntac2(Structure):
|
||||
|
||||
class Http2(Structure):
|
||||
_fields_ = [
|
||||
("detected_os", c_char * 32),
|
||||
("nat_ip", c_char * 24)
|
||||
]
|
||||
|
||||
@@ -861,4 +861,4 @@ ndpi.ndpi_set_protocol_detection_bitmask2.argtypes = [POINTER(NDPIDetectionModul
|
||||
ndpi.ndpi_twalk.argtypes = [c_void_p, CFUNCTYPE(None, c_void_p, c_int32, c_int, c_void_p), c_void_p]
|
||||
|
||||
""" ndpi_tdestroy: node destroy. """
|
||||
ndpi.ndpi_tdestroy.argtypes = [c_void_p, CFUNCTYPE(None, c_void_p)]
|
||||
ndpi.ndpi_tdestroy.argtypes = [c_void_p, CFUNCTYPE(None, c_void_p)]
|
||||
|
||||
Reference in New Issue
Block a user