Merge pull request open-source-cooperative#10 from brotskydotcom/v4.1

prepare for v4.1 release

- expose dbus::Path fields on Items and Collections
- allow creation of Items and Collections from a remembered path
- update the MSRV to 1.78 (minimum for `Cargo.lock` version 4)
- make lifetimes explicit to avoid Clippy complaints

Author: brotskydotcom

.github/workflows/ci.yaml

@@ -1,106 +1,41 @@
 name: CI
-permissions:
-  contents: read
 
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-
-env:
-  CARGO_NET_RETRY: 3
+on: [ workflow_dispatch, push, pull_request ]
 
 jobs:
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rustfmt
-
-      - name: "Check formatting"
-        run: cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
+  ci_stable:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        rust:
-          - stable
-        feature:
+        features:
           - ""
-          - crypto-rust
-          - crypto-openssl
+          - "vendored"
+          - "crypto-rust"
+          - "crypto-openssl"
+          - "crypto-rust,vendored"
+          - "crypto-openssl,vendored"
 
     steps:
       - name: install required packages
         run: |
           sudo apt-get update
           sudo apt-get install -y libdbus-1-dev libssl-dev
 
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - name: Fetch head
+        uses: actions/checkout@v5
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install rust stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: ${{ matrix.rust }}
-          components: clippy
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: $clippy-cache-${{ steps.toolchain.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: "Clippy ${{ matrix.rust }}"
-        run: cargo clippy --features=${{ matrix.feature }} --all-targets --workspace -- -D warnings
-
-  test:
-    name: Tests
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        rust:
-          - stable
-        feature:
-          - ""
-          - crypto-rust
-          - crypto-openssl
-
-    steps:
-      - name: install required packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libdbus-1-dev libssl-dev
-
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+          toolchain: stable
+          components: rustfmt, clippy
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: ${{ matrix.rust }}
+      - name: Format check
+        run: cargo fmt --check
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: $test-cache-${{ steps.toolchain.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
+      - name: Clippy check
+        run: cargo clippy --no-deps --all-targets -- -D warnings
 
       - name: Install gnome-keyring
         run: sudo apt-get install -y gnome-keyring
@@ -111,51 +46,29 @@ jobs:
         # the login password doesn't matter, but the keyring must be unlocked for the tests to work
         run: gnome-keyring-daemon --components=secrets --daemonize --unlock <<< 'foobar'
 
-      - name: Run tests
-        # run tests single-threaded to avoid race conditions
-        run: cargo test --features=${{ matrix.feature }} -- --test-threads=1
+      - name: Build and Test
+        run: cargo test --no-default-features --features=${{ matrix.features }} --verbose
 
-      - name: Run example
-        run: cargo run --features=${{ matrix.feature }} --example example
+      - name: Build examples
+        run: cargo build --examples --verbose
 
-  # MSRV, taken from matching secret-service.
-  check_msrv:
-    name: Check MSRV
+  ci_msrv:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        feature:
-          - ""
-          - crypto-rust
-          - crypto-openssl
-
     steps:
       - name: install required packages
         run: |
           sudo apt-get update
           sudo apt-get install -y libdbus-1-dev libssl-dev
 
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - name: Fetch head
+        uses: actions/checkout@v5
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install rust MSRV
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: "1.75.0"
+          toolchain: 1.78
           components: clippy
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: $clippy-cache-${{ steps.toolchain.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Generate lockfile
-        run: |
-          cargo generate-lockfile
-
-      - name: Clippy MSRV
-        run: cargo clippy --features=${{ matrix.feature }} --all-targets --workspace -- -D warnings
+      - name: Clippy check
+        run: cargo clippy --no-deps --all-targets -- -D warnings

CHANGELOG.md

@@ -1 +1,15 @@
-The detailed list of changes in each release can be found at https://github.com/hwchen/secret-service-rs/releases.
+## v4.1.0
+- expose dbus::Path fields on Items and Collections
+- allow creation of Items and Collections from a remembered path
+- update the MSRV to 1.78 (minimum for `Cargo.lock` version 4)
+- make lifetimes explicit to avoid Clippy complaints
+
+### v4.0.3
+- doc updates only (no code changes)
+
+### v4.0.2 API and doc fixes
+- add `Sync` to the error API
+- fix repository URL in `Cargo.toml`
+
+# v4.0.0 first public release
+- same API as v4 of the secret-service crate.

Cargo.toml

@@ -7,32 +7,29 @@ repository = "https://github.com/brotskydotcom/dbus-secret-service.git"
 keywords = ["secret-service", "password", "linux", "dbus"]
 license = "MIT OR Apache-2.0"
 name = "dbus-secret-service"
-version = "4.0.3"
+version = "4.1.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.78"   # required for Cargo.lock v4
 exclude = [".github/"]
 
 [features]
 vendored = ["dbus/vendored", "openssl?/vendored"]
-crypto-rust = ["dep:aes", "dep:block-padding", "dep:cbc", "dep:fastrand", "dep:hkdf", "dep:sha2"]
-crypto-openssl = ["dep:fastrand", "dep:openssl"]
+crypto-rust = ["dep:aes", "dep:block-padding", "dep:cbc", "dep:fastrand", "dep:hkdf", "dep:num", "dep:once_cell", "dep:sha2"]
+crypto-openssl = ["dep:fastrand", "dep:num", "dep:once_cell", "dep:openssl"]
 
 [dependencies]
 aes = { version = "0.8", optional = true }
 block-padding = { version = "0.3", features = ["std"], optional = true }
 cbc = { version = "0.1", features = ["block-padding", "alloc"], optional = true }
 dbus = "0.9"
 fastrand = { version = "2.3", optional = true }
-futures-util = "0.3"
 hkdf = { version = "0.12", optional = true }
-num = "0.4"
-once_cell = "1"
+num = { version = "0.4", optional = true }
+once_cell = { version = "1", optional = true }
 openssl = { version = "0.10.55", optional = true }
 sha2 = { version = "0.10", optional = true }
-zeroize = { version = "1.8.1", features = ["derive"] }
-
-[dev-dependencies]
-test-with = { version = "0.12", default-features = false }
+zeroize = { version = "1.8", features = ["derive"] }
 
 [package.metadata.docs.rs]
 features = ["crypto-rust"]
+targets = ["x86_64-unknown-linux-gnu"]

NOTES_ON_PORT.md

@@ -5,55 +5,37 @@
 [![crates.io](https://img.shields.io/crates/v/dbus-secret-service.svg?style=flat-square)](https://crates.io/crates/dbus-secret-service)
 [![docs.rs](https://docs.rs/dbus-secret-service/badge.svg)](https://docs.rs/dbus-secret-service)
 
-This crate is a knock-off of the [hwchen/secret-service](https://crates.io/crates/secret-service) crate, which is
-currently at version 4 and uses [zbus](https://crates.io/crates/zbus) to access the secret service. The basic
-collection, item and search APIs in this crate are meant to work the same as the blocking APIs in the zbus-based crate.
-If they don't, please file a bug.
+This crate started as a knock-off of the [secret-service](https://crates.io/crates/secret-service) crate, which uses [zbus](https://crates.io/crates/zbus) to access the secret service. The basic collection, item and search APIs in this crate are meant to work the same as the blocking APIs in the zbus-based crate. If they don't, please file a bug.
 
-Why do a knock-off? So that folks who write synchronous Rust apps that access the secret service (typically through
-the [hwchen/keyring](https://crates.io/crates/keyring) crate) are not required to add an async runtime. Because this
-knock-off uses lib-dbus, it doesn't require an async runtime.
-
-Why is this crate starting at version 4? Since its API matches a particular version of the dbus-based crate, I figured
-it would be clearest if its version number matched that version as well.
+Why do a knock-off? So that folks who write synchronous Rust apps that access the secret service (for example, [Keyring](https://open-source-cooperative/keyring-rs/wiki/Keyring) clients) are not required to add an async runtime. Because this knock-off uses lib-dbus, it doesn't require an async runtime.
 
 ## Usage
 
-For code usage examples, see the [documentation](https://docs.rs/dbus-secret-service).
+For code usage examples, see the [documentation](https://docs.rs/dbus-secret-service) and the [example program](https://github.com/open-source-cooperative/dbus-secret-service/blob/main/examples/example.rs).
 
-This crate has no default features, and requires no features to run. If you need your secrets to be encrypted on their
-way to and from the secret service, then add one of the crypto features:
+This crate has no default features, and requires no features to run. If you want your secrets to be encrypted on their
+way to and from the secret service (highly recommended), then add one of the crypto features:
 
 * `crypto-rust` uses pure Rust crates for encryption.
 * `crypto-openssl` uses the openssl libraries for encryption (which must be installed).
 
-See the [documentation](https://docs.rs/dbus-secret-service) for details on how to specify use of an encrypted session.
+See the [documentation](https://docs.rs/dbus-secret-service) for details on how to connect to the Secret Service with an encrypted session.
 
-To _build_ a project that uses this crate, your development machine will need
-to have the dbus development headers installed,
-and the openssl development headers for the `crypto-openssl` feature.
-To _run_ an application that uses this crate,
-your machine will need to have `libdbus` installed
-(almost all do),
-and the openssl libraries for the `crypto-openssl` feature.
-If you want to avoid this runtime requirement,
-you can specify the `vendored` feature at build time:
-this will statically link the needed libraries with your executable.
+To _build_ a project that uses this crate, your development machine will need to have the dbus development headers installed, and the openssl development headers for the `crypto-openssl` feature. To _run_ an application that uses this crate, your machine will need to have `libdbus` installed (almost all do), and the openssl libraries for the `crypto-openssl` feature. If you want to avoid this runtime requirement on clients, you can specify the `vendored` feature at build time: this will build and statically link the needed libraries with your executable.
 
 ### Functionality
 
-- SecretService: initialize dbus, create plain/encrypted session.
-- Collections: create, delete, search.
-- Items: create, delete, search, get/set secret.
+* SecretService: initialize dbus, create plain or encrypted session connection.
+* Collections: create, delete, search.
+* Items: create, delete, search, get/set secret.
 
-## Changelog
+## Change History
 
-v4.0.0: first release, same API as secret-service v4.0.
+See [CHANGELOG.md](CHANGELOG.md).
 
 ## License
 
-The copyright to all material in this repository belongs to the collective
-of contributors who have checked material into this repository.
+The copyright to all material in this repository belongs to the collective of contributors who have checked material into this repository.
 
 All material is this repository is licensed under either of
 
@@ -64,8 +46,4 @@ at your option.
 
 ## Contribution
 
-Unless you explicitly state otherwise,
-any contribution intentionally submitted for inclusion in the work by you,
-as defined in the Apache-2.0 license,
-shall be dual licensed as above,
-without any additional terms or conditions.
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.