Repository navigation
Port to zbus 6 - #610
Merged
Merged
Port to zbus 6#610
Conversation
📊 Code Coverage Report
Coverage report generated by cargo-tarpaulin |
domenkozar
commented
Oct 20, 2026
|
|
||
| [workspace.dependencies] | ||
| ashpd = { version = "0.13", default-features = false } | ||
| # Temporary until https://github.com/bilelmoussaoui/ashpd/pull/491 is released. |
Collaborator
|
Please update this and point it to the main branch of ashpd as the changes have landed so we can merge this already |
| - Integration with the [Secret portal](https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Secret.html) if sandboxed | ||
| - Provide API to migrate from host secrets to sandboxed ones | ||
|
|
||
| ## D-Bus API migration |
Collaborator
There was a problem hiding this comment.
Should be squashed with the previous commit.
| pub(crate) fn verify_checksum_md5(digest: impl AsRef<[u8]>, content: impl AsRef<[u8]>) -> bool { | ||
| let mut hasher = Md5::new(); | ||
| hasher.update(content.as_ref()); | ||
| hasher.finalize_fixed().ct_eq(digest.as_ref()).into() |
Collaborator
There was a problem hiding this comment.
The commit doesn't say why this change is needed?
| [workspace.dependencies] | ||
| # Temporary until https://github.com/bilelmoussaoui/ashpd/pull/491 is released. | ||
| ashpd = { version = "0.13", git = "https://github.com/domenkozar/ashpd.git", rev = "718c60e4786923916860daacec69295be7cef8bb", default-features = false } | ||
| # Temporary until ashpd's zbus 6 support is released. |
Collaborator
There was a problem hiding this comment.
Squash with the first commit as well & needs a rebase to resolve the conflict.
When Cargo feature unification enables hybrid-array/subtle, the MD5 output has an array-specific ConstantTimeEq implementation. Method resolution then expects an array reference, but the supplied digest is a byte slice, so compilation fails. Convert the output to a slice before comparing to select the slice implementation consistently and preserve the constant-time comparison.
domenkozar
force-pushed
the
feat/zbus6
branch
from
October 26, 2026 14:13
8851102 to
8c506e3
Compare
bilelmoussaoui
merged commit Oct 26, 2026
2e6f97b
into
linux-credentials:main
16 of 17 checks passed
This file contains hidden or 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
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.
Move oo7's D-Bus client, daemon, CLI, and portal to zbus 6. Together with the GVariant split already merged in #552, this removes the standalone
zvariant,zvariant_derive, andzbus_namespackages from the workspace lockfile.zbus::wiretypes,Variant/OwnedVariant, andas_variantadapters, retaining the existing Secret Service signatures and GNOME double-wrapped variant handling.tokioandasync-stdfeatures, mapping the latter tozbus/default-rt. Keepzgvariantfor keyring files and the PAM socket protocol.enumflags2dependency.Applications passing connections to oo7 must use zbus 6, available through
oo7::zbus.Use upstream ashpd's
mainbranch, which includes the zbus 6 migration from bilelmoussaoui/ashpd#491. Cargo.lock records commit0bced661a0b2cb851e52f1f87c5b79d930537b64. Replace the Git dependency with a released ashpd version and remove itsdeny.tomlsource allowance before publishing.The checksum comparison explicitly converts the MD5 output to a byte slice so it continues to compile when Cargo feature unification enables
hybrid-array/subtle, preserving the constant-time comparison.Validation after rebasing onto main:
cargo check --workspace --locked.cargo test -p oo7 -p oo7-daemon --features oo7/schema --locked: 240 passed, 2 ignored, including client and daemon tests and doctests.cargo clippy --workspace --all-targets --locked -- -D warnings.cargo check -p oo7 --no-default-features --features async-std,native_crypto,schema --locked.cargo fmt --all --checkandgit diff --check.cargo-deny check bans licenses sources: all pass.Prepared with Codex.