Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 6 additions & 10 deletions src/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,17 @@ pub fn unlock<S: std::hash::BuildHasher>(

let protected_private_key =
crate::cipherstring::CipherString::new(protected_private_key)?;
let private_key =
match protected_private_key.decrypt_locked_symmetric(&key) {
Ok(private_key) => crate::locked::PrivateKey::new(private_key),
Err(e) => return Err(e),
};
let private_key = crate::locked::PrivateKey::new(
protected_private_key.decrypt_locked_symmetric(&key)?,
);

let mut org_keys = std::collections::HashMap::new();
for (org_id, protected_org_key) in protected_org_keys {
let protected_org_key =
crate::cipherstring::CipherString::new(protected_org_key)?;
let org_key =
match protected_org_key.decrypt_locked_asymmetric(&private_key) {
Ok(org_key) => crate::locked::Keys::new(org_key),
Err(e) => return Err(e),
};
let org_key = crate::locked::Keys::new(
protected_org_key.decrypt_locked_asymmetric(&private_key)?,
);
org_keys.insert(org_id.clone(), org_key);
}

Expand Down
1 change: 1 addition & 0 deletions src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1738,6 +1738,7 @@ fn classify_login_error(error_res: &ConnectErrorRes, code: u16) -> Error {
"invalid_client" => {
return Error::IncorrectApiKey;
}
#[allow(clippy::collapsible_match)]
"" => {
// bitwarden_rs returns an empty error and error_description for
// this case, for some reason
Expand Down
3 changes: 1 addition & 2 deletions src/bin/rbw/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1507,8 +1507,7 @@ pub fn search(
.filter(|entry| {
entry
.as_ref()
.map(|entry| entry.search_match(term, folder))
.unwrap_or(true)
.map_or(true, |entry| entry.search_match(term, folder))
})
.map(|entry| entry.map(std::convert::Into::into))
.collect::<Result<_, anyhow::Error>>()?;
Expand Down
2 changes: 1 addition & 1 deletion src/dirs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fn runtime_dir() -> std::path::PathBuf {
format!(
"{}/{}-{}",
std::env::temp_dir().to_string_lossy(),
&profile(),
profile(),
rustix::process::getuid().as_raw()
)
.into()
Expand Down
Loading