From: Juliana Fajardini Date: Mon, 17 Feb 2025 22:24:22 +0000 (-0300) Subject: pgsql: add PgsqlParserError X-Git-Tag: suricata-8.0.0-beta1~413 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29d3aa7a6a4d7a6f2f60c43342950b68ce19e0df;p=thirdparty%2Fsuricata.git pgsql: add PgsqlParserError Building on top of work done by Jason Ish. Related to Bug #5524 --- diff --git a/rust/src/pgsql/parser.rs b/rust/src/pgsql/parser.rs index d516c9ca5f..c7c158761c 100644 --- a/rust/src/pgsql/parser.rs +++ b/rust/src/pgsql/parser.rs @@ -24,7 +24,7 @@ use nom7::branch::alt; use nom7::bytes::streaming::{tag, take, take_until, take_until1}; use nom7::character::streaming::{alphanumeric1, char}; use nom7::combinator::{all_consuming, cond, eof, map_parser, opt, peek, verify}; -use nom7::error::{make_error, ErrorKind}; +use nom7::error::{make_error, ErrorKind, ParseError}; use nom7::multi::{many1, many_m_n, many_till}; use nom7::number::streaming::{be_i16, be_i32}; use nom7::number::streaming::{be_u16, be_u32, be_u8}; @@ -38,8 +38,32 @@ pub const PGSQL_DUMMY_PROTO_CANCEL_REQUEST: u16 = 5678; // 0x162e pub const PGSQL_DUMMY_PROTO_MINOR_SSL: u16 = 5679; //0x162f pub const _PGSQL_DUMMY_PROTO_MINOR_GSSAPI: u16 = 5680; // 0x1630 -fn parse_length(i: &[u8]) -> IResult<&[u8], u32> { - verify(be_u32, |&x| x >= PGSQL_LENGTH_FIELD)(i) +#[derive(Debug, PartialEq, Eq)] +pub enum PgsqlParseError { + InvalidLength, + + NomError(I, ErrorKind), +} + +impl ParseError for PgsqlParseError { + fn from_error_kind(input: I, kind: ErrorKind) -> Self { + PgsqlParseError::NomError(input, kind) + } + + fn append(input: I, kind: ErrorKind, _other: Self) -> Self { + PgsqlParseError::NomError(input, kind) + } +} + +fn parse_length(i: &[u8]) -> IResult<&[u8], u32, PgsqlParseError<&[u8]>> { + let res = verify(be_u32::<&[u8], nom7::error::Error<_>>, |&x| { + x >= PGSQL_LENGTH_FIELD + })(i); + match res { + Ok(result) => Ok((result.0, result.1)), + Err(nom7::Err::Incomplete(needed)) => Err(Err::Incomplete(needed)), + Err(_) => Err(Err::Error(PgsqlParseError::InvalidLength)), + } } #[derive(Debug, PartialEq, Eq)] @@ -529,7 +553,7 @@ impl From for PgsqlErrorNoticeFieldType { // standard_conforming_strings // (source: PostgreSQL documentation) // We may be interested, then, in controling this, somehow, to prevent weird things? -fn pgsql_parse_generic_parameter(i: &[u8]) -> IResult<&[u8], PgsqlParameter> { +fn pgsql_parse_generic_parameter(i: &[u8]) -> IResult<&[u8], PgsqlParameter, PgsqlParseError<&[u8]>> { let (i, param_name) = take_until1("\x00")(i)?; let (i, _) = tag("\x00")(i)?; let (i, param_value) = take_until("\x00")(i)?; @@ -543,7 +567,7 @@ fn pgsql_parse_generic_parameter(i: &[u8]) -> IResult<&[u8], PgsqlParameter> { )) } -pub fn pgsql_parse_startup_parameters(i: &[u8]) -> IResult<&[u8], PgsqlStartupParameters> { +pub fn pgsql_parse_startup_parameters(i: &[u8]) -> IResult<&[u8], PgsqlStartupParameters, PgsqlParseError<&[u8]>> { let (i, mut optional) = opt(terminated( many1(pgsql_parse_generic_parameter), tag("\x00"), @@ -577,7 +601,7 @@ pub fn pgsql_parse_startup_parameters(i: &[u8]) -> IResult<&[u8], PgsqlStartupPa fn parse_sasl_initial_response_payload( i: &[u8], -) -> IResult<&[u8], (SASLAuthenticationMechanism, u32, Vec)> { +) -> IResult<&[u8], (SASLAuthenticationMechanism, u32, Vec), PgsqlParseError<&[u8]>> { let (i, sasl_mechanism) = parse_sasl_mechanism(i)?; let (i, param_length) = be_u32(i)?; // From RFC 5802 - the client-first-message will always start w/ @@ -586,7 +610,7 @@ fn parse_sasl_initial_response_payload( Ok((i, (sasl_mechanism, param_length, param.to_vec()))) } -pub fn parse_sasl_initial_response(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +pub fn parse_sasl_initial_response(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'p')(i)?; let (i, length) = parse_length(i)?; let (i, payload) = map_parser( @@ -605,7 +629,7 @@ pub fn parse_sasl_initial_response(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { )) } -pub fn parse_sasl_response(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +pub fn parse_sasl_response(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'p')(i)?; let (i, length) = parse_length(i)?; let (i, payload) = take(length - PGSQL_LENGTH_FIELD)(i)?; @@ -617,10 +641,10 @@ pub fn parse_sasl_response(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { Ok((i, resp)) } -pub fn pgsql_parse_startup_packet(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { - let (i, len) = verify(be_u32, |&x| x >= 8)(i)?; +pub fn pgsql_parse_startup_packet(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { + let (i, length) = verify(be_u32, |&x| x >= 8)(i)?; let (i, proto_major) = peek(be_u16)(i)?; - let (i, b) = take(len - PGSQL_LENGTH_FIELD)(i)?; + let (i, b) = take(length - PGSQL_LENGTH_FIELD)(i)?; let (_, message) = match proto_major { 1..=3 => { let (b, proto_major) = be_u16(b)?; @@ -629,7 +653,7 @@ pub fn pgsql_parse_startup_packet(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { ( b, PgsqlFEMessage::StartupMessage(StartupPacket { - length: len, + length, proto_major, proto_minor, params, @@ -644,7 +668,7 @@ pub fn pgsql_parse_startup_packet(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { PGSQL_DUMMY_PROTO_MINOR_SSL => ( b, PgsqlFEMessage::SSLRequest(DummyStartupPacket { - length: len, + length, proto_major, proto_minor, }), @@ -672,7 +696,7 @@ pub fn pgsql_parse_startup_packet(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { // Source: https://www.postgresql.org/docs/13/protocol-flow.html#id-1.10.5.7.11, GSSAPI Session Encryption // Password can be encrypted or in cleartext -pub fn parse_password_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +pub fn parse_password_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'p')(i)?; let (i, length) = parse_length(i)?; let (i, password) = map_parser(take(length - PGSQL_LENGTH_FIELD), take_until1("\x00"))(i)?; @@ -686,7 +710,7 @@ pub fn parse_password_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { )) } -fn parse_simple_query(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +fn parse_simple_query(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'Q')(i)?; let (i, length) = parse_length(i)?; let (i, query) = map_parser(take(length - PGSQL_LENGTH_FIELD), take_until1("\x00"))(i)?; @@ -700,7 +724,7 @@ fn parse_simple_query(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { )) } -fn parse_cancel_request(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +fn parse_cancel_request(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, pid) = be_u32(i)?; let (i, backend_key) = be_u32(i)?; Ok(( @@ -709,7 +733,7 @@ fn parse_cancel_request(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { )) } -fn parse_terminate_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +fn parse_terminate_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'X')(i)?; let (i, length) = parse_length(i)?; Ok(( @@ -719,7 +743,7 @@ fn parse_terminate_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { } // Messages that begin with 'p' but are not password ones are not parsed here -pub fn parse_request(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { +pub fn parse_request(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlParseError<&[u8]>> { let (i, tag) = peek(be_u8)(i)?; let (i, message) = match tag { b'\0' => pgsql_parse_startup_packet(i)?, @@ -740,7 +764,7 @@ pub fn parse_request(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage> { Ok((i, message)) } -fn pgsql_parse_authentication_message<'a>(i: &'a [u8]) -> IResult<&'a [u8], PgsqlBEMessage> { +fn pgsql_parse_authentication_message<'a>(i: &'a [u8]) -> IResult<&'a [u8], PgsqlBEMessage, PgsqlParseError<&'a [u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'R')(i)?; let (i, length) = verify(be_u32, |&x| x >= 8)(i)?; let (i, auth_type) = be_u32(i)?; @@ -823,7 +847,7 @@ fn pgsql_parse_authentication_message<'a>(i: &'a [u8]) -> IResult<&'a [u8], Pgsq Ok((i, message)) } -fn parse_parameter_status_message(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn parse_parameter_status_message(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'S')(i)?; let (i, length) = parse_length(i)?; let (i, param) = map_parser( @@ -840,7 +864,7 @@ fn parse_parameter_status_message(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -pub fn parse_ssl_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +pub fn parse_ssl_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, tag) = alt((char('N'), char('S')))(i)?; Ok(( i, @@ -848,7 +872,7 @@ pub fn parse_ssl_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_backend_key_data_message(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn parse_backend_key_data_message(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'K')(i)?; let (i, length) = verify(be_u32, |&x| x == 12)(i)?; let (i, pid) = be_u32(i)?; @@ -864,7 +888,7 @@ fn parse_backend_key_data_message(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_command_complete(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn parse_command_complete(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'C')(i)?; let (i, length) = parse_length(i)?; let (i, payload) = map_parser(take(length - PGSQL_LENGTH_FIELD), take_until("\x00"))(i)?; @@ -878,7 +902,7 @@ fn parse_command_complete(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_ready_for_query(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn parse_ready_for_query(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'Z')(i)?; let (i, length) = verify(be_u32, |&x| x == 5)(i)?; let (i, status) = verify(be_u8, |&x| x == b'I' || x == b'T' || x == b'E')(i)?; @@ -892,7 +916,7 @@ fn parse_ready_for_query(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_row_field(i: &[u8]) -> IResult<&[u8], RowField> { +fn parse_row_field(i: &[u8]) -> IResult<&[u8], RowField, PgsqlParseError<&[u8]>> { let (i, field_name) = take_until1("\x00")(i)?; let (i, _) = tag("\x00")(i)?; let (i, table_oid) = be_u32(i)?; @@ -915,7 +939,7 @@ fn parse_row_field(i: &[u8]) -> IResult<&[u8], RowField> { )) } -pub fn parse_row_description(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +pub fn parse_row_description(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'T')(i)?; let (i, length) = verify(be_u32, |&x| x > 6)(i)?; let (i, field_count) = be_u16(i)?; @@ -934,7 +958,7 @@ pub fn parse_row_description(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_data_row_value(i: &[u8]) -> IResult<&[u8], ColumnFieldValue> { +fn parse_data_row_value(i: &[u8]) -> IResult<&[u8], ColumnFieldValue, PgsqlParseError<&[u8]>> { let (i, value_length) = be_i32(i)?; let (i, value) = cond(value_length >= 0, take(value_length as usize))(i)?; Ok(( @@ -966,7 +990,7 @@ fn add_up_data_size(columns: Vec) -> u64 { // Currently, we don't store the actual DataRow messages, as those could easily become a burden, memory-wise // We use ConsolidatedDataRow to store info we still want to log: message size. // Later on, we calculate the number of lines the command actually returned by counting ConsolidatedDataRow messages -pub fn parse_consolidated_data_row(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +pub fn parse_consolidated_data_row(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'D')(i)?; let (i, length) = verify(be_u32, |&x| x >= 6)(i)?; let (i, field_count) = be_u16(i)?; @@ -985,7 +1009,7 @@ pub fn parse_consolidated_data_row(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_sasl_mechanism(i: &[u8]) -> IResult<&[u8], SASLAuthenticationMechanism> { +fn parse_sasl_mechanism(i: &[u8]) -> IResult<&[u8], SASLAuthenticationMechanism, PgsqlParseError<&[u8]>> { let res: IResult<_, _, ()> = terminated(tag("SCRAM-SHA-256-PLUS"), tag("\x00"))(i); if let Ok((i, _)) = res { return Ok((i, SASLAuthenticationMechanism::ScramSha256Plus)); @@ -997,11 +1021,11 @@ fn parse_sasl_mechanism(i: &[u8]) -> IResult<&[u8], SASLAuthenticationMechanism> return Err(Err::Error(make_error(i, ErrorKind::Alt))); } -fn parse_sasl_mechanisms(i: &[u8]) -> IResult<&[u8], Vec> { +fn parse_sasl_mechanisms(i: &[u8]) -> IResult<&[u8], Vec, PgsqlParseError<&[u8]>> { terminated(many1(parse_sasl_mechanism), tag("\x00"))(i) } -pub fn parse_error_response_code(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMessageField> { +pub fn parse_error_response_code(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMessageField, PgsqlParseError<&[u8]>> { let (i, _field_type) = char('C')(i)?; let (i, field_value) = map_parser(take(6_usize), alphanumeric1)(i)?; Ok(( @@ -1015,7 +1039,7 @@ pub fn parse_error_response_code(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMes // Parse an error response with non-localizeable severity message. // Possible values: ERROR, FATAL, or PANIC -pub fn parse_error_response_severity(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMessageField> { +pub fn parse_error_response_severity(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMessageField, PgsqlParseError<&[u8]>> { let (i, field_type) = char('V')(i)?; let (i, field_value) = alt((tag("ERROR"), tag("FATAL"), tag("PANIC")))(i)?; let (i, _) = tag("\x00")(i)?; @@ -1030,7 +1054,7 @@ pub fn parse_error_response_severity(i: &[u8]) -> IResult<&[u8], PgsqlErrorNotic // The non-localizable version of Severity field has different values, // in case of a notice: 'WARNING', 'NOTICE', 'DEBUG', 'INFO' or 'LOG' -pub fn parse_notice_response_severity(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMessageField> { +pub fn parse_notice_response_severity(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoticeMessageField, PgsqlParseError<&[u8]>> { let (i, field_type) = char('V')(i)?; let (i, field_value) = alt(( tag("WARNING"), @@ -1051,7 +1075,7 @@ pub fn parse_notice_response_severity(i: &[u8]) -> IResult<&[u8], PgsqlErrorNoti pub fn parse_error_response_field( i: &[u8], is_err_msg: bool, -) -> IResult<&[u8], PgsqlErrorNoticeMessageField> { +) -> IResult<&[u8], PgsqlErrorNoticeMessageField, PgsqlParseError<&[u8]>> { let (i, field_type) = peek(be_u8)(i)?; let (i, data) = match field_type { b'V' => { @@ -1078,12 +1102,12 @@ pub fn parse_error_response_field( pub fn parse_error_notice_fields( i: &[u8], is_err_msg: bool, -) -> IResult<&[u8], Vec> { +) -> IResult<&[u8], Vec, PgsqlParseError<&[u8]>> { let (i, data) = many_till(|b| parse_error_response_field(b, is_err_msg), tag("\x00"))(i)?; Ok((i, data.0)) } -fn pgsql_parse_error_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn pgsql_parse_error_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'E')(i)?; let (i, length) = verify(be_u32, |&x| x > 10)(i)?; let (i, message_body) = map_parser(take(length - PGSQL_LENGTH_FIELD), |b| { @@ -1100,7 +1124,7 @@ fn pgsql_parse_error_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn pgsql_parse_notice_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn pgsql_parse_notice_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'N')(i)?; let (i, length) = verify(be_u32, |&x| x > 10)(i)?; let (i, message_body) = map_parser(take(length - PGSQL_LENGTH_FIELD), |b| { @@ -1116,7 +1140,7 @@ fn pgsql_parse_notice_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { )) } -fn parse_notification_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +fn parse_notification_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, identifier) = verify(be_u8, |&x| x == b'A')(i)?; // length (u32) + pid (u32) + at least one byte, for we have two str fields let (i, length) = verify(be_u32, |&x| x > 9)(i)?; @@ -1136,7 +1160,7 @@ fn parse_notification_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { Ok((i, msg)) } -pub fn pgsql_parse_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> { +pub fn pgsql_parse_response(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&[u8]>> { let (i, tag) = peek(be_u8)(i)?; let (i, message) = match tag { b'E' => pgsql_parse_error_response(i)?, @@ -1221,7 +1245,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Result should not be an error: {:?}.", err.code); + panic!("Result should not be an error: {:?}.", err); } Err(Err::Incomplete(_)) => { panic!("Result should not have been incomplete."); @@ -1264,7 +1288,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?}", needed); @@ -1301,7 +1325,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?}", needed); @@ -1523,8 +1547,8 @@ mod tests { } Err(Err::Error(err)) => { panic!( - "Shouldn't be err {:?}, expected Ok(_). Remainder is: {:?} ", - err.code, err.input + "Shouldn't be err {:?}, expected Ok(_).", + err ); } Err(Err::Incomplete(needed)) => { @@ -1632,7 +1656,7 @@ mod tests { Ok((_remainder, _message)) => panic!("Result should not be ok, but incomplete."), Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { assert_eq!(needed, Needed::new(2)); @@ -1703,7 +1727,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?}", needed); @@ -1799,7 +1823,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?} ", needed); @@ -1833,7 +1857,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?}", needed); @@ -1868,7 +1892,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?}", needed); @@ -1882,7 +1906,7 @@ mod tests { match incomplete_result { Ok((_remainder, _message)) => panic!("Should not be Ok(_), expected Incomplete!"), Err(Err::Error(err)) => { - panic!("Should not be error {:?}, expected Incomplete!", err.code) + panic!("Should not be error {:?}, expected Incomplete!", err) } Err(Err::Incomplete(needed)) => assert_eq!(needed, Needed::new(16)), _ => panic!("Unexpected behavior, expected Incomplete."), @@ -1918,7 +1942,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error {:?} expected Ok(_)", err.code) + panic!("Shouldn't be error {:?} expected Ok(_)", err) } Err(Err::Incomplete(needed)) => { panic!("shouldn't be incomplete {:?}, expected Ok(_)", needed) @@ -1930,7 +1954,7 @@ mod tests { match result_incomplete { Ok((_remainder, _message)) => panic!("Should not be Ok(_), expected Incomplete!"), Err(Err::Error(err)) => { - panic!("Shouldn't be error {:?} expected Incomplete!", err.code) + panic!("Shouldn't be error {:?} expected Incomplete!", err) } Err(Err::Incomplete(needed)) => { assert_eq!(needed, Needed::new(62)); @@ -1962,7 +1986,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error {:?}, expected Ok(_)", err.code); + panic!("Shouldn't be error {:?}, expected Ok(_)", err); } Err(Err::Incomplete(needed)) => { panic!("Shouldn't be incomplete {:?}, expected OK(_)", needed); @@ -2023,7 +2047,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error {:?}, expected Ok(_)", err.code) + panic!("Shouldn't be error {:?}, expected Ok(_)", err) } Err(Err::Incomplete(needed)) => { panic!("Shouldn't be incomplete: {:?}, expected Ok(_)", needed) @@ -2056,7 +2080,7 @@ mod tests { assert_eq!(message, ok_res); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?} expected Ok(_)", err.code) + panic!("Shouldn't be error: {:?} expected Ok(_)", err) } Err(Err::Incomplete(needed)) => { panic!("Shouldn't be incomplete: {:?}, expected Ok(_)", needed) @@ -2121,7 +2145,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be Incomplete! Needed: {:?}", needed); @@ -2146,7 +2170,7 @@ mod tests { assert_eq!(message, ok_res); } Err(Err::Error(err)) => { - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be incomplete. Needed {:?}", needed); @@ -2178,7 +2202,7 @@ mod tests { assert_eq!(remainder.len(), 0); } Err(Err::Error(err)) => { - panic!("Should not be error {:?}", err.code); + panic!("Should not be error {:?}", err); } Err(Err::Incomplete(needed)) => { panic!("Should not be incomplete. Needed: {:?}", needed); @@ -2296,8 +2320,7 @@ mod tests { panic!("Should not be Incomplete! Needed: {:?}", needed); } Err(Err::Error(err)) => { - println!("Remainder is: {:?}", err.input); - panic!("Shouldn't be error: {:?}", err.code); + panic!("Shouldn't be error: {:?}", err); } _ => { panic!("Unexpected behavior"); @@ -2343,8 +2366,7 @@ mod tests { ); } Err(Err::Error(err)) => { - println!("Unparsed slice: {:?}", err.input); - panic!("Shouldn't be Error: {:?}, expected Ok()", err.code); + panic!("Shouldn't be Error: {:?}, expected Ok()", err); } _ => { panic!("Unexpected behavior, should be Ok()"); diff --git a/rust/src/pgsql/pgsql.rs b/rust/src/pgsql/pgsql.rs index 0ea9d61067..db57fe1e09 100644 --- a/rust/src/pgsql/pgsql.rs +++ b/rust/src/pgsql/pgsql.rs @@ -19,6 +19,7 @@ //! PostgreSQL parser +use super::parser::PgsqlParseError; use super::parser::{self, ConsolidatedDataRowPacket, PgsqlBEMessage, PgsqlFEMessage}; use crate::applayer::*; use crate::conf::*; @@ -289,7 +290,7 @@ impl PgsqlState { fn state_based_req_parsing( state: PgsqlStateProgress, input: &[u8], - ) -> IResult<&[u8], parser::PgsqlFEMessage> { + ) -> IResult<&[u8], parser::PgsqlFEMessage, PgsqlParseError<&[u8]>> { match state { PgsqlStateProgress::SASLAuthenticationReceived => { parser::parse_sasl_initial_response(input) @@ -473,7 +474,7 @@ impl PgsqlState { fn state_based_resp_parsing( state: PgsqlStateProgress, input: &[u8], - ) -> IResult<&[u8], parser::PgsqlBEMessage> { + ) -> IResult<&[u8], parser::PgsqlBEMessage, PgsqlParseError<&[u8]>> { if state == PgsqlStateProgress::SSLRequestReceived { parser::parse_ssl_response(input) } else {