rodolphe/rust-opensmtpd
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add the data-line filter

Browse source
This commit is contained in:
Rodolphe Bréard 2020-11-28 12:10:22 +01:00
parent 0a4ac5a709
commit 1ac792ed6b
6 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/parsers/entry.rs
View file

@ -26,22 +26,13 @@ pub struct FilterEntry {
pub token: String,
}
pub struct DataLineEntry {
pub session_id: String,
pub token: String,
}
pub(crate) enum EntryOption {
Report(ReportEntry),
Filter(FilterEntry),
DataLine(DataLineEntry),
}
pub(crate) fn parse_entry(input: &[u8]) -> IResult<&[u8], EntryOption> {
let (input, entry) = alt((
parse_report_entry_meta,
alt((parse_filter_entry_meta, parse_data_line_entry_meta)),
))(input)?;
let (input, entry) = alt((parse_report_entry_meta, parse_filter_entry_meta))(input)?;
Ok((input, entry))
}
@ -59,13 +50,6 @@ fn parse_filter_entry_meta(input: &[u8]) -> IResult<&[u8], EntryOption> {
Ok((input, EntryOption::Filter(entry)))
}
fn parse_data_line_entry_meta(input: &[u8]) -> IResult<&[u8], EntryOption> {
let (input, _) = tag("filter-dataline")(input)?;
let (input, _) = parse_delimiter(input)?;
let (input, data_line) = parse_data_line_entry(input)?;
Ok((input, EntryOption::DataLine(data_line)))
}
fn parse_report_entry(input: &[u8]) -> IResult<&[u8], ReportEntry> {
let (input, version) = parse_string_parameter(input)?;
let (input, _) = parse_delimiter(input)?;
@ -109,14 +93,6 @@ fn parse_filter_entry(input: &[u8]) -> IResult<&[u8], FilterEntry> {
Ok((input, entry))
}
fn parse_data_line_entry(input: &[u8]) -> IResult<&[u8], DataLineEntry> {
let (input, session_id) = parse_string_parameter(input)?;
let (input, _) = parse_delimiter(input)?;
let (input, token) = parse_string_parameter(input)?;
let entry = DataLineEntry { session_id, token };
Ok((input, entry))
}
fn parse_timestamp(input: &[u8]) -> IResult<&[u8], TimeVal> {
let (input, sec) = map_res(digit1, |s| String::from_utf8_lossy(s).parse::<i64>())(input)?;
let (input, _) = tag(".")(input)?;