Fix dbus service algorithm fallback #191
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current error matching is wrong, as the actual error type returned when algorithm unsupported is "DBus(Service(ZBus(MethodError(OwnedErrorName("org.freedesktop.DBus.Error.NotSupported"), Some(""), Msg { .. }))))"
A6GibKm
reviewed
Feb 1, 2025
| @@ -51,7 +51,7 @@ impl<'a> Service<'a> { | |||
| pub async fn new() -> Result<Service<'a>, Error> { | |||
| let service = match Self::encrypted().await { | |||
| Ok(service) => Ok(service), | |||
| Err(Error::Zbus(zbus::Error::MethodError(_, _, _))) => Self::plain().await, | |||
There was a problem hiding this comment.
I think it would be more safe to have both match branches.
There was a problem hiding this comment.
I'm fine with keeping both. Do you want me to change it in this pull request?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current error matching is incorrect, as the actual error type returned when algorithm unsupported is
DBus(Service(ZBus(MethodError(OwnedErrorName("org.freedesktop.DBus.Error.NotSupported"), Some(""), Msg { .. }))))It is wrapped in the
ServiceErrortype. Refer to this line: https://github.com/bilelmoussaoui/oo7/blob/main/client/src/dbus/api/service.rs#L101P.S. the two error variant names have inconsistent capitalization: ServiceError::ZBus vs Error::Zbus. They actually helped me debugging this.