vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

keyring 1.0.0

Browse Source
This commit is contained in:
veeso
2022-01-05 12:59:32 +01:00
committed by Christian Visintin
parent 4897253932
commit 332284fec3
4 changed files with 618 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/system/keys/keyringstorage.rs
View File

@@ -28,7 +28,7 @@
// Local
use super::{KeyStorage, KeyStorageError};
// Ext
use keyring::{Keyring, KeyringError};
use keyring::{Entry as Keyring, Error as KeyringError};
/// provides a `KeyStorage` implementation using the keyring crate
pub struct KeyringStorage {
@@ -53,15 +53,13 @@ impl KeyStorage for KeyringStorage {
match storage.get_password() {
Ok(s) => Ok(s),
Err(e) => match e {
KeyringError::NoPasswordFound => Err(KeyStorageError::NoSuchKey),
#[cfg(target_os = "windows")]
KeyringError::WindowsVaultError => Err(KeyStorageError::NoSuchKey),
#[cfg(target_os = "macos")]
KeyringError::MacOsKeychainError(_) => Err(KeyStorageError::NoSuchKey),
#[cfg(target_os = "linux")]
KeyringError::SecretServiceError(_) => Err(KeyStorageError::ProviderError),
KeyringError::Parse(_) => Err(KeyStorageError::BadSytax),
_ => Err(KeyStorageError::ProviderError),
KeyringError::NoEntry => Err(KeyStorageError::NoSuchKey),
KeyringError::PlatformFailure(_)
| KeyringError::NoStorageAccess(_)
| KeyringError::WrongCredentialPlatform => Err(KeyStorageError::ProviderError),
KeyringError::BadEncoding(_) | KeyringError::TooLong(_, _) => {
Err(KeyStorageError::BadSytax)
}
},
}
}
@@ -84,13 +82,8 @@ impl KeyStorage for KeyringStorage {
// Check what kind of error is returned
match storage.get_password() {
Ok(_) => true,
#[cfg(not(target_os = "linux"))]
Err(err) => !matches!(err, KeyringError::NoBackendFound),
#[cfg(target_os = "linux")]
Err(err) => !matches!(
err,
KeyringError::NoBackendFound | KeyringError::SecretServiceError(_)
),
Err(KeyringError::NoStorageAccess(_) | KeyringError::PlatformFailure(_)) => false,
Err(_) => true,
}
}
}