[PM-14252] Switch to oo7 and drop libsecret #11900
Open
+266
−382
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## main #11900 +/- ##
=======================================
Coverage 33.41% 33.42%
=======================================
Files 2841 2841
Lines 89008 89008
Branches 16979 16979
=======================================
+ Hits 29744 29751 +7
+ Misses 56927 56920 -7
Partials 2337 2337 ☔ View full report in Codecov by Sentry. |
|
New Issues
Fixed Issues
|
quexten
changed the title
dani-garcia
reviewed
Nov 11, 2024
| @@ -28,14 +28,16 @@ pub trait BiometricTrait { | |||
| #[allow(async_fn_in_trait)] | |||
| async fn available() -> Result<bool>; | |||
| fn derive_key_material(secret: Option<&str>) -> Result<OsDerivedKey>; | |||
| fn set_biometric_secret( | |||
| #[allow(async_fn_in_trait)] | |||
There was a problem hiding this comment.
Can we lift the #[allow()] to the trait to avoid repeating it multiple times?
| @@ -84,7 +82,7 @@ security-framework = { version = "=3.0.0", optional = true } | |||
| security-framework-sys = { version = "=2.12.0", optional = true } | |||
|
|
|||
| [target.'cfg(target_os = "linux")'.dependencies] | |||
| gio = { version = "=0.19.5", optional = true } | |||
| libsecret = { version = "=0.5.0", optional = true } | |||
There was a problem hiding this comment.
If we're removing the libsecret crate can we also remove the dependency to the libsecret system package?
clients/apps/desktop/electron-builder.json
Line 232 in 21f7fff
clients/.github/workflows/build-desktop.yml
Line 165 in 21f7fff
| } | ||
| } | ||
|
|
||
| pub fn get_password_keytar(service: &str, account: &str) -> Result<String> { | ||
| get_password(service, account) | ||
| // forces to read via secret service; remvove after 2024.03 |
There was a problem hiding this comment.
Do you mean remove after 2025.03?
dani-garcia
reviewed
Nov 12, 2024
| @@ -84,7 +82,7 @@ security-framework = { version = "=3.0.0", optional = true } | |||
| security-framework-sys = { version = "=2.12.0", optional = true } | |||
|
|
|||
| [target.'cfg(target_os = "linux")'.dependencies] | |||
| gio = { version = "=0.19.5", optional = true } | |||
| libsecret = { version = "=0.5.0", optional = true } | |||
| oo7 = "0.3.3" | |||
There was a problem hiding this comment.
We should pin the dep like the rest of them
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.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-14252
📔 Objective
Oo7 (https://github.com/bilelmoussaoui/oo7) is the library for interacting with desktop Linux keyrings that many modern projects are switching towards. It supports accessing secret service directly, but also going via the secret portal in sandboxes (for flatpak/snap).
Note: Migration code is included. If there are clients that are on snap / flatpak, they will migrate from storing directly in secret service to the file backend + portal based approach.
The API is a lot more sane and the library is pure rust, which should reduce bugs we have with linux platform secrets management. Also drops dependency on compiling against c libraries.
(Also should make cross compiling for ARM possible)
📸 Screenshots
⏰ Reminders before review
🦮 Reviewer guidelines
:+1:) or similar for great changes:memo:) or ℹ️ (:information_source:) for notes or general info:question:) for questions:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:) for suggestions / improvements:x:) or:warning:) for more significant problems or concerns needing attention:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt:pick:) for minor or nitpick changes