grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CLI: Reject invalid argument values rather than ignore them (#6723) (#6747)

Browse Source 
* CLI: Reject invalid argument values rather than ignore them

* Fix grumbles
This commit is contained in:
Arkadiy Paronyan 2017-10-13 16:34:21 +02:00 committed by GitHub
parent 2145388103
commit d9a92c2bea
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parity/cli/mod.rs
View File

@ -1203,6 +1203,16 @@ mod tests {
use toml; use toml;
use clap::{ErrorKind as ClapErrorKind}; use clap::{ErrorKind as ClapErrorKind};
#[test]
fn should_reject_invalid_values() {
let args = Args::parse(&["parity", "--cache=20"]);
assert!(args.is_ok());
let args = Args::parse(&["parity", "--cache=asd"]);
assert!(args.is_err());
}
#[test] #[test]
fn should_parse_args_and_flags() { fn should_parse_args_and_flags() {
let args = Args::parse(&["parity", "--no-warp"]).unwrap(); let args = Args::parse(&["parity", "--no-warp"]).unwrap();

52
parity/cli/usage.rs
View File

@ -32,6 +32,20 @@ macro_rules! otry {
) )
} }
macro_rules! return_if_parse_error {
($e:expr) => (
match $e {
Err(clap_error @ ClapError { kind: ClapErrorKind::ValueValidation, .. }) => {
return Err(clap_error);
},
// Otherwise, if $e is ClapErrorKind::ArgumentNotFound or Ok(),
// then convert to Option
_ => $e.ok()
}
)
}
macro_rules! if_option { macro_rules! if_option {
(Option<$type:ty>, THEN {$($then:tt)*} ELSE {$($otherwise:tt)*}) => ( (Option<$type:ty>, THEN {$($then:tt)*} ELSE {$($otherwise:tt)*}) => (
$($then)* $($then)*
@ -139,7 +153,7 @@ macro_rules! usage {
use std::{fs, io, process}; use std::{fs, io, process};
use std::io::{Read, Write}; use std::io::{Read, Write};
use util::version; use util::version;
use clap::{Arg, App, SubCommand, AppSettings, Error as ClapError}; use clap::{Arg, App, SubCommand, AppSettings, Error as ClapError, ErrorKind as ClapErrorKind};
use helpers::replace_home; use helpers::replace_home;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::collections::HashMap; use std::collections::HashMap;
@ -563,23 +577,23 @@ macro_rules! usage {
raw_args.$flag = matches.is_present(stringify!($flag)); raw_args.$flag = matches.is_present(stringify!($flag));
)* )*
$( $(
raw_args.$arg = if_option!( raw_args.$arg = return_if_parse_error!(if_option!(
$($arg_type_tt)+, $($arg_type_tt)+,
THEN { THEN {
if_option_vec!( if_option_vec!(
$($arg_type_tt)+, $($arg_type_tt)+,
THEN { values_t!(matches, stringify!($arg), inner_option_vec_type!($($arg_type_tt)+)).ok() } THEN { values_t!(matches, stringify!($arg), inner_option_vec_type!($($arg_type_tt)+)) }
ELSE { value_t!(matches, stringify!($arg), inner_option_type!($($arg_type_tt)+)).ok() } ELSE { value_t!(matches, stringify!($arg), inner_option_type!($($arg_type_tt)+)) }
) )
} }
ELSE { ELSE {
if_vec!( if_vec!(
$($arg_type_tt)+, $($arg_type_tt)+,
THEN { values_t!(matches, stringify!($arg), inner_vec_type!($($arg_type_tt)+)).ok() } THEN { values_t!(matches, stringify!($arg), inner_vec_type!($($arg_type_tt)+)) }
ELSE { value_t!(matches, stringify!($arg), $($arg_type_tt)+).ok() } ELSE { value_t!(matches, stringify!($arg), $($arg_type_tt)+) }
) )
} }
); ));
)* )*
)* )*
@ -594,23 +608,23 @@ macro_rules! usage {
)* )*
// Subcommand arguments // Subcommand arguments
$( $(
raw_args.$subc_arg = if_option!( raw_args.$subc_arg = return_if_parse_error!(if_option!(
$($subc_arg_type_tt)+, $($subc_arg_type_tt)+,
THEN { THEN {
if_option_vec!( if_option_vec!(
$($subc_arg_type_tt)+, $($subc_arg_type_tt)+,
THEN { values_t!(submatches, stringify!($subc_arg), inner_option_vec_type!($($subc_arg_type_tt)+)).ok() } THEN { values_t!(submatches, stringify!($subc_arg), inner_option_vec_type!($($subc_arg_type_tt)+)) }
ELSE { value_t!(submatches, stringify!($subc_arg), inner_option_type!($($subc_arg_type_tt)+)).ok() } ELSE { value_t!(submatches, stringify!($subc_arg), inner_option_type!($($subc_arg_type_tt)+)) }
) )
} }
ELSE { ELSE {
if_vec!( if_vec!(
$($subc_arg_type_tt)+, $($subc_arg_type_tt)+,
THEN { values_t!(submatches, stringify!($subc_arg), inner_vec_type!($($subc_arg_type_tt)+)).ok() } THEN { values_t!(submatches, stringify!($subc_arg), inner_vec_type!($($subc_arg_type_tt)+)) }
ELSE { value_t!(submatches, stringify!($subc_arg), $($subc_arg_type_tt)+).ok() } ELSE { value_t!(submatches, stringify!($subc_arg), $($subc_arg_type_tt)+) }
) )
} }
); ));
)* )*
// Sub-subcommands // Sub-subcommands
@ -624,23 +638,23 @@ macro_rules! usage {
)* )*
// Sub-subcommand arguments // Sub-subcommand arguments
$( $(
raw_args.$subc_subc_arg = if_option!( raw_args.$subc_subc_arg = return_if_parse_error!(if_option!(
$($subc_subc_arg_type_tt)+, $($subc_subc_arg_type_tt)+,
THEN { THEN {
if_option_vec!( if_option_vec!(
$($subc_subc_arg_type_tt)+, $($subc_subc_arg_type_tt)+,
THEN { values_t!(subsubmatches, stringify!($subc_subc_arg), inner_option_vec_type!($($subc_subc_arg_type_tt)+)).ok() } THEN { values_t!(subsubmatches, stringify!($subc_subc_arg), inner_option_vec_type!($($subc_subc_arg_type_tt)+)) }
ELSE { value_t!(subsubmatches, stringify!($subc_subc_arg), inner_option_type!($($subc_subc_arg_type_tt)+)).ok() } ELSE { value_t!(subsubmatches, stringify!($subc_subc_arg), inner_option_type!($($subc_subc_arg_type_tt)+)) }
) )
} }
ELSE { ELSE {
if_vec!( if_vec!(
$($subc_subc_arg_type_tt)+, $($subc_subc_arg_type_tt)+,
THEN { values_t!(subsubmatches, stringify!($subc_subc_arg), inner_vec_type!($($subc_subc_arg_type_tt)+)).ok() } THEN { values_t!(subsubmatches, stringify!($subc_subc_arg), inner_vec_type!($($subc_subc_arg_type_tt)+)) }
ELSE { value_t!(subsubmatches, stringify!($subc_subc_arg), $($subc_subc_arg_type_tt)+).ok() } ELSE { value_t!(subsubmatches, stringify!($subc_subc_arg), $($subc_subc_arg_type_tt)+) }
) )
} }
); ));
)* )*
} }
else { else {