kaizenkodo/HEL
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change password struct to use name as String instead of Rc<String>, fix gen command.

Browse Source
This commit is contained in:
Oleksandr Kozachuk
2022-12-23 20:14:07 +01:00
parent 13ea63d687
commit f0ce3b4d96
5 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands.rs
+23 -13
View File
@@ -1,13 +1,12 @@
use rand::{thread_rng, Rng};
use regex::Regex; use regex::Regex;
use rpassword::prompt_password; use rpassword::prompt_password;
use sha1::{Digest, Sha1}; use sha1::{Digest, Sha1};
use std::cmp::min;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::fs; use std::fs;
use std::io::{BufRead, BufReader}; use std::io::{BufRead, BufReader};
use std::io::{BufWriter, Write}; use std::io::{BufWriter, Write};
use std::rc::Rc;
use std::cmp::min;
use rand::{thread_rng, Rng};
use crate::parser::command_parser; use crate::parser::command_parser;
use crate::password::fix_password_recursion; use crate::password::fix_password_recursion;
@@ -18,9 +17,9 @@ use crate::utils::{call_cmd_with_input, get_cmd_args_from_command, get_copy_comm
impl<'a> LKEval<'a> { impl<'a> LKEval<'a> {
pub fn get_password(&self, name: &String) -> Option<PasswordRef> { pub fn get_password(&self, name: &String) -> Option<PasswordRef> {
match self.state.borrow().db.get(name) { match self.state.borrow().ls.get(name) {
Some(pwd) => Some(pwd.clone()), Some(pwd) => Some(pwd.clone()),
None => match self.state.borrow().ls.get(name) { None => match self.state.borrow().db.get(name) {
Some(pwd) => Some(pwd.clone()), Some(pwd) => Some(pwd.clone()),
None => None, None => None,
}, },
@@ -129,7 +128,7 @@ impl<'a> LKEval<'a> {
match self.get_password(name) { match self.get_password(name) {
Some(p) => { Some(p) => {
let pwd = (self.read_password)(format!("Password for {}: ", p.borrow().name)).unwrap(); let pwd = (self.read_password)(format!("Password for {}: ", p.borrow().name)).unwrap();
self.cmd_correct(&out, &p.borrow().name.as_ref(), true, Some(pwd.clone())); self.cmd_correct(&out, &p.borrow().name, true, Some(pwd.clone()));
self.state.borrow_mut().secrets.insert(p.borrow().name.to_string(), pwd); self.state.borrow_mut().secrets.insert(p.borrow().name.to_string(), pwd);
} }
None => { None => {
@@ -428,14 +427,14 @@ impl<'a> LKEval<'a> {
let name = pwd.name.trim_end_matches('G'); let name = pwd.name.trim_end_matches('G');
for num in 1..10_u32.pow(gen.len().try_into().unwrap()) { for num in 1..10_u32.pow(gen.len().try_into().unwrap()) {
let npwd = Password::from_password(&pwd); let npwd = Password::from_password(&pwd);
npwd.borrow_mut().name = Rc::new(format!("{}{}", name, num).to_string()); npwd.borrow_mut().name = format!("{}{}", name, num).to_string();
genpwds.push(npwd); genpwds.push(npwd);
} }
} else { } else {
let name = pwd.name.trim_end_matches('X'); let name = pwd.name.trim_end_matches('X');
let num = rng.gen_range(1..10_u32.pow(gen.len().try_into().unwrap())); let num = rng.gen_range(1..10_u32.pow(gen.len().try_into().unwrap()));
let npwd = Password::from_password(&pwd); let npwd = Password::from_password(&pwd);
npwd.borrow_mut().name = Rc::new(format!("{}{}", name, num).to_string()); npwd.borrow_mut().name = format!("{}{}", name, num).to_string();
genpwds.push(npwd); genpwds.push(npwd);
} }
} }
@@ -455,21 +454,32 @@ impl<'a> LKEval<'a> {
lspwds.push((pwd, key)); lspwds.push((pwd, key));
} }
self.state.borrow().fix_hierarchy(); self.state.borrow().fix_hierarchy();
let mut err = match &out.err { Some(e) => Some(e.clone()), None => None }; let mut err = match &out.err {
Some(e) => Some(e.clone()),
None => None,
};
let mut encpwds: Vec<(PasswordRef, String)> = Vec::new(); let mut encpwds: Vec<(PasswordRef, String)> = Vec::new();
for (pwd, key) in lspwds { for (pwd, key) in lspwds {
let pass = match self.cmd_enc(&LKOut::from_lkout(None, err), &key) { let pass = match self.cmd_enc(&LKOut::from_lkout(None, err), &key) {
Some((_, pass)) => pass, Some((name, pass)) => {
None => { out.e(format!("error: failed to encrypt password")); return; }, if name != pwd.borrow().name {
panic!("INTERNAL_ERROR: wrong name found: {} != {}", name, pwd.borrow().name);
};
pass
}
None => {
out.e(format!("error: failed to encrypt password"));
return;
}
}; };
err = None; err = None;
encpwds.push((pwd.clone(), pass)); encpwds.push((pwd.clone(), pass));
} }
encpwds.sort_by(|a,b| b.1.len().cmp(&a.1.len())); encpwds.sort_by(|a, b| b.1.len().cmp(&a.1.len()));
self.state.borrow_mut().ls.clear(); self.state.borrow_mut().ls.clear();
let mut counter = 1; let mut counter = 1;
out.o(format!("{:>3} {:>36} {:>4} {}", "", "Password", "Len", "Name")); out.o(format!("{:>3} {:>36} {:>4} {}", "", "Password", "Len", "Name"));
for num in (encpwds.len()-min(genpwds.len(), num))..encpwds.len() { for num in (encpwds.len() - min(genpwds.len(), num))..encpwds.len() {
let (pwd, pass) = (encpwds[num].0.clone(), encpwds[num].1.to_string()); let (pwd, pass) = (encpwds[num].0.clone(), encpwds[num].1.to_string());
let key = Radix::new(counter, 36).unwrap().to_string(); let key = Radix::new(counter, 36).unwrap().to_string();
counter += 1; counter += 1;
src/parser.rs
+23 -23
View File
@@ -122,7 +122,7 @@ add t3 C 99 2022-12-14"###
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t1".to_string()), name: "t1".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -132,7 +132,7 @@ add t3 C 99 2022-12-14"###
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t2".to_string()), name: "t2".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -142,7 +142,7 @@ add t3 C 99 2022-12-14"###
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t3".to_string()), name: "t3".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -162,7 +162,7 @@ add t3 C 99 2022-12-14
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t1".to_string()), name: "t1".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -172,7 +172,7 @@ add t3 C 99 2022-12-14
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t2".to_string()), name: "t2".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -182,7 +182,7 @@ add t3 C 99 2022-12-14
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t3".to_string()), name: "t3".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -204,7 +204,7 @@ add t3 C 99 2022-12-14
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t1".to_string()), name: "t1".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -214,7 +214,7 @@ add t3 C 99 2022-12-14
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t2".to_string()), name: "t2".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -224,7 +224,7 @@ add t3 C 99 2022-12-14
Command::Add(Rc::new(RefCell::new(Password { Command::Add(Rc::new(RefCell::new(Password {
parent: None, parent: None,
prefix: None, prefix: None,
name: Rc::new("t3".to_string()), name: "t3".to_string(),
length: None, length: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
seq: 99, seq: 99,
@@ -242,7 +242,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), command_parser::name("ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: None, prefix: None,
mode: Mode::Regular, mode: Mode::Regular,
@@ -255,7 +255,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("ableton89 U 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), command_parser::name("ableton89 U 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: None, prefix: None,
mode: Mode::RegularUpcase, mode: Mode::RegularUpcase,
@@ -268,7 +268,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("ableton89 U 2020-12-09"), command_parser::name("ableton89 U 2020-12-09"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: None, prefix: None,
mode: Mode::RegularUpcase, mode: Mode::RegularUpcase,
@@ -281,7 +281,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), command_parser::name("#W9 ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::Regular, mode: Mode::Regular,
@@ -294,7 +294,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 N 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), command_parser::name("#W9 ableton89 N 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::NoSpace, mode: Mode::NoSpace,
@@ -307,7 +307,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 UN 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), command_parser::name("#W9 ableton89 UN 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::NoSpaceUpcase, mode: Mode::NoSpaceUpcase,
@@ -320,7 +320,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 20R 99 2020-12-09 a b c"), command_parser::name("#W9 ableton89 20R 99 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::Regular, mode: Mode::Regular,
@@ -333,7 +333,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 20UR 99 2020-12-09 a b c"), command_parser::name("#W9 ableton89 20UR 99 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::RegularUpcase, mode: Mode::RegularUpcase,
@@ -346,7 +346,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 20UH 99 2020-12-09 a b c"), command_parser::name("#W9 ableton89 20UH 99 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::HexUpcase, mode: Mode::HexUpcase,
@@ -359,7 +359,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 20UB 99 2020-12-09 a b c"), command_parser::name("#W9 ableton89 20UB 99 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::Base64Upcase, mode: Mode::Base64Upcase,
@@ -372,7 +372,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("#W9 ableton89 20D 99 2020-12-09 a b c"), command_parser::name("#W9 ableton89 20D 99 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: Some("#W9".to_string()), prefix: Some("#W9".to_string()),
mode: Mode::Decimal, mode: Mode::Decimal,
@@ -385,7 +385,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("ableton89 20D 98 2020-12-09 a b c"), command_parser::name("ableton89 20D 98 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: None, prefix: None,
mode: Mode::Decimal, mode: Mode::Decimal,
@@ -398,7 +398,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("ableton89 20C 98 2020-12-09 a b c"), command_parser::name("ableton89 20C 98 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: None, prefix: None,
mode: Mode::NoSpaceCamel, mode: Mode::NoSpaceCamel,
@@ -411,7 +411,7 @@ add t3 C 99 2022-12-14
assert_eq!( assert_eq!(
command_parser::name("ableton89 20D 2020-12-09 a b c"), command_parser::name("ableton89 20D 2020-12-09 a b c"),
Ok(Password { Ok(Password {
name: Rc::new("ableton89".to_string()), name: "ableton89".to_string(),
parent: None, parent: None,
prefix: None, prefix: None,
mode: Mode::Decimal, mode: Mode::Decimal,
src/password.rs
+2 -3
View File
@@ -4,7 +4,6 @@ use chrono::naive::NaiveDate;
use std::{cell::RefCell, rc::Rc}; use std::{cell::RefCell, rc::Rc};
pub type Name = String; pub type Name = String;
pub type NameRef = Rc<Name>;
pub type Prefix = Option<String>; pub type Prefix = Option<String>;
pub type Comment = Option<String>; pub type Comment = Option<String>;
pub type PasswordRef = Rc<RefCell<Password>>; pub type PasswordRef = Rc<RefCell<Password>>;
@@ -17,7 +16,7 @@ pub type Date = NaiveDate;
pub struct Password { pub struct Password {
pub parent: Parent, pub parent: Parent,
pub prefix: Prefix, pub prefix: Prefix,
pub name: NameRef, pub name: Name,
pub length: Length, pub length: Length,
pub mode: Mode, pub mode: Mode,
pub seq: Seq, pub seq: Seq,
@@ -37,7 +36,7 @@ impl Password {
) -> Password { ) -> Password {
Password { Password {
prefix, prefix,
name: Rc::new(name), name: name,
length, length,
mode, mode,
date, date,
src/repl.rs
+3 -3
View File
@@ -101,7 +101,7 @@ impl<'a> LKEval<'a> {
Command::Comment(name, comment) => self.cmd_comment(&out, &name, &comment), Command::Comment(name, comment) => self.cmd_comment(&out, &name, &comment),
Command::Rm(name) => match self.get_password(name) { Command::Rm(name) => match self.get_password(name) {
Some(pwd) => { Some(pwd) => {
self.state.borrow_mut().db.remove(pwd.borrow().name.as_ref()); self.state.borrow_mut().db.remove(&pwd.borrow().name);
out.o(format!("removed {}", pwd.borrow().name)); out.o(format!("removed {}", pwd.borrow().name));
} }
None => out.e(format!("error: password {} not found", name)), None => out.e(format!("error: password {} not found", name)),
@@ -174,7 +174,7 @@ mod tests {
LKPrint::new(LKOut::from_vecs(vec![], vec![]), false, lk.clone()) LKPrint::new(LKOut::from_vecs(vec![], vec![]), false, lk.clone())
); );
let pwd1 = Rc::new(RefCell::new(Password { let pwd1 = Rc::new(RefCell::new(Password {
name: Rc::new("t1".to_string()), name: "t1".to_string(),
prefix: None, prefix: None,
length: None, length: None,
mode: Mode::Regular, mode: Mode::Regular,
@@ -201,7 +201,7 @@ mod tests {
LKPrint::new(LKOut::from_vecs(vec![], vec!["Bye!".to_string()]), true, lk.clone()) LKPrint::new(LKOut::from_vecs(vec![], vec!["Bye!".to_string()]), true, lk.clone())
); );
let pwd2 = Rc::new(RefCell::new(Password { let pwd2 = Rc::new(RefCell::new(Password {
name: Rc::new("t2".to_string()), name: "t2".to_string(),
prefix: None, prefix: None,
length: None, length: None,
mode: Mode::Regular, mode: Mode::Regular,