Oleksandr Kozachuk
d44a54002b
Matches the prefix-name default, the README, and the app's own help text (which already says the default is six memorable words). Explicit modes are unaffected, so existing catalogs round-trip unchanged.
434 lines
19 KiB
Rust
434 lines
19 KiB
Rust
extern crate peg;
|
|
|
|
use crate::password::Password;
|
|
use crate::structs::{Command, LKErr, Mode};
|
|
use crate::utils::date::Date;
|
|
|
|
peg::parser! {
|
|
pub grammar command_parser() for str {
|
|
pub rule cmd() -> Command<'input> = c:(info_cmd_list() / mod_cmd_list() / enc_cmd_list() / asides_cmd_list()) { c }
|
|
pub rule info_cmd_list() -> Command<'input> = space()* c:(ls_cmd() / ld_cmd() / pb_cmd() / save_cmd() / save_def_cmd() / dump_cmd()) { c }
|
|
pub rule mod_cmd_list() -> Command<'input> = space()* c:(add_cmd() / keep_cmd() / mv_cmd() / rm_cmd() / comment_cmd ()) { c }
|
|
pub rule asides_cmd_list() -> Command<'input> = space()* c:(help_cmd() / source_cmd() / set_cmd() / quit_cmd() / noop_cmd() / error_cmd()) { c }
|
|
pub rule enc_cmd_list() -> Command<'input> = space()* c:(enc_cmd() / gen_cmd() / pass_cmd() / unpass_cmd() / correct_cmd() / uncorrect_cmd()) { c }
|
|
pub rule script() -> Vec<Command<'input>> = c:(info_cmd_list() / mod_cmd_list() / enc_cmd_list() / asides_cmd_list()) ++ "\n" { c }
|
|
|
|
rule space() -> &'input str = s:$(
|
|
" " // Space (U+0020)
|
|
/ "\u{00A0}" // Non-breaking space (U+00A0)
|
|
/ "\u{2009}" // Thin space (U+2009)
|
|
/ "\u{2003}" // Em space (U+2003)
|
|
/ "\u{2002}" // En space (U+2002)
|
|
/ "\t" // Tab (U+0009)
|
|
// / "\n" // Line feed (U+000A)
|
|
/ "\r" // Carriage return (U+000D)
|
|
/ "\u{000C}" // Form feed (U+000C)
|
|
/ "\u{200B}" // Zero-width space (U+200B)
|
|
/ "\u{3000}" // Ideographic space (U+3000)
|
|
) { s }
|
|
rule _() -> &'input str = s:$(space()+) { s }
|
|
rule comment() -> String = _ c:$([' '..='~']+) { c.to_string() }
|
|
rule word() -> String = n:$(['!'..='~']+) { n.to_string() }
|
|
rule num() -> u32 = n:$(['0'..='9']+) {? n.parse().or(Err("not a number")) }
|
|
|
|
rule pname() -> Password = &(word() _ word() _ num()? mode() _ num() _ date()) pr:word() _ pn:word() _ pl:num()? pm:mode() _ ps:num() _ pd:date() pc:comment()?
|
|
{ Password::new(Some(pr), pn, pl, pm, ps, pd, pc) }
|
|
rule jname() -> Password = &(word() _ num()? mode() _ num() _ date()) pn:word() _ pl:num()? pm:mode() _ ps:num() _ pd:date() pc:comment()?
|
|
{ Password::new(None, pn, pl, pm, ps, pd, pc) }
|
|
rule mname() -> Password = &(word() _ word() _ num()? mode() _ date()) pr:word() _ pn:word() _ pl:num()? pm:mode() _ pd:date() pc:comment()?
|
|
{ Password::new(Some(pr), pn, pl, pm, 99, pd, pc) }
|
|
// prefix + name + [len]mode (no seq/date) -> defaults seq 99, date now
|
|
rule npname() -> Password = &(word() _ word() _ num()? mode()) pr:word() _ pn:word() _ pl:num()? pm:mode()
|
|
{ Password::new(Some(pr), pn, pl, pm, 99, Date::now(), None) }
|
|
rule sname() -> Password = &(word() _ num()? mode() _ date()) pn:word() _ pl:num()? pm:mode() _ pd:date() pc:comment()?
|
|
{ Password::new(None, pn, pl, pm, 99, pd, pc) }
|
|
rule nname() -> Password = &(word() _ num()? mode()) pn:word() _ pl:num()? pm:mode()
|
|
{ Password::new(None, pn, pl, pm, 99, Date::now(), None) }
|
|
// prefix + name only -> defaults mode R, seq 99, date now
|
|
rule qpname() -> Password = &(word() _ word()) pr:word() _ pn:word()
|
|
{ Password::new(Some(pr), pn, None, Mode::Regular, 99, Date::now(), None) }
|
|
rule qname() -> Password = &(word()) pn:word()
|
|
{ Password::new(None, pn, None, Mode::Regular, 99, Date::now(), None) }
|
|
pub rule name() -> Password = name:(jname() / pname() / mname() / npname() / sname() / nname() / qpname() / qname())? {?
|
|
match name { Some(n) => Ok(n), None => Err("failed to parse password description") }
|
|
}
|
|
|
|
rule ndate() -> Date = y:$("-"? ['0'..='9']*<1,4>) "-" m:$(['0'..='9']*<1,2>) "-" d:$(['0'..='9']*<1,2>) {?
|
|
let year: i32 = match y.parse() { Ok(n) => n, Err(_) => return Err("year") };
|
|
let month: u32 = match m.parse() { Ok(n) => n, Err(_) => return Err("month") };
|
|
let day: u32 = match d.parse() { Ok(n) => n, Err(_) => return Err("day") };
|
|
Date::try_new(year, month, day)
|
|
}
|
|
rule cdate() -> Date = "now" { Date::now() }
|
|
rule date() -> Date = d:(ndate() / cdate()) { d }
|
|
rule umode() -> Mode = ("U" / "u") m:$("R" / "r" / "N" / "n" / "H" / "h" / "B" / "b") {?
|
|
match m.to_uppercase().as_str() {
|
|
"R" => Ok(Mode::RegularUpcase),
|
|
"N" => Ok(Mode::NoSpaceUpcase),
|
|
"H" => Ok(Mode::HexUpcase),
|
|
"B" => Ok(Mode::Base64Upcase),
|
|
_ => Err("unknown mode"),
|
|
}
|
|
}
|
|
rule rmode() -> Mode = m:$("R" / "r" / "U" / "u" / "N" / "n" / "C" / "c" / "H" / "h" / "B" / "b" / "D" / "d") {?
|
|
match m.to_uppercase().as_str() {
|
|
"R" => Ok(Mode::Regular),
|
|
"N" => Ok(Mode::NoSpace),
|
|
"C" => Ok(Mode::NoSpaceCamel),
|
|
"U" => Ok(Mode::RegularUpcase),
|
|
"H" => Ok(Mode::Hex),
|
|
"B" => Ok(Mode::Base64),
|
|
"D" => Ok(Mode::Decimal),
|
|
_ => Err("unknown mode"),
|
|
}
|
|
}
|
|
rule mode() -> Mode = m:(umode() / rmode()) { m }
|
|
|
|
rule noop_cmd() -> Command<'input> = ("#" [' '..='~']*)? { Command::Noop }
|
|
rule help_cmd() -> Command<'input> = "help" { Command::Help }
|
|
rule quit_cmd() -> Command<'input> = "quit" { Command::Quit }
|
|
rule pb_cmd() -> Command<'input> = "pb" _ e:$(([' '..='~'])+) { Command::PasteBuffer(e.to_string()) }
|
|
rule save_cmd() -> Command<'input> = "save" _ s:$(([' '..='~'])+) { Command::Dump(Some(s.to_string())) }
|
|
rule save_def_cmd() -> Command<'input> = "save" { Command::Dump(None) }
|
|
rule dump_cmd() -> Command<'input> = "dump" { Command::Dump(Some("-".to_string())) }
|
|
rule source_cmd() -> Command<'input> = "source" _ s:$(([' '..='~'])+) { Command::Source(s.to_string()) }
|
|
rule set_cmd() -> Command<'input> = "set" _ k:word() _ v:$(([' '..='~'])+) { Command::Set(k, v.to_string()) }
|
|
rule ls_cmd() -> Command<'input> = "ls" f:comment()? { Command::Ls(f.unwrap_or(".".to_string())) }
|
|
rule ld_cmd() -> Command<'input> = "ld" f:comment()? { Command::Ld(f.unwrap_or(".".to_string())) }
|
|
rule add_cmd() -> Command<'input> = "add" _ name:name() { Command::Add(Password::from_password(name)) }
|
|
rule keep_cmd() -> Command<'input> = "keep" _ name:word() { Command::Keep(name.to_string()) }
|
|
rule gen_cmd() -> Command<'input> = "gen" n:num()? _ name:name() {
|
|
Command::Gen(match n { Some(n) => n, None => 10_u32 }, Password::from_password(name))
|
|
}
|
|
rule error_cmd() -> Command<'input> = "error" _ e:$(([' '..='~'])+) { Command::Error(LKErr::Error(e)) }
|
|
rule mv_cmd() -> Command<'input> = "mv" _ name:word() _ folder:word() { Command::Mv(name, folder) }
|
|
rule pass_short_cmd() -> Command<'input> = "pass" _ name:word() { Command::Pass(name, None) }
|
|
rule pass_long_cmd() -> Command<'input> = "pass" _ name:word() _ pass:$(([' '..='~'])+) { Command::Pass(name, Some(pass.to_string())) }
|
|
rule pass_cmd() -> Command<'input> = p:(pass_long_cmd() / pass_short_cmd()) { p }
|
|
rule correct_cmd() -> Command<'input> = "correct" _ name:word() { Command::Correct(name) }
|
|
rule uncorrect_cmd() -> Command<'input> = "uncorrect" _ name:word() { Command::Uncorrect(name) }
|
|
rule unpass_cmd() -> Command<'input> = "unpass" _ name:word() { Command::UnPass(name) }
|
|
rule enc_cmd() -> Command<'input> = "enc" _ name:word() { Command::Enc(name) }
|
|
rule rm_cmd() -> Command<'input> = "rm" _ name:word() { Command::Rm(name) }
|
|
rule comment_cmd() -> Command<'input> = "comment" _ name:word() c:comment()? { Command::Comment(name, c) }
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn parse_script_test() {
|
|
assert_eq!(
|
|
command_parser::script(
|
|
r###"add t1 C 99 2022-12-14
|
|
add t2 C 99 2022-12-14
|
|
add t3 C 99 2022-12-14"###
|
|
),
|
|
Ok(vec![
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t1".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t2".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t3".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
}))
|
|
])
|
|
);
|
|
assert_eq!(
|
|
command_parser::script(
|
|
r###"add t1 C 99 2022-12-14
|
|
add t2 C 99 2022-12-14
|
|
add t3 C 99 2022-12-14
|
|
"###
|
|
),
|
|
Ok(vec![
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t1".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t2".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t3".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Noop
|
|
])
|
|
);
|
|
assert_eq!(
|
|
command_parser::script(
|
|
r###"add t1 C 99 2022-12-14
|
|
add t2 C 99 2022-12-14
|
|
add t3 C 99 2022-12-14
|
|
# some comment
|
|
"###
|
|
),
|
|
Ok(vec![
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t1".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t2".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Add(Password::from_password(Password {
|
|
parent: None,
|
|
prefix: None,
|
|
name: "t3".to_string(),
|
|
length: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
seq: 99,
|
|
date: Date::new(2022, 12, 14),
|
|
comment: None
|
|
})),
|
|
Command::Noop,
|
|
Command::Noop
|
|
])
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn parse_password_test() {
|
|
assert_eq!(
|
|
command_parser::name("ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: None,
|
|
mode: Mode::Regular,
|
|
length: None,
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("ableton89 U 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: None,
|
|
mode: Mode::RegularUpcase,
|
|
length: None,
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("ableton89 U 2020-12-09"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: None,
|
|
mode: Mode::RegularUpcase,
|
|
length: None,
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: None
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::Regular,
|
|
length: None,
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 N 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::NoSpace,
|
|
length: None,
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 UN 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::NoSpaceUpcase,
|
|
length: None,
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 20R 99 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::Regular,
|
|
length: Some(20),
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 20UR 99 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::RegularUpcase,
|
|
length: Some(20),
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 20UH 99 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::HexUpcase,
|
|
length: Some(20),
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 20UB 99 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::Base64Upcase,
|
|
length: Some(20),
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("#W9 ableton89 20D 99 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: Some("#W9".to_string()),
|
|
mode: Mode::Decimal,
|
|
length: Some(20),
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("ableton89 20D 98 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: None,
|
|
mode: Mode::Decimal,
|
|
length: Some(20),
|
|
seq: 98,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("ableton89 20C 98 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: None,
|
|
mode: Mode::NoSpaceCamel,
|
|
length: Some(20),
|
|
seq: 98,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
assert_eq!(
|
|
command_parser::name("ableton89 20D 2020-12-09 a b c"),
|
|
Ok(Password {
|
|
name: "ableton89".to_string(),
|
|
parent: None,
|
|
prefix: None,
|
|
mode: Mode::Decimal,
|
|
length: Some(20),
|
|
seq: 99,
|
|
date: Date::new(2020, 12, 09),
|
|
comment: Some("a b c".to_string())
|
|
})
|
|
);
|
|
}
|
|
}
|