From 53d9a136662b81df0565be6f4d57074533ba60fe Mon Sep 17 00:00:00 2001 From: Bertrand PRESLES Date: Thu, 12 Nov 2026 19:26:19 +0100 Subject: [PATCH] Packages: no dependency on a Secret Service provider The DEB, RPM and Arch packages no longer pull in gnome-keyring (or kwallet, keepassxc): the desktop brings its own Secret Service (oo7 on GNOME 51, GNOME Keyring, KWallet, KeePassXC...), no virtual package or capability is common to them, and installing a second one makes two Secret Services compete for the session. The requirement is stated in the package descriptions and the documentation now mentions oo7. Co-Authored-By: Claude Opus 5.5 --- PLAN.md | 1 + README.md | 5 +++-- crates/pdcore/src/session.rs | 3 ++- debian/control | 7 +++++-- packaging/README.md | 5 +++++ packaging/arch/PKGBUILD | 5 +++-- packaging/man/pdrive.1 | 2 +- packaging/rpm/pdrive-for-linux.spec | 8 ++++++-- 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/PLAN.md b/PLAN.md index 151ed67..da09e5f 100644 --- a/PLAN.md +++ b/PLAN.md @@ -106,6 +106,7 @@ Stratégie retenue : les bibliothèques natives sont précompilées une seule fo - [x] RPM : `packaging/rpm/pdrive-for-linux.spec`, construit en conteneur Fedora 44 (`scripts/build-packages.sh rpm`), rpmlint sans erreur. - [ ] RPM : publication via COPR. À faire : créer le projet COPR, renseigner la variable `COPR_PROJECT` et le secret `COPR_CONFIG` (job `copr` de `release.yml`, envoi du SRPM), tester une première construction ; auditer les licences des crates vendorisées et des paquets NuGet embarqués (`THIRD_PARTY_NOTICES`). - [x] DEB : `debian/` (debhelper 13), construit en conteneur Debian 13 (rustc par rustup, les dépendances exigent Rust 1.92), lintian sans erreur. Non testé : installation sur Debian/Ubuntu, Ubuntu 24.04 (libadwaita 1.5 trop ancienne). +- [x] Paquets agnostiques du Secret Service (12/11/2026) : plus aucune dépendance vers un fournisseur (`gnome-keyring | kwallet6 | keepassxc` dans `debian/control`, `Requires` équivalent du spec, `optdepends` `gnome-keyring` du PKGBUILD). GNOME 51 (Fedora 45) fournit le Secret Service par `oo7-daemon` et non plus GNOME Keyring ; aucune capacité virtuelle commune n'existe (rien ne fournit `dbus(org.freedesktop.secrets)` sous Fedora, pas de paquet virtuel Debian), et tirer un second fournisseur provoque deux Secret Service concurrents (voir « Session refusée »). Le prérequis est indiqué dans la description des paquets, le README et `packaging/README.md`. Non vérifié : reconstruction des paquets (rpmlint, lintian). - [x] Workflow GitHub Actions déclenché par un tag `v*` (`.github/workflows/release.yml`) : premier run le 29/10/2026 sur `v0.1.0`, tous les jobs réussis (dont `native`). Correction : le job `release` créait une seconde release en brouillon au lieu d'utiliser celle du tag déjà créée à la main ; il téléverse désormais les fichiers (`gh release upload --clobber`) dans la release existante, publiée ou brouillon, et ne crée un brouillon que s'il n'y en a aucune. À vérifier au prochain tag. - [x] Version unique propagée partout : `scripts/check-version.sh` vérifie `Cargo.toml`, le spec, `debian/changelog` et le tag (utilisé par le workflow). `x-pm-appversion` est construit dans `crates/pdcore/src/config.rs` (`APP_VERSION`) avec `env!("CARGO_PKG_VERSION")` : il suivait déjà `Cargo.toml` ; un test le vérifie. Le canal reste `-alpha` (convention depuis le premier commit, honnête avant la 1.0) : à revoir à la 1.0. diff --git a/README.md b/README.md index 5b07be8..14ffe0a 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Status: early alpha (the application identifies itself to Proton with the `-alph - **Translations** with gettext (French first, see `po/`). - **Command-line tool** `pdrive`: `login`, `logout`, `status`, `ls [PATH]`, `selftest`. -The session is kept in the Secret Service keyring (GNOME Keyring, KWallet, ...). The +The session is kept in the Secret Service keyring (oo7, GNOME Keyring, KWallet, ...). The sign-in goes through your browser: PDrive never sees your password. When Proton no longer accepts the session (expired or revoked), the application opens the browser sign-in again by itself. @@ -124,7 +124,8 @@ flowchart LR - FUSE 3 (`fusermount3`). - Development files of GTK 4, libadwaita and GLib, for `pdrive-app`. - `gettext` (`msgfmt`) for the translations. -- A Secret Service provider (for example GNOME Keyring, KeePassXC or KWallet). With KWallet, +- A Secret Service provider (for example oo7, GNOME Keyring, KeePassXC or KWallet). The + packages do not depend on any of them: use the one your desktop already runs. With KWallet, the Secret Service interface (`org.freedesktop.secrets`) is provided by `ksecretd` from KDE Frameworks 6.14 (Fedora 44 has 6.31). Debian 13 has `kwallet6` 6.13, whose `kwalletd6` only offers it as an option: enable it in the KDE Wallet settings ("Use KWallet for the diff --git a/crates/pdcore/src/session.rs b/crates/pdcore/src/session.rs index bdda019..d294e06 100644 --- a/crates/pdcore/src/session.rs +++ b/crates/pdcore/src/session.rs @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // Copyright (C) 2026 Bertrand Presles -//! Session persistence in the Secret Service (GNOME Keyring) through oo7. +//! Session persistence in the Secret Service (any provider: oo7, GNOME Keyring, KWallet...) +//! through the oo7 client library. use std::collections::HashMap; diff --git a/debian/control b/debian/control index 224d43e..c983e09 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,7 @@ Package: pdrive-for-linux Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends}, fuse3, - libnautilus-extension4, - gnome-keyring | kwallet6 | keepassxc + libnautilus-extension4 Recommends: gnome-shell-extension-appindicator, nautilus Description: Unofficial Proton Drive client (FUSE mount, Nautilus integration) PDrive for Linux mounts Proton Drive as a FUSE file system, with on-demand @@ -31,6 +30,10 @@ Description: Unofficial Proton Drive client (FUSE mount, Nautilus integration) desktop application (tray icon, status window) that runs the daemon, and a command-line tool. . + The session is stored through the Secret Service API: the desktop must provide + a Secret Service (oo7, GNOME Keyring, KWallet, KeePassXC...). None is pulled in + as a dependency, so that the one already chosen by the desktop is kept. + . This is an unofficial third-party client, not affiliated with or endorsed by Proton AG. It bundles the Proton Drive SDK and Proton cryptography libraries (MIT) as private libraries. diff --git a/packaging/README.md b/packaging/README.md index 349cf39..5311d1b 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -6,6 +6,11 @@ the Nautilus extension in the Nautilus extensions directory, `.ini` in `/usr/share/cloud-providers`, icons, `.desktop`, `.mo` in `/usr/share/locale`, manual pages (`packaging/man/*.1`, plain troff) in `/usr/share/man/man1`. Third-party licence inventories (`licenses/*.tsv`, generated by `scripts/audit-licenses.sh`) go to the documentation directory. +No package depends on a Secret Service provider: the desktop brings its own (oo7 on GNOME 51, +GNOME Keyring, KWallet, KeePassXC...), there is no virtual package or capability common to them, +and installing a second one makes two Secret Services compete for the session (README, "Known +limitations"). The requirement is stated in the package descriptions. + ## Build inputs (no .NET, no network when building the packages) 1. Native archive `pdrive-native-linux---.tar.xz`: the two prebuilt libraries diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index e0568df..211b116 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -25,11 +25,12 @@ url='https://github.com/bpresles/PDrive-for-Linux' # GPL-3.0-or-later: this project. Bundled components: see THIRD_PARTY_NOTICES and licenses/*.tsv. license=(GPL-3.0-or-later) # fuser is built without libfuse: the daemon calls fusermount3. -# Tokens are stored through the Secret Service API (gnome-keyring, kwallet or keepassxc). +# Tokens are stored through the Secret Service API. No provider is listed on purpose: the +# desktop brings its own (oo7, gnome-keyring, kwallet, keepassxc...), and pulling in a second +# one makes two Secret Services compete for the session. depends=(fuse3 gtk4 libadwaita glib2 hicolor-icon-theme) makedepends=(cargo gcc make gettext desktop-file-utils pkgconf nautilus xz) optdepends=('nautilus: file manager integration (emblems, menu entries)' - 'gnome-keyring: Secret Service provider to store the session tokens' 'gnome-shell-extension-appindicator: tray icon on GNOME') options=(!lto !debug) source=("pdrive-for-linux-$pkgver.tar.xz" diff --git a/packaging/man/pdrive.1 b/packaging/man/pdrive.1 index 0338ed2..226d2a4 100644 --- a/packaging/man/pdrive.1 +++ b/packaging/man/pdrive.1 @@ -24,7 +24,7 @@ or endorsed by, Proton AG. .TP .B login Sign in through the web browser and store the session in the Secret Service -keyring (GNOME Keyring, KWallet or KeePassXC). +keyring (oo7, GNOME Keyring, KWallet, KeePassXC...). .TP .BI "ls [" PATH ] List a folder of diff --git a/packaging/rpm/pdrive-for-linux.spec b/packaging/rpm/pdrive-for-linux.spec index beca9f0..7645653 100644 --- a/packaging/rpm/pdrive-for-linux.spec +++ b/packaging/rpm/pdrive-for-linux.spec @@ -55,8 +55,9 @@ BuildRequires: pkgconfig(gmodule-2.0) # fuser is built without libfuse: the daemon calls fusermount3. Requires: fuse3 -# Tokens are stored through the Secret Service API. -Requires: (gnome-keyring or kf6-kwallet or keepassxc) +# Tokens are stored through the Secret Service API. No provider is required on purpose: the +# desktop brings its own (oo7, GNOME Keyring, KWallet, KeePassXC...), and pulling in a second +# one makes two Secret Services compete for the session. Requires: hicolor-icon-theme Recommends: gnome-shell-extension-appindicator Recommends: nautilus @@ -67,6 +68,9 @@ download, offline pinning, sync state emblems and menu entries in Nautilus, a desktop application (tray icon, status window) that runs the daemon, and a command-line tool. +The session is stored through the Secret Service API: the desktop must provide +a Secret Service (oo7, GNOME Keyring, KWallet, KeePassXC...). + This is an unofficial third-party client, not affiliated with or endorsed by Proton AG. It bundles the Proton Drive SDK and Proton cryptography libraries (MIT) as private libraries.