tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/tools/systemd/parse_time.rs: check max values

Browse Source
This commit is contained in:
Dietmar Maurer 2020-05-16 13:13:50 +02:00
parent 2d08c97ae2
commit 7a314d18f7
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/tools/systemd/parse_time.rs
View File

@ -18,7 +18,7 @@ type IResult<I, O, E = VerboseError<I>> = Result<(I, O), nom::Err<E>>;
fn parse_error<'a>(i: &'a str, context: &'static str) -> nom::Err<VerboseError<&'a str>> { fn parse_error<'a>(i: &'a str, context: &'static str) -> nom::Err<VerboseError<&'a str>> {
let err = VerboseError { errors: Vec::new() }; let err = VerboseError { errors: Vec::new() };
let err =VerboseError::add_context(i, context, err); let err = VerboseError::add_context(i, context, err);
nom::Err::Error(err) nom::Err::Error(err)
} }
@ -90,8 +90,14 @@ lazy_static! {
map map
}; };
} }
fn parse_u32(i: &str) -> IResult<&str, u32> { fn parse_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, u32> {
map_res(recognize(digit1), str::parse)(i) move |i: &str| {
let (i, v) = map_res(recognize(digit1), str::parse)(i)?;
if (v as usize) >= max {
return Err(parse_error(i, "time value too large"));
}
Ok((i, v))
}
} }
fn parse_u64(i: &str) -> IResult<&str, u64> { fn parse_u64(i: &str) -> IResult<&str, u64> {
@ -142,38 +148,40 @@ fn parse_weekdays_range(i: &str) -> IResult<&str, WeekDays> {
} }
} }
fn parse_date_time_comp(i: &str) -> IResult<&str, DateTimeValue> { fn parse_date_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, DateTimeValue> {
move |i: &str| {
let (i, value) = parse_time_comp(max)(i)?;
let (i, value) = parse_u32(i)?; if let (i, Some(end)) = opt(preceded(tag(".."), parse_time_comp(max)))(i)? {
if let (i, Some(end)) = opt(preceded(tag(".."), parse_u32))(i)? {
return Ok((i, DateTimeValue::Range(value, end))) return Ok((i, DateTimeValue::Range(value, end)))
} }
if i.starts_with("/") { if i.starts_with("/") {
let i = &i[1..]; let i = &i[1..];
let (i, repeat) = parse_u32(i)?; let (i, repeat) = parse_time_comp(max)(i)?;
Ok((i, DateTimeValue::Repeated(value, repeat))) Ok((i, DateTimeValue::Repeated(value, repeat)))
} else { } else {
Ok((i, DateTimeValue::Single(value))) Ok((i, DateTimeValue::Single(value)))
} }
}
} }
fn parse_date_time_comp_list(i: &str) -> IResult<&str, Vec<DateTimeValue>> { fn parse_date_time_comp_list(max: usize) -> impl Fn(&str) -> IResult<&str, Vec<DateTimeValue>> {
move |i: &str| {
if i.starts_with("*") { if i.starts_with("*") {
return Ok((&i[1..], Vec::new())); return Ok((&i[1..], Vec::new()));
} }
separated_nonempty_list(tag(","), parse_date_time_comp)(i) separated_nonempty_list(tag(","), parse_date_time_comp(max))(i)
}
} }
fn parse_time_spec(i: &str) -> IResult<&str, (Vec<DateTimeValue>, Vec<DateTimeValue>, Vec<DateTimeValue>)> { fn parse_time_spec(i: &str) -> IResult<&str, (Vec<DateTimeValue>, Vec<DateTimeValue>, Vec<DateTimeValue>)> {
let (i, (hour, minute, opt_second)) = tuple(( let (i, (hour, minute, opt_second)) = tuple((
parse_date_time_comp_list, parse_date_time_comp_list(24),
preceded(tag(":"), parse_date_time_comp_list), preceded(tag(":"), parse_date_time_comp_list(60)),
opt(preceded(tag(":"), parse_date_time_comp_list)), opt(preceded(tag(":"), parse_date_time_comp_list(60))),
))(i)?; ))(i)?;
if let Some(second) = opt_second { if let Some(second) = opt_second {