Skip to content

server: Use provided secret to unlock auto-created default keyring #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bilelmoussaoui merged 1 commit into from
Mar 29, 2026
Merged

server: Use provided secret to unlock auto-created default keyring #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions server/src/service/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,10 @@ impl Service {
.await?;

// Discover existing keyrings
let discovered_keyrings = service.discover_keyrings(secret).await?;
let discovered_keyrings = service.discover_keyrings(secret.clone()).await?;

service
.initialize(connection, discovered_keyrings, true)
.initialize(connection, discovered_keyrings, secret, true)
.await?;

// Start PAM listener
Expand Down Expand Up @@ -458,7 +458,7 @@ impl Service {
)
.await?;

let default_keyring = if let Some(secret) = secret {
let default_keyring = if let Some(secret) = secret.clone() {
vec![(
"Login".to_owned(),
oo7::dbus::Service::DEFAULT_COLLECTION.to_owned(),
Expand All @@ -469,7 +469,7 @@ impl Service {
};

service
.initialize(connection, default_keyring, false)
.initialize(connection, default_keyring, secret, false)
.await?;
Ok(service)
}
Expand Down Expand Up @@ -686,6 +686,7 @@ impl Service {
&self,
connection: zbus::Connection,
mut discovered_keyrings: Vec<(String, String, Keyring)>, // (name, alias, keyring)
secret: Option<Secret>,
auto_create_default: bool,
) -> Result<(), Error> {
self.connection.set(connection.clone()).unwrap();
Expand All @@ -701,19 +702,32 @@ impl Service {
if !has_default && auto_create_default {
tracing::info!("No default collection found, creating 'Login' keyring");

let locked_keyring = LockedKeyring::open(Self::LOGIN_ALIAS)
.await
.inspect_err(|e| {
tracing::error!("Failed to create default Login keyring: {}", e);
})?;
let keyring = if let Some(secret) = secret {
UnlockedKeyring::open(Self::LOGIN_ALIAS, secret)
.await
.map(Keyring::Unlocked)
} else {
LockedKeyring::open(Self::LOGIN_ALIAS)
.await
.map(Keyring::Locked)
};

let keyring = keyring.inspect_err(|e| {
tracing::error!("Failed to create default Login keyring: {}", e);
})?;

let is_locked = if keyring.is_locked() {
"locked"
} else {
"unlocked"
};
discovered_keyrings.push((
"Login".to_owned(),
oo7::dbus::Service::DEFAULT_COLLECTION.to_owned(),
Keyring::Locked(locked_keyring),
keyring,
));

tracing::info!("Created default 'Login' collection (locked)");
tracing::info!("Created default 'Login' collection ({})", is_locked);
}

// Set up discovered collections
Expand Down
4 changes: 3 additions & 1 deletion server/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ impl TestServiceSetup {
.await?;

let discovered = service.discover_keyrings(secret.clone()).await?;
service.initialize(server_conn, discovered, false).await?;
service
.initialize(server_conn, discovered, secret.clone(), false)
.await?;

#[cfg(any(feature = "gnome_native_crypto", feature = "gnome_openssl_crypto"))]
let mock_prompter = {
Expand Down
Loading