aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rust/asn1: convert parsers to nom7

Browse Source
pull/7948/head
Pierre Chifflier 5 years ago committed by Victor Julien
parent 0ba0572c4a
commit 378e915846
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

7
rust/src/asn1/mod.rs
Unescape Escape View File

@ -16,6 +16,7 @@
*/
use der_parser::ber::{parse_ber_recursive, BerObject, BerObjectContent, BerTag};
use nom7::Err;
use std::convert::TryFrom;
mod parse_rules;
@ -30,7 +31,7 @@ pub struct Asn1<'a>(Vec<BerObject<'a>>);
enum Asn1DecodeError {
InvalidKeywordParameter,
MaxFrames,
BerError(nom::Err<der_parser::error::BerError>),
BerError(Err<der_parser::error::BerError>),
}
/// Enumeration of Asn1 checks
@ -278,8 +279,8 @@ impl From<std::num::TryFromIntError> for Asn1DecodeError {
}
}
impl From<nom::Err<der_parser::error::BerError>> for Asn1DecodeError {
fn from(e: nom::Err<der_parser::error::BerError>) -> Asn1DecodeError {
impl From<Err<der_parser::error::BerError>> for Asn1DecodeError {
fn from(e: Err<der_parser::error::BerError>) -> Asn1DecodeError {
Asn1DecodeError::BerError(e)
}
}

47
rust/src/asn1/parse_rules.rs
Unescape Escape View File

@ -15,12 +15,13 @@
* 02110-1301, USA.
*/
use nom::branch::alt;
use nom::bytes::complete::tag;
use nom::character::complete::{digit1, multispace0, multispace1};
use nom::combinator::{map_res, opt, verify};
use nom::sequence::{separated_pair, tuple};
use nom::IResult;
use nom7::branch::alt;
use nom7::bytes::complete::tag;
use nom7::character::complete::{digit1, multispace0, multispace1};
use nom7::combinator::{map_res, opt, verify};
use nom7::error::{make_error, ErrorKind};
use nom7::sequence::{separated_pair, tuple};
use nom7::{Err, IResult};
use std::ffi::CStr;
use std::os::raw::c_char;
@ -124,9 +125,9 @@ fn parse_i32_number(input: &str) -> IResult<&str, i32> {
pub(super) fn asn1_parse_rule(input: &str) -> IResult<&str, DetectAsn1Data> {
// If nothing to parse, return
if input.is_empty() {
return Err(nom::Err::Error(nom::error::make_error(
return Err(Err::Error(make_error(
input,
nom::error::ErrorKind::Eof,
ErrorKind::Eof,
)));
}
@ -195,9 +196,9 @@ pub(super) fn asn1_parse_rule(input: &str) -> IResult<&str, DetectAsn1Data> {
} else if let Some((_, v)) = relative_offset {
data.relative_offset = Some(v);
} else {
return Err(nom::Err::Error(nom::error::make_error(
return Err(Err::Error(make_error(
rest,
nom::error::ErrorKind::Verify,
ErrorKind::Verify,
)));
}
@ -220,16 +221,16 @@ mod tests {
DetectAsn1Data { oversize_length: Some(0), ..Default::default()};
"check lower bound on oversize_length")]
#[test_case("oversize_length -1",
DetectAsn1Data::default() => panics "Error((\"oversize_length -1\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "oversize_length -1", code: Verify }"#;
"check under lower bound on oversize_length")]
#[test_case("oversize_length 4294967295",
DetectAsn1Data { oversize_length: Some(4294967295), ..Default::default()};
"check upper bound on oversize_length")]
#[test_case("oversize_length 4294967296",
DetectAsn1Data::default() => panics "Error((\"oversize_length 4294967296\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "oversize_length 4294967296", code: Verify }"#;
"check over upper bound on oversize_length")]
#[test_case("oversize_length",
DetectAsn1Data::default() => panics "Error((\"oversize_length\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "oversize_length", code: Verify }"#;
"check that we fail if the needed arg oversize_length is not given")]
// Test absolute_offset
#[test_case("absolute_offset 1024",
@ -239,16 +240,16 @@ mod tests {
DetectAsn1Data { absolute_offset: Some(0), ..Default::default()};
"check lower bound on absolute_offset")]
#[test_case("absolute_offset -1",
DetectAsn1Data::default() => panics "Error((\"absolute_offset -1\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "absolute_offset -1", code: Verify }"#;
"check under lower bound on absolute_offset")]
#[test_case("absolute_offset 65535",
DetectAsn1Data { absolute_offset: Some(65535), ..Default::default()};
"check upper bound on absolute_offset")]
#[test_case("absolute_offset 65536",
DetectAsn1Data::default() => panics "Error((\"absolute_offset 65536\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "absolute_offset 65536", code: Verify }"#;
"check over upper bound on absolute_offset")]
#[test_case("absolute_offset",
DetectAsn1Data::default() => panics "Error((\"absolute_offset\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "absolute_offset", code: Verify }"#;
"check that we fail if the needed arg absolute_offset is not given")]
// Test relative_offset
#[test_case("relative_offset 1024",
@ -258,16 +259,16 @@ mod tests {
DetectAsn1Data { relative_offset: Some(-65535), ..Default::default()};
"check lower bound on relative_offset")]
#[test_case("relative_offset -65536",
DetectAsn1Data::default() => panics "Error((\"relative_offset -65536\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "relative_offset -65536", code: Verify }"#;
"check under lower bound on relative_offset")]
#[test_case("relative_offset 65535",
DetectAsn1Data { relative_offset: Some(65535), ..Default::default()};
"check upper bound on relative_offset")]
#[test_case("relative_offset 65536",
DetectAsn1Data::default() => panics "Error((\"relative_offset 65536\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "relative_offset 65536", code: Verify }"#;
"check over upper bound on relative_offset")]
#[test_case("relative_offset",
DetectAsn1Data::default() => panics "Error((\"relative_offset\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "relative_offset", code: Verify }"#;
"check that we fail if the needed arg relative_offset is not given")]
// Test bitstring_overflow
#[test_case("bitstring_overflow",
@ -304,17 +305,17 @@ mod tests {
"2. check for combinations of keywords (space/comma/newline seperated)")]
// Test empty
#[test_case("",
DetectAsn1Data::default() => panics "Error((\"\", Eof))";
DetectAsn1Data::default() => panics r#"Error { input: "", code: Eof }"#;
"test that we break with a empty string")]
// Test invalid rules
#[test_case("oversize_length 1024, some_other_param 360",
DetectAsn1Data::default() => panics "Error((\" some_other_param 360\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: " some_other_param 360", code: Verify }"#;
"test that we break on invalid options")]
#[test_case("oversize_length 1024,,",
DetectAsn1Data::default() => panics "Error((\",\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: ",", code: Verify }"#;
"test that we break on invalid format (missing option)")]
#[test_case("bitstring_overflowabsolute_offset",
DetectAsn1Data::default() => panics "Error((\"absolute_offset\", Verify))";
DetectAsn1Data::default() => panics r#"Error { input: "absolute_offset", code: Verify }"#;
"test that we break on invalid format (missing seperator)")]
fn test_asn1_parse_rule(input: &str, expected: DetectAsn1Data) {
let (rest, res) = asn1_parse_rule(input).unwrap();

Write Preview
Loading…
Cancel
Save