itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make LibSecretCredential own libsecret library

Browse Source
This commit is contained in:
Benjamin Bigler 2025-06-04 15:59:24 +02:00
parent e208691f95
commit 22940c701e
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
credential/cargo-credential-libsecret/src/lib.rs
View File

@ -83,7 +83,9 @@ mod linux {
... ...
) -> *mut gchar; ) -> *mut gchar;
pub struct LibSecretCredential; pub struct LibSecretCredential {
libsecret: Library,
}
fn label(index_url: &str) -> CString { fn label(index_url: &str) -> CString {
CString::new(format!("cargo-registry:{}", index_url)).unwrap() CString::new(format!("cargo-registry:{}", index_url)).unwrap()
@ -105,6 +107,18 @@ mod linux {
} }
} }
impl LibSecretCredential {
pub fn new() -> Result<LibSecretCredential, Error> {
// Dynamically load libsecret to avoid users needing to install
// additional -dev packages when building this provider.
let libsecret = unsafe { Library::new("libsecret-1.so.0") }.context(
"failed to load libsecret: try installing the `libsecret` \
or `libsecret-1-0` package with the system package manager",
)?;
Ok(Self { libsecret })
}
}
impl Credential for LibSecretCredential { impl Credential for LibSecretCredential {
fn perform( fn perform(
&self, &self,
@ -112,24 +126,22 @@ mod linux {
action: &Action<'_>, action: &Action<'_>,
_args: &[&str], _args: &[&str],
) -> Result<CredentialResponse, Error> { ) -> Result<CredentialResponse, Error> {
// Dynamically load libsecret to avoid users needing to install
// additional -dev packages when building this provider.
let lib;
let secret_password_lookup_sync: Symbol<'_, SecretPasswordLookupSync>; let secret_password_lookup_sync: Symbol<'_, SecretPasswordLookupSync>;
let secret_password_store_sync: Symbol<'_, SecretPasswordStoreSync>; let secret_password_store_sync: Symbol<'_, SecretPasswordStoreSync>;
let secret_password_clear_sync: Symbol<'_, SecretPasswordClearSync>; let secret_password_clear_sync: Symbol<'_, SecretPasswordClearSync>;
unsafe { unsafe {
lib = Library::new("libsecret-1.so.0").context( secret_password_lookup_sync = self
"failed to load libsecret: try installing the `libsecret` \ .libsecret
or `libsecret-1-0` package with the system package manager",
)?;
secret_password_lookup_sync = lib
.get(b"secret_password_lookup_sync\0") .get(b"secret_password_lookup_sync\0")
.map_err(Box::new)?; .map_err(Box::new)?;
secret_password_store_sync = secret_password_store_sync = self
lib.get(b"secret_password_store_sync\0").map_err(Box::new)?; .libsecret
secret_password_clear_sync = .get(b"secret_password_store_sync\0")
lib.get(b"secret_password_clear_sync\0").map_err(Box::new)?; .map_err(Box::new)?;
secret_password_clear_sync = self
.libsecret
.get(b"secret_password_clear_sync\0")
.map_err(Box::new)?;
} }
let index_url_c = CString::new(registry.index_url).unwrap(); let index_url_c = CString::new(registry.index_url).unwrap();

2
src/cargo/util/auth/mod.rs
View File

@ -545,7 +545,7 @@ fn credential_action(
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
"cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}),
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
"cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential::new()?),
name if BUILT_IN_PROVIDERS.contains(&name) => { name if BUILT_IN_PROVIDERS.contains(&name) => {
Box::new(cargo_credential::UnsupportedCredential {}) Box::new(cargo_credential::UnsupportedCredential {})
} }