mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radicle: Use 'RAD_PASSPHRASE' unmodified 

Keep the passphrase as is by removing 'trim_end()'.

Signed-off-by: Slack Coder <slackcoder@server.ky>
This commit is contained in:
Slack Coder 2023-01-09 09:14:10 -05:00 committed by Alexis Sellier
parent 03bc9d84d6
commit 1eb2a5ab9d
No known key found for this signature in database
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
radicle/src/profile.rs
View File

@ -16,14 +16,12 @@ use std::path::{Path, PathBuf};
use thiserror::Error; use thiserror::Error;
use crate::crypto::ssh::agent::Agent; use crate::crypto::ssh::agent::Agent;
use crate::crypto::ssh::{Keystore, Passphrase}; use crate::crypto::ssh::{keystore, Keystore, Passphrase};
use crate::crypto::{PublicKey, Signer}; use crate::crypto::{PublicKey, Signer};
use crate::node; use crate::node;
use crate::storage::git::transport; use crate::storage::git::transport;
use crate::storage::git::Storage; use crate::storage::git::Storage;
use radicle_crypto::ssh::keystore;
/// Environment variables used by radicle. /// Environment variables used by radicle.
pub mod env { pub mod env {
pub use std::env::*; pub use std::env::*;
@ -39,8 +37,7 @@ pub mod env {
let Ok(passphrase) = std::env::var(RAD_PASSPHRASE) else { let Ok(passphrase) = std::env::var(RAD_PASSPHRASE) else {
return None; return None;
}; };
Some(super::Passphrase::from(passphrase))
Some(super::Passphrase::from(passphrase.trim_end().to_owned()))
} }
} }
@ -49,7 +46,7 @@ pub enum Error {
#[error(transparent)] #[error(transparent)]
Io(#[from] io::Error), Io(#[from] io::Error),
#[error(transparent)] #[error(transparent)]
Keystore(#[from] crate::crypto::ssh::keystore::Error), Keystore(#[from] keystore::Error),
#[error(transparent)] #[error(transparent)]
MemorySigner(#[from] keystore::MemorySignerError), MemorySigner(#[from] keystore::MemorySignerError),
#[error("no profile found at the filepath '{0}'")] #[error("no profile found at the filepath '{0}'")]