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

Optimized the storage, key is now String instead of Rc<String>, fixed some error output.

Browse Source
This commit is contained in:
Oleksandr Kozachuk
2022-12-20 22:06:46 +01:00
parent fbdfca1982
commit c43221c590
3 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lk.rs
+18 -22
View File
@@ -1,12 +1,12 @@
use crate::password::{fix_password_recursion, NameRef, PasswordRef}; use crate::password::{fix_password_recursion, Name, PasswordRef};
use regex::{Captures, Regex}; use regex::{Captures, Regex};
use std::collections::HashMap; use std::collections::HashMap;
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
pub struct LK { pub struct LK {
pub db: HashMap<NameRef, PasswordRef>, pub db: HashMap<Name, PasswordRef>,
pub ls: HashMap<String, PasswordRef>, pub ls: HashMap<String, PasswordRef>,
pub secrets: HashMap<NameRef, String>, pub secrets: HashMap<Name, String>,
} }
impl LK { impl LK {
@@ -23,28 +23,24 @@ impl LK {
static ref RE: Regex = Regex::new(r"\s*\^([!-~]+)").unwrap(); static ref RE: Regex = Regex::new(r"\s*\^([!-~]+)").unwrap();
} }
for (_, name) in &self.db { for (_, name) in &self.db {
if name.borrow().comment.is_some() { let comment = name.borrow().comment.clone();
let mut folder: Option<String> = None; match comment {
let prev_comment = name.borrow().comment.as_ref().unwrap().clone(); Some(comment) => {
let comment = RE.replace(prev_comment.as_str(), |c: &Captures| { let mut changed = false;
folder = Some(c[1].to_string()); let new = RE.replace(comment.as_str(), |c: &Captures| {
"" let folder = c[1].to_string();
}); match self.db.get(&folder) {
if folder.is_some() { Some(entry) => {
let folder_name = folder.unwrap(); name.borrow_mut().parent = Some(entry.clone());
for (_, entry) in &self.db { changed = true;
if *entry.borrow().name == *folder_name {
let mut tmp = name.borrow_mut();
tmp.parent = Some(entry.clone());
if comment.len() == 0 {
tmp.comment = None
} else {
tmp.comment = Some(comment.to_string())
} }
break; None => (),
} }
} ""
}).to_string();
if changed && new != comment { name.borrow_mut().comment = if new.len() > 0 { Some(new) } else { None } }
} }
None => (),
} }
fix_password_recursion(name.clone()); fix_password_recursion(name.clone());
} }
src/repl.rs
+34 -27
View File
@@ -11,7 +11,7 @@ use std::{cell::RefCell, rc::Rc};
use crate::lk::LK; use crate::lk::LK;
use crate::parser::command_parser; use crate::parser::command_parser;
use crate::password::{fix_password_recursion, NameRef, PasswordRef}; use crate::password::{fix_password_recursion, Name, PasswordRef};
use crate::structs::{Command, LKErr, LKOut, Radix, CORRECT_FILE, DUMP_FILE, HISTORY_FILE}; use crate::structs::{Command, LKErr, LKOut, Radix, CORRECT_FILE, DUMP_FILE, HISTORY_FILE};
use crate::utils::{call_cmd_with_input, get_cmd_args_from_command, get_copy_command_from_env}; use crate::utils::{call_cmd_with_input, get_cmd_args_from_command, get_copy_command_from_env};
@@ -115,8 +115,8 @@ impl<'a> LKEval<'a> {
} }
} }
let parent = match &pwd.borrow().parent { let parent = match &pwd.borrow().parent {
Some(p) => p.borrow().name.clone(), Some(p) => p.borrow().name.to_string(),
None => Rc::new("/".to_string()), None => "/".to_string(),
}; };
let secret = match self.state.borrow().secrets.get(&parent) { let secret = match self.state.borrow().secrets.get(&parent) {
Some(p) => Some(p.clone()), Some(p) => Some(p.clone()),
@@ -129,7 +129,7 @@ impl<'a> LKEval<'a> {
match (self.read_password)("Master: ".to_string()) { match (self.read_password)("Master: ".to_string()) {
Ok(password) => { Ok(password) => {
let name = Rc::new("/".to_string()); let name = Rc::new("/".to_string());
self.state.borrow_mut().secrets.insert(name.clone(), password.clone()); self.state.borrow_mut().secrets.insert(name.to_string(), password.clone());
self.cmd_correct(&out, &name.as_ref(), true, Some(password.clone())); self.cmd_correct(&out, &name.as_ref(), true, Some(password.clone()));
Some(password) Some(password)
} }
@@ -147,14 +147,14 @@ impl<'a> LKEval<'a> {
}; };
if password.is_some() && password.as_ref().unwrap().len() > 0 { if password.is_some() && password.as_ref().unwrap().len() > 0 {
let name = pn.borrow().name.clone(); let name = pn.borrow().name.clone();
self.state.borrow_mut().secrets.insert(name.clone(), password.as_ref().unwrap().clone()); self.state.borrow_mut().secrets.insert(name.to_string(), password.as_ref().unwrap().clone());
self.cmd_correct(&out, name.as_ref(), true, Some(password.as_ref().unwrap().clone())); self.cmd_correct(&out, name.as_ref(), true, Some(password.as_ref().unwrap().clone()));
password password
} else { } else {
match self.read_master(&out, pn.clone(), read) { match self.read_master(&out, pn.clone(), read) {
Some(master) => { Some(master) => {
let password = pn.borrow().encode(master.as_str()); let password = pn.borrow().encode(master.as_str());
self.state.borrow_mut().secrets.insert(pn.borrow().name.clone(), password.clone()); self.state.borrow_mut().secrets.insert(pn.borrow().name.to_string(), password.clone());
Some(password) Some(password)
} }
None => None, None => None,
@@ -164,10 +164,10 @@ impl<'a> LKEval<'a> {
} }
} }
fn cmd_enc(&self, out: &LKOut, name: &String) -> Option<(Rc<String>, String)> { fn cmd_enc(&self, out: &LKOut, name: &String) -> Option<(String, String)> {
let root_folder = Rc::new("/".to_string()); let root_folder = "/".to_string();
let (name, pass) = if name == "/" && self.state.borrow().secrets.contains_key(&root_folder) { let (name, pass) = if name == "/" && self.state.borrow().secrets.contains_key(&root_folder) {
(root_folder.clone(), self.state.borrow().secrets.get(&root_folder).unwrap().to_string()) (root_folder.to_string(), self.state.borrow().secrets.get(&root_folder).unwrap().to_string())
} else { } else {
let pwd = match self.get_password(name) { let pwd = match self.get_password(name) {
Some(p) => p.clone(), Some(p) => p.clone(),
@@ -176,7 +176,7 @@ impl<'a> LKEval<'a> {
return None; return None;
} }
}; };
let name = pwd.borrow().name.clone(); let name = pwd.borrow().name.to_string();
if self.state.borrow().secrets.contains_key(&name) { if self.state.borrow().secrets.contains_key(&name) {
(name.clone(), self.state.borrow().secrets.get(&name).unwrap().to_string()) (name.clone(), self.state.borrow().secrets.get(&name).unwrap().to_string())
} else { } else {
@@ -191,7 +191,7 @@ impl<'a> LKEval<'a> {
}; };
if out.active() { if out.active() {
out.o(pass.clone()); out.o(pass.clone());
self.cmd_correct(&out, name.as_ref(), true, Some(pass.clone())); self.cmd_correct(&out, &name, true, Some(pass.clone()));
} }
Some((name, pass)) Some((name, pass))
} }
@@ -201,7 +201,7 @@ impl<'a> LKEval<'a> {
Ok(cmd) => { Ok(cmd) => {
let print = LKEval::new(cmd, self.state.clone(), prompt_password).eval(); let print = LKEval::new(cmd, self.state.clone(), prompt_password).eval();
let data = print.out.data(); let data = print.out.data();
out.copy_err(&print.out); print.out.copy_err(&out);
if data.len() > 0 { if data.len() > 0 {
let (copy_command, copy_cmd_args) = get_copy_command_from_env(); let (copy_command, copy_cmd_args) = get_copy_command_from_env();
match call_cmd_with_input(&copy_command, &copy_cmd_args, &data) { match call_cmd_with_input(&copy_command, &copy_cmd_args, &data) {
@@ -267,7 +267,7 @@ impl<'a> LKEval<'a> {
None => DUMP_FILE.to_str().unwrap(), None => DUMP_FILE.to_str().unwrap(),
}; };
let script = shellexpand::full(script).unwrap().into_owned(); let script = shellexpand::full(script).unwrap().into_owned();
fn save_dump(data: &HashMap<NameRef, PasswordRef>, script: &String) -> std::io::Result<()> { fn save_dump(data: &HashMap<Name, PasswordRef>, script: &String) -> std::io::Result<()> {
let file = fs::File::create(script)?; let file = fs::File::create(script)?;
let mut writer = BufWriter::new(file); let mut writer = BufWriter::new(file);
for (_, pwd) in data { for (_, pwd) in data {
@@ -343,7 +343,7 @@ impl<'a> LKEval<'a> {
fn cmd_correct(&self, out: &LKOut, name: &String, correct: bool, check: Option<String>) { fn cmd_correct(&self, out: &LKOut, name: &String, correct: bool, check: Option<String>) {
let (check, pwd) = match check { let (check, pwd) = match check {
Some(p) => (true, Some((Rc::new(name.clone()), p))), Some(p) => (true, Some((name.to_string(), p))),
None => ( None => (
false, false,
self.cmd_enc( self.cmd_enc(
@@ -376,7 +376,7 @@ impl<'a> LKEval<'a> {
Err(_) => HashSet::new(), Err(_) => HashSet::new(),
}; };
let mut sha1 = Sha1::new(); let mut sha1 = Sha1::new();
sha1.update(name.as_ref()); sha1.update(name.to_string());
sha1.update(pwd); sha1.update(pwd);
let encpwd = format!("{:x}", sha1.finalize()); let encpwd = format!("{:x}", sha1.finalize());
if check { if check {
@@ -427,12 +427,19 @@ impl<'a> LKEval<'a> {
} }
Command::Ls(filter) => self.cmd_ls(&out, filter.to_string()), Command::Ls(filter) => self.cmd_ls(&out, filter.to_string()),
Command::Add(name) => { Command::Add(name) => {
if self.state.borrow().db.get(&name.borrow().name).is_some() { let state = &mut self.state.borrow_mut();
out.e(format!("error: password {} already exist", name.borrow().name)); let mut fix = false;
} else { {
self.state.borrow_mut().db.insert(name.borrow().name.clone(), name.clone()); let db = &mut state.db;
self.state.borrow().fix_hierarchy(); let pwname = &name.borrow().name.to_string();
if db.get(pwname).is_some() {
out.e(format!("error: password {} already exist", pwname));
} else {
db.insert(pwname.to_string(), name.clone());
fix = true;
}
} }
if fix { state.fix_hierarchy(); }
} }
Command::Comment(name, comment) => match self.get_password(name) { Command::Comment(name, comment) => match self.get_password(name) {
Some(pwd) => { Some(pwd) => {
@@ -445,7 +452,7 @@ impl<'a> LKEval<'a> {
}, },
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); self.state.borrow_mut().db.remove(pwd.borrow().name.as_ref());
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)),
@@ -460,7 +467,7 @@ impl<'a> LKEval<'a> {
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.as_ref(), true, Some(pwd.clone()));
self.state.borrow_mut().secrets.insert(p.borrow().name.clone(), pwd); self.state.borrow_mut().secrets.insert(p.borrow().name.to_string(), pwd);
} }
None => { None => {
if name == "/" { if name == "/" {
@@ -469,7 +476,7 @@ impl<'a> LKEval<'a> {
self.state self.state
.borrow_mut() .borrow_mut()
.secrets .secrets
.insert(Rc::new("/".to_string()), (self.read_password)("Master: ".to_string()).unwrap()); .insert("/".to_string(), (self.read_password)("Master: ".to_string()).unwrap());
} else { } else {
out.e(format!("error: password with name {} not found", name)); out.e(format!("error: password with name {} not found", name));
} }
@@ -508,7 +515,7 @@ impl<'a> LKEval<'a> {
}, },
} }
LKPrint::new(LKOut::from_lkout(out.out, out.err), quit, self.state.clone()) LKPrint::new(out, quit, self.state.clone())
} }
} }
@@ -563,7 +570,7 @@ mod tests {
})); }));
assert_eq!(LKEval::news(Command::Add(pwd1.clone()), lk.clone()).eval().state.borrow().db, { assert_eq!(LKEval::news(Command::Add(pwd1.clone()), lk.clone()).eval().state.borrow().db, {
let mut db = HashMap::new(); let mut db = HashMap::new();
db.insert(pwd1.borrow().name.clone(), pwd1.clone()); db.insert(pwd1.borrow().name.to_string(), pwd1.clone());
db db
}); });
assert_eq!( assert_eq!(
@@ -590,8 +597,8 @@ mod tests {
})); }));
assert_eq!(LKEval::news(Command::Add(pwd2.clone()), lk.clone()).eval().state.borrow().db, { assert_eq!(LKEval::news(Command::Add(pwd2.clone()), lk.clone()).eval().state.borrow().db, {
let mut db = HashMap::new(); let mut db = HashMap::new();
db.insert(pwd1.borrow().name.clone(), pwd1.clone()); db.insert(pwd1.borrow().name.to_string(), pwd1.clone());
db.insert(pwd2.borrow().name.clone(), pwd2.clone()); db.insert(pwd2.borrow().name.to_string(), pwd2.clone());
db db
}); });
assert_eq!( assert_eq!(
src/structs.rs
+1
View File
@@ -125,6 +125,7 @@ impl LKOut {
Self { out: o, err: e } Self { out: o, err: e }
} }
#[allow(dead_code)]
pub fn from_vecs(out: Vec<String>, err: Vec<String>) -> Self { pub fn from_vecs(out: Vec<String>, err: Vec<String>) -> Self {
Self { Self {
out: Some(Rc::new(RefCell::new(out))), out: Some(Rc::new(RefCell::new(out))),