alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(key): search for key in all relevant keyrings

Browse Source 
Previously, using `bcachefs unlock -k session` would still cause mount
to ask for a passphrase.

Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-06-15 23:48:31 +02:00
parent e4271d7a3e
commit f72ded6a4f
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/key.rs
View File

@ -110,25 +110,32 @@ impl KeyHandle {
} }
} }
pub fn new_from_search(uuid: &Uuid) -> Result<Self> { fn search_keyring(keyring: i32, key_name: &CStr) -> Result<i64> {
let key_name = Self::format_key_name(uuid); let key_name = CStr::as_ptr(key_name);
let key_name = CStr::as_ptr(&key_name);
let key_type = c_str!("user"); let key_type = c_str!("user");
let key_id = let key_id = unsafe { keyctl_search(keyring, key_type, key_name, 0) };
unsafe { keyctl_search(keyutils::KEY_SPEC_USER_KEYRING, key_type, key_name, 0) };
if key_id > 0 { if key_id > 0 {
info!("Found key in keyring"); info!("Found key in keyring");
Ok(Self { Ok(key_id)
_uuid: *uuid,
_id: key_id,
})
} else { } else {
Err(ErrnoError(errno::errno()).into()) Err(ErrnoError(errno::errno()).into())
} }
} }
pub fn new_from_search(uuid: &Uuid) -> Result<Self> {
let key_name = Self::format_key_name(uuid);
Self::search_keyring(keyutils::KEY_SPEC_SESSION_KEYRING, &key_name)
.or_else(|_| Self::search_keyring(keyutils::KEY_SPEC_USER_KEYRING, &key_name))
.or_else(|_| Self::search_keyring(keyutils::KEY_SPEC_USER_SESSION_KEYRING, &key_name))
.map(|id| Self {
_uuid: *uuid,
_id: id,
})
}
fn wait_for_unlock(uuid: &Uuid) -> Result<Self> { fn wait_for_unlock(uuid: &Uuid) -> Result<Self> {
loop { loop {
match Self::new_from_search(uuid) { match Self::new_from_search(uuid) {