Skip to content

fix: Don't panic on recoverable D-Bus errors on Unix #741

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

Open
DataTriny wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Don't panic on recoverable D-Bus errors on Unix #741

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
24 changes: 14 additions & 10 deletions platforms/unix/src/atspi/bus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use atspi::{
};
use std::{
env::var,
io,
sync::{Arc, OnceLock},
};
use zbus::{
Expand Down Expand Up @@ -172,7 +171,7 @@ impl Bus {
where
T: zbus::object_server::Interface,
{
map_or_ignoring_broken_pipe(
map_or_ignoring_recoverable_error(
self.conn.object_server().at(path, interface).await,
false,
|result| result,
Expand Down Expand Up @@ -223,7 +222,7 @@ impl Bus {
where
T: zbus::object_server::Interface,
{
map_or_ignoring_broken_pipe(
map_or_ignoring_recoverable_error(
self.conn.object_server().remove::<T, _>(path).await,
false,
|result| result,
Expand Down Expand Up @@ -415,7 +414,7 @@ impl Bus {
where
B: serde::Serialize + zbus::zvariant::DynamicType,
{
map_or_ignoring_broken_pipe(
map_or_ignoring_recoverable_error(
self.conn
.emit_signal(
Option::<BusName>::None,
Expand All @@ -437,7 +436,7 @@ impl Bus {
signal_name: &str,
body: EventBodyBorrowed<'_>,
) -> Result<()> {
map_or_ignoring_broken_pipe(
map_or_ignoring_recoverable_error(
self.conn
.emit_signal(
Option::<BusName>::None,
Expand All @@ -453,7 +452,14 @@ impl Bus {
}
}

pub(crate) fn map_or_ignoring_broken_pipe<T, U, F>(
pub(crate) fn zbus_error_is_unrecoverable(error: &zbus::Error) -> bool {
matches!(
error,
zbus::Error::InterfaceExists(..) | zbus::Error::MissingParameter(..)
)
}

pub(crate) fn map_or_ignoring_recoverable_error<T, U, F>(
result: zbus::Result<T>,
default: U,
f: F,
Expand All @@ -463,9 +469,7 @@ where
{
match result {
Ok(result) => Ok(f(result)),
Err(zbus::Error::InputOutput(error)) if error.kind() == io::ErrorKind::BrokenPipe => {
Ok(default)
}
Err(error) => Err(error),
Err(error) if zbus_error_is_unrecoverable(&error) => Err(error),
Err(_) => Ok(default),
}
}
11 changes: 8 additions & 3 deletions platforms/unix/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use zbus::{Connection, connection::Builder, proxy::PropertyChanged};

use crate::{
adapter::{AdapterState, Callback, Message},
atspi::{Bus, map_or_ignoring_broken_pipe},
atspi::{Bus, map_or_ignoring_recoverable_error, zbus_error_is_unrecoverable},
executor::Executor,
util::block_on,
};
Expand Down Expand Up @@ -58,7 +58,11 @@ pub(crate) fn get_or_init_messages() -> Sender<Message> {
if let Ok(session_bus) = Builder::session() {
if let Ok(session_bus) = session_bus.internal_executor(false).build().await
{
run_event_loop(&executor, session_bus, rx).await.unwrap();
if let Err(error) = run_event_loop(&executor, session_bus, rx).await {
if zbus_error_is_unrecoverable(&error) {
panic!("Accessibility event loop failed: {error}");
}
}
}
}
}))
Expand Down Expand Up @@ -145,7 +149,7 @@ async fn bus_after_status_change(
None => false,
};
if enabled {
map_or_ignoring_broken_pipe(Bus::new(session_bus, executor).await, None, Some)
map_or_ignoring_recoverable_error(Bus::new(session_bus, executor).await, None, Some)
} else {
Ok(None)
}
Expand Down Expand Up @@ -195,6 +199,7 @@ async fn run_event_loop(
change = changes.next() => {
atspi_bus = bus_after_status_change(change, &session_bus, executor).await?;
sync_adapters(&mut adapters, &atspi_bus);

}
message = messages.next() => {
if let Some(message) = message {
Expand Down
Loading