mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-04 11:27:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

age: Remove two unnecessary clones from IdentityFileEntry decryption

Browse source
This commit is contained in:
Jack Grigg 2024-08-23 20:32:28 +00:00
parent 5e88d75195
commit 5086bd65d9
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
age/src/identity.rs
View file

@ -29,11 +29,13 @@ impl IdentityFileEntry {
match self {
IdentityFileEntry::Native(i) => Ok(Box::new(i)),
#[cfg(feature = "plugin")]
IdentityFileEntry::Plugin(i) => Ok(Box::new(crate::plugin::IdentityPluginV1::new(
i.plugin(),
&[i.clone()],
callbacks,
)?)),
IdentityFileEntry::Plugin(i) => Ok(Box::new(
crate::plugin::Plugin::new(i.plugin())
.map_err(|binary_name| DecryptError::MissingPlugin { binary_name })
.map(|plugin| {
crate::plugin::IdentityPluginV1::from_parts(plugin, vec![i], callbacks)
})?,
)),
}
}

21
age/src/plugin.rs
View file

@ -190,7 +190,7 @@ impl Identity {
}
/// An age plugin.
struct Plugin {
pub(crate) struct Plugin {
binary_name: String,
path: PathBuf,
}
@ -199,7 +199,7 @@ impl Plugin {
/// Finds the age plugin with the given name in `$PATH`.
///
/// On error, returns the binary name that could not be located.
fn new(name: &str) -> Result<Self, String> {
pub(crate) fn new(name: &str) -> Result<Self, String> {
let binary_name = binary_name(name);
match which::which(&binary_name).or_else(|e| {
// If we are running in WSL, try appending `.exe`; plugins installed in
@ -565,17 +565,24 @@ impl<C: Callbacks> IdentityPluginV1<C> {
) -> Result<Self, DecryptError> {
Plugin::new(plugin_name)
.map_err(|binary_name| DecryptError::MissingPlugin { binary_name })
.map(|plugin| IdentityPluginV1 {
plugin,
identities: identities
.map(|plugin| {
let identities = identities
.iter()
.filter(|r| r.name == plugin_name)
.cloned()
.collect(),
callbacks,
.collect();
Self::from_parts(plugin, identities, callbacks)
})
}
pub(crate) fn from_parts(plugin: Plugin, identities: Vec<Identity>, callbacks: C) -> Self {
IdentityPluginV1 {
plugin,
identities,
callbacks,
}
}
fn unwrap_stanzas<'a>(
&self,
stanzas: impl Iterator<Item = &'a Stanza>,