You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
suricata/rust/htp/src/response_generic.rs

221 lines
8.8 KiB
Rust

http: Use libhtp-rs. Ticket: #2696 There are a lot of changes here, which are described below. In general these changes are renaming constants to conform to the libhtp-rs versions (which are generated by cbindgen); making all htp types opaque and changing struct->member references to htp_struct_member() function calls; and a handful of changes to offload functionality onto libhtp-rs from suricata, such as URI normalization and transaction cleanup. Functions introduced to handle opaque htp_tx_t: - tx->parsed_uri => htp_tx_parsed_uri(tx) - tx->parsed_uri->path => htp_uri_path(htp_tx_parsed_uri(tx) - tx->parsed_uri->hostname => htp_uri_hostname(htp_tx_parsed_uri(tx)) - htp_tx_get_user_data() => htp_tx_user_data(tx) - htp_tx_is_http_2_upgrade(tx) convenience function introduced to detect response status 101 and “Upgrade: h2c" header. Functions introduced to handle opaque htp_tx_data_t: - d->len => htp_tx_data_len() - d->data => htp_tx_data_data() - htp_tx_data_tx(data) function to get the htp_tx_t from the htp_tx_data_t - htp_tx_data_is_empty(data) convenience function introduced to test if the data is empty. Other changes: Build libhtp-rs as a crate inside rust. Update autoconf to no longer use libhtp as an external dependency. Remove HAVE_HTP feature defines since they are no longer needed. Make function arguments and return values const where possible htp_tx_destroy(tx) will now free an incomplete transaction htp_time_t replaced with standard struct timeval Callbacks from libhtp now provide the htp_connp_t and the htp_tx_data_t as separate arguments. This means the connection parser is no longer fetched from the transaction inside callbacks. SCHTPGenerateNormalizedUri() functionality moved inside libhtp-rs, which now provides normalized URI values. The normalized URI is available with accessor function: htp_tx_normalized_uri() Configuration settings added to control the behaviour of the URI normalization: - htp_config_set_normalized_uri_include_all() - htp_config_set_plusspace_decode() - htp_config_set_convert_lowercase() - htp_config_set_double_decode_normalized_query() - htp_config_set_double_decode_normalized_path() - htp_config_set_backslash_convert_slashes() - htp_config_set_bestfit_replacement_byte() - htp_config_set_convert_lowercase() - htp_config_set_nul_encoded_terminates() - htp_config_set_nul_raw_terminates() - htp_config_set_path_separators_compress() - htp_config_set_path_separators_decode() - htp_config_set_u_encoding_decode() - htp_config_set_url_encoding_invalid_handling() - htp_config_set_utf8_convert_bestfit() - htp_config_set_normalized_uri_include_all() - htp_config_set_plusspace_decode() Constants related to configuring uri normalization: - HTP_URL_DECODE_PRESERVE_PERCENT => HTP_URL_ENCODING_HANDLING_PRESERVE_PERCENT - HTP_URL_DECODE_REMOVE_PERCENT => HTP_URL_ENCODING_HANDLING_REMOVE_PERCENT - HTP_URL_DECODE_PROCESS_INVALID => HTP_URL_ENCODING_HANDLING_PROCESS_INVALID htp_config_set_field_limits(soft_limit, hard_limit) changed to htp_config_set_field_limit(limit) because libhtp didn't implement soft limits. libhtp logging API updated to provide HTP_LOG_CODE constants along with the message. This eliminates the need to perform string matching on message text to map log messages to HTTP_DECODER_EVENT values, and the HTP_LOG_CODE values can be used directly. In support of this, HTP_DECODER_EVENT values are mapped to their corresponding HTP_LOG_CODE values. New log events to describe additional anomalies: HTP_LOG_CODE_REQUEST_TOO_MANY_LZMA_LAYERS HTP_LOG_CODE_RESPONSE_TOO_MANY_LZMA_LAYERS HTP_LOG_CODE_PROTOCOL_CONTAINS_EXTRA_DATA HTP_LOG_CODE_CONTENT_LENGTH_EXTRA_DATA_START HTP_LOG_CODE_CONTENT_LENGTH_EXTRA_DATA_END HTP_LOG_CODE_SWITCHING_PROTO_WITH_CONTENT_LENGTH HTP_LOG_CODE_DEFORMED_EOL HTP_LOG_CODE_PARSER_STATE_ERROR HTP_LOG_CODE_MISSING_OUTBOUND_TRANSACTION_DATA HTP_LOG_CODE_MISSING_INBOUND_TRANSACTION_DATA HTP_LOG_CODE_ZERO_LENGTH_DATA_CHUNKS HTP_LOG_CODE_REQUEST_LINE_UNKNOWN_METHOD HTP_LOG_CODE_REQUEST_LINE_UNKNOWN_METHOD_NO_PROTOCOL HTP_LOG_CODE_REQUEST_LINE_UNKNOWN_METHOD_INVALID_PROTOCOL HTP_LOG_CODE_REQUEST_LINE_NO_PROTOCOL HTP_LOG_CODE_RESPONSE_LINE_INVALID_PROTOCOL HTP_LOG_CODE_RESPONSE_LINE_INVALID_RESPONSE_STATUS HTP_LOG_CODE_RESPONSE_BODY_INTERNAL_ERROR HTP_LOG_CODE_REQUEST_BODY_DATA_CALLBACK_ERROR HTP_LOG_CODE_RESPONSE_INVALID_EMPTY_NAME HTP_LOG_CODE_REQUEST_INVALID_EMPTY_NAME HTP_LOG_CODE_RESPONSE_INVALID_LWS_AFTER_NAME HTP_LOG_CODE_RESPONSE_HEADER_NAME_NOT_TOKEN HTP_LOG_CODE_REQUEST_INVALID_LWS_AFTER_NAME HTP_LOG_CODE_LZMA_DECOMPRESSION_DISABLED HTP_LOG_CODE_CONNECTION_ALREADY_OPEN HTP_LOG_CODE_COMPRESSION_BOMB_DOUBLE_LZMA HTP_LOG_CODE_INVALID_CONTENT_ENCODING HTP_LOG_CODE_INVALID_GAP HTP_LOG_CODE_ERROR The new htp_log API supports consuming log messages more easily than walking a list and tracking the current offset. Internally, libhtp-rs now provides log messages as a queue of htp_log_t, which means the application can simply call htp_conn_next_log() to fetch the next log message until the queue is empty. Once the application is done with a log message, they can call htp_log_free() to dispose of it. Functions supporting htp_log_t: htp_conn_next_log(conn) - Get the next log message htp_log_message(log) - To get the text of the message htp_log_code(log) - To get the HTP_LOG_CODE value htp_log_free(log) - To free the htp_log_t
3 years ago
use crate::{
bstr::Bstr,
connection_parser::ConnectionParser,
error::Result,
headers::Flags as HeaderFlags,
parsers::{parse_content_length, parse_protocol, parse_status},
transaction::{Header, HtpProtocol, HtpResponseNumber},
util::{
take_ascii_whitespace, take_is_space, take_is_space_or_null, take_not_is_space,
FlagOperations, HtpFlags,
},
HtpStatus,
};
use nom::{error::ErrorKind};
http: Use libhtp-rs. Ticket: #2696 There are a lot of changes here, which are described below. In general these changes are renaming constants to conform to the libhtp-rs versions (which are generated by cbindgen); making all htp types opaque and changing struct->member references to htp_struct_member() function calls; and a handful of changes to offload functionality onto libhtp-rs from suricata, such as URI normalization and transaction cleanup. Functions introduced to handle opaque htp_tx_t: - tx->parsed_uri => htp_tx_parsed_uri(tx) - tx->parsed_uri->path => htp_uri_path(htp_tx_parsed_uri(tx) - tx->parsed_uri->hostname => htp_uri_hostname(htp_tx_parsed_uri(tx)) - htp_tx_get_user_data() => htp_tx_user_data(tx) - htp_tx_is_http_2_upgrade(tx) convenience function introduced to detect response status 101 and “Upgrade: h2c" header. Functions introduced to handle opaque htp_tx_data_t: - d->len => htp_tx_data_len() - d->data => htp_tx_data_data() - htp_tx_data_tx(data) function to get the htp_tx_t from the htp_tx_data_t - htp_tx_data_is_empty(data) convenience function introduced to test if the data is empty. Other changes: Build libhtp-rs as a crate inside rust. Update autoconf to no longer use libhtp as an external dependency. Remove HAVE_HTP feature defines since they are no longer needed. Make function arguments and return values const where possible htp_tx_destroy(tx) will now free an incomplete transaction htp_time_t replaced with standard struct timeval Callbacks from libhtp now provide the htp_connp_t and the htp_tx_data_t as separate arguments. This means the connection parser is no longer fetched from the transaction inside callbacks. SCHTPGenerateNormalizedUri() functionality moved inside libhtp-rs, which now provides normalized URI values. The normalized URI is available with accessor function: htp_tx_normalized_uri() Configuration settings added to control the behaviour of the URI normalization: - htp_config_set_normalized_uri_include_all() - htp_config_set_plusspace_decode() - htp_config_set_convert_lowercase() - htp_config_set_double_decode_normalized_query() - htp_config_set_double_decode_normalized_path() - htp_config_set_backslash_convert_slashes() - htp_config_set_bestfit_replacement_byte() - htp_config_set_convert_lowercase() - htp_config_set_nul_encoded_terminates() - htp_config_set_nul_raw_terminates() - htp_config_set_path_separators_compress() - htp_config_set_path_separators_decode() - htp_config_set_u_encoding_decode() - htp_config_set_url_encoding_invalid_handling() - htp_config_set_utf8_convert_bestfit() - htp_config_set_normalized_uri_include_all() - htp_config_set_plusspace_decode() Constants related to configuring uri normalization: - HTP_URL_DECODE_PRESERVE_PERCENT => HTP_URL_ENCODING_HANDLING_PRESERVE_PERCENT - HTP_URL_DECODE_REMOVE_PERCENT => HTP_URL_ENCODING_HANDLING_REMOVE_PERCENT - HTP_URL_DECODE_PROCESS_INVALID => HTP_URL_ENCODING_HANDLING_PROCESS_INVALID htp_config_set_field_limits(soft_limit, hard_limit) changed to htp_config_set_field_limit(limit) because libhtp didn't implement soft limits. libhtp logging API updated to provide HTP_LOG_CODE constants along with the message. This eliminates the need to perform string matching on message text to map log messages to HTTP_DECODER_EVENT values, and the HTP_LOG_CODE values can be used directly. In support of this, HTP_DECODER_EVENT values are mapped to their corresponding HTP_LOG_CODE values. New log events to describe additional anomalies: HTP_LOG_CODE_REQUEST_TOO_MANY_LZMA_LAYERS HTP_LOG_CODE_RESPONSE_TOO_MANY_LZMA_LAYERS HTP_LOG_CODE_PROTOCOL_CONTAINS_EXTRA_DATA HTP_LOG_CODE_CONTENT_LENGTH_EXTRA_DATA_START HTP_LOG_CODE_CONTENT_LENGTH_EXTRA_DATA_END HTP_LOG_CODE_SWITCHING_PROTO_WITH_CONTENT_LENGTH HTP_LOG_CODE_DEFORMED_EOL HTP_LOG_CODE_PARSER_STATE_ERROR HTP_LOG_CODE_MISSING_OUTBOUND_TRANSACTION_DATA HTP_LOG_CODE_MISSING_INBOUND_TRANSACTION_DATA HTP_LOG_CODE_ZERO_LENGTH_DATA_CHUNKS HTP_LOG_CODE_REQUEST_LINE_UNKNOWN_METHOD HTP_LOG_CODE_REQUEST_LINE_UNKNOWN_METHOD_NO_PROTOCOL HTP_LOG_CODE_REQUEST_LINE_UNKNOWN_METHOD_INVALID_PROTOCOL HTP_LOG_CODE_REQUEST_LINE_NO_PROTOCOL HTP_LOG_CODE_RESPONSE_LINE_INVALID_PROTOCOL HTP_LOG_CODE_RESPONSE_LINE_INVALID_RESPONSE_STATUS HTP_LOG_CODE_RESPONSE_BODY_INTERNAL_ERROR HTP_LOG_CODE_REQUEST_BODY_DATA_CALLBACK_ERROR HTP_LOG_CODE_RESPONSE_INVALID_EMPTY_NAME HTP_LOG_CODE_REQUEST_INVALID_EMPTY_NAME HTP_LOG_CODE_RESPONSE_INVALID_LWS_AFTER_NAME HTP_LOG_CODE_RESPONSE_HEADER_NAME_NOT_TOKEN HTP_LOG_CODE_REQUEST_INVALID_LWS_AFTER_NAME HTP_LOG_CODE_LZMA_DECOMPRESSION_DISABLED HTP_LOG_CODE_CONNECTION_ALREADY_OPEN HTP_LOG_CODE_COMPRESSION_BOMB_DOUBLE_LZMA HTP_LOG_CODE_INVALID_CONTENT_ENCODING HTP_LOG_CODE_INVALID_GAP HTP_LOG_CODE_ERROR The new htp_log API supports consuming log messages more easily than walking a list and tracking the current offset. Internally, libhtp-rs now provides log messages as a queue of htp_log_t, which means the application can simply call htp_conn_next_log() to fetch the next log message until the queue is empty. Once the application is done with a log message, they can call htp_log_free() to dispose of it. Functions supporting htp_log_t: htp_conn_next_log(conn) - Get the next log message htp_log_message(log) - To get the text of the message htp_log_code(log) - To get the HTP_LOG_CODE value htp_log_free(log) - To free the htp_log_t
3 years ago
use std::cmp::Ordering;
impl ConnectionParser {
/// Generic response line parser.
pub(crate) fn parse_response_line_generic(&mut self, response_line: &[u8]) -> Result<()> {
let response_tx = self.response_mut();
response_tx.response_protocol_number = HtpProtocol::Invalid;
response_tx.response_status = None;
response_tx.response_status_number = HtpResponseNumber::Invalid;
response_tx.response_message = None;
let response_line_parser = tuple::<_, _, (_, ErrorKind), _>((
take_is_space_or_null,
take_not_is_space,
take_is_space,
take_not_is_space,
take_ascii_whitespace(),
));
if let Ok((message, (_ls, response_protocol, ws1, status_code, ws2))) =
response_line_parser(response_line)
{
if response_protocol.is_empty() {
return Ok(());
}
response_tx.response_protocol = Some(Bstr::from(response_protocol));
self.response_mut().response_protocol_number =
parse_protocol(response_protocol, &mut self.logger);
if ws1.is_empty() || status_code.is_empty() {
return Ok(());
}
let response_tx = self.response_mut();
response_tx.response_status = Some(Bstr::from(status_code));
response_tx.response_status_number = parse_status(status_code);
if ws2.is_empty() {
return Ok(());
}
response_tx.response_message = Some(Bstr::from(message));
} else {
return Err(HtpStatus::ERROR);
}
Ok(())
}
/// Generic response header parser.
///
///Returns a tuple of the unparsed data and a boolean indicating if the EOH was seen.
pub(crate) fn process_response_headers_generic<'a>(
&mut self,
data: &'a [u8],
) -> Result<(&'a [u8], bool)> {
let rc = self.response_mut().response_header_parser.headers()(data);
if let Ok((remaining, (headers, eoh))) = rc {
for h in headers {
let mut flags = 0;
let name_flags = &h.name.flags;
let value_flags = &h.value.flags;
if value_flags.is_set(HeaderFlags::DEFORMED_EOL)
|| name_flags.is_set(HeaderFlags::DEFORMED_EOL)
{
htp_warn!(
self.logger,
HtpLogCode::DEFORMED_EOL,
"Weird response end of lines mix"
);
}
// Ignore LWS after field-name.
if name_flags.is_set(HeaderFlags::NAME_TRAILING_WHITESPACE) {
htp_warn_once!(
self.logger,
HtpLogCode::RESPONSE_INVALID_LWS_AFTER_NAME,
"Request field invalid: LWS after name",
self.response_mut().flags,
flags,
HtpFlags::FIELD_INVALID
);
}
//If there was leading whitespace, probably was invalid folding.
if name_flags.is_set(HeaderFlags::NAME_LEADING_WHITESPACE) {
htp_warn_once!(
self.logger,
HtpLogCode::Invalid_RESPONSE_FIELD_FOLDING,
"Invalid response field folding",
self.response_mut().flags,
flags,
HtpFlags::Invalid_FOLDING
);
flags.set(HtpFlags::FIELD_INVALID);
}
// Check that field-name is a token
if name_flags.is_set(HeaderFlags::NAME_NON_TOKEN_CHARS) {
// Incorrectly formed header name.
htp_warn_once!(
self.logger,
HtpLogCode::RESPONSE_HEADER_NAME_NOT_TOKEN,
"Response header name is not a token",
self.response_mut().flags,
flags,
HtpFlags::FIELD_INVALID
);
}
// No colon?
if name_flags.is_set(HeaderFlags::MISSING_COLON) {
// We handle this case as a header with an empty name, with the value equal
// to the entire input string.
// TODO Apache will respond to this problem with a 400.
// Now extract the name and the value
htp_warn_once!(
self.logger,
HtpLogCode::RESPONSE_FIELD_MISSING_COLON,
"Response field invalid: colon missing",
self.response_mut().flags,
flags,
HtpFlags::FIELD_UNPARSEABLE
);
flags.set(HtpFlags::FIELD_INVALID);
} else if name_flags.is_set(HeaderFlags::NAME_EMPTY) {
// Empty header name.
htp_warn_once!(
self.logger,
HtpLogCode::RESPONSE_INVALID_EMPTY_NAME,
"Response field invalid: empty name",
self.response_mut().flags,
flags,
HtpFlags::FIELD_INVALID
);
}
self.process_response_header_generic(Header::new_with_flags(
h.name.name.into(),
h.value.value.into(),
flags,
))?;
}
Ok((remaining, eoh))
} else {
Ok((data, false))
}
}
/// Generic response header line(s) processor, which assembles folded lines
/// into a single buffer before invoking the parsing function.
fn process_response_header_generic(&mut self, header: Header) -> Result<()> {
let mut repeated = false;
let reps = self.response().response_header_repetitions;
let mut update_reps = false;
// Do we already have a header with the same name?
if let Some((_, h_existing)) = self
.response_mut()
.response_headers
.get_nocase_mut(header.name.as_slice())
{
// Keep track of repeated same-name headers.
if !h_existing.flags.is_set(HtpFlags::FIELD_REPEATED) {
// This is the second occurence for this header.
repeated = true;
} else if reps < 64 {
update_reps = true;
} else {
return Ok(());
}
h_existing.flags.set(HtpFlags::FIELD_REPEATED);
// For simplicity reasons, we count the repetitions of all headers
// Having multiple C-L headers is against the RFC but many
// browsers ignore the subsequent headers if the values are the same.
if header.name.cmp_nocase("Content-Length") == Ordering::Equal {
// Don't use string comparison here because we want to
// ignore small formatting differences.
let existing_cl = parse_content_length(&h_existing.value, None);
let new_cl = parse_content_length(&(header.value), None);
if existing_cl.is_none() || new_cl.is_none() || existing_cl != new_cl {
// Ambiguous response C-L value.
htp_warn!(
self.logger,
HtpLogCode::DUPLICATE_CONTENT_LENGTH_FIELD_IN_RESPONSE,
"Ambiguous response C-L value"
);
}
} else {
// Add to the existing header.
h_existing.value.extend_from_slice(b", ");
h_existing.value.extend_from_slice(header.value.as_slice());
}
} else {
self.response_mut()
.response_headers
.add(header.name.clone(), header);
}
if update_reps {
self.response_mut().response_header_repetitions =
self.response().response_header_repetitions.wrapping_add(1)
}
if repeated {
htp_warn!(
self.logger,
HtpLogCode::RESPONSE_HEADER_REPETITION,
"Repetition for header"
);
}
Ok(())
}
}