Add a git credential helper

.github/workflows/CI.yml

@@ -62,6 +62,10 @@ jobs:
         run: |
           cargo build --manifest-path ./portal/Cargo.toml
 
+      - name: Build git-credential-oo7
+        run: |
+          cargo build --manifest-path ./git-credential/Cargo.toml
+
       - name: Test (native)
         run: |
           cargo test --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features native_crypto --features schema

Cargo.toml

@@ -5,6 +5,7 @@ members = [
   "cargo-credential",
   "client",
   "cli",
+  "git-credential",
   "kwallet/cli",
   "kwallet/parser",
   "macros",

README.md

@@ -9,6 +9,7 @@ The repository consists of the following projects:
 - [cargo-credential](./cargo-credential/): a [cargo credential](https://doc.rust-lang.org/stable/cargo/reference/registry-authentication.html#registry-authentication) provider
 - [cli](./cli/): a secret-tool replacement
 - [client](./client/): the client side library
+- [git-credential](./git-credential/): a [git credential helper](https://git-scm.com/docs/gitcredentials), replacement for git-credential-libsecret
 - [pam](./pam/): PAM integration for the server implementation
 - [portal](./portal/): [org.freedesktop.impl.portal.Secret](https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.impl.portal.Secret.html) implementation
 - [server](./server/): [org.freedesktop.secrets](https://specifications.freedesktop.org/secret-service-spec/latest/) server implementation

cargo-credential/src/main.rs

@@ -27,15 +27,15 @@ impl SecretServiceCredential {
                     return Err(Error::NotFound);
                 }
 
+                let secret = items[0]
+                    .secret()
+                    .await
+                    .map_err(|err| Error::Other(Box::new(err)))?;
                 let token = Secret::from(
-                    std::str::from_utf8(
-                        &items[0]
-                            .secret()
-                            .await
-                            .map_err(|err| Error::Other(Box::new(err)))?,
-                    )
-                    .unwrap()
-                    .to_owned(),
+                    secret
+                        .as_str()
+                        .ok_or_else(|| Error::Other("secret is not valid UTF-8".into()))?
+                        .to_owned(),
                 );
 
                 Ok(CredentialResponse::Get {

cli/src/main.rs

@@ -147,13 +147,12 @@ impl ItemOutput {
         .unwrap();
 
         let secret_str = secret.map(|s| {
-            let bytes = s.as_bytes();
             if as_hex {
-                hex::encode(bytes)
+                hex::encode(s.as_bytes())
             } else {
-                match std::str::from_utf8(bytes) {
-                    Ok(s) => s.to_string(),
-                    Err(_) => hex::encode(bytes),
+                match s.as_str() {
+                    Some(s) => s.to_string(),
+                    None => hex::encode(s.as_bytes()),
                 }
             }
         });

client/src/secret.rs

@@ -107,6 +107,15 @@ impl Secret {
         }
     }
 
+    /// Returns the secret as a string slice, or `None` if it is not valid
+    /// UTF-8.
+    pub fn as_str(&self) -> Option<&str> {
+        match self {
+            Self::Text(text) => Some(text.as_str()),
+            Self::Blob(bytes) => std::str::from_utf8(bytes).ok(),
+        }
+    }
+
     pub fn as_bytes(&self) -> &[u8] {
         match self {
             Self::Text(text) => text.as_bytes(),

coverage.sh

@@ -54,6 +54,7 @@ grcov coverage-raw/combined.info \
   --ignore-not-existing \
   --ignore "**/portal/*" \
   --ignore "**/python/*" \
+  --ignore "**/git-credential/*" \
   --ignore "**/cli/*" \
   --ignore "**/pam/*" \
   --ignore "**/tests/*" \
@@ -74,6 +75,7 @@ grcov coverage-raw/combined.info \
   --ignore-not-existing \
   --ignore "**/portal/*" \
   --ignore "**/python/*" \
+  --ignore "**/git-credential/*" \
   --ignore "**/cli/*" \
   --ignore "**/pam/*" \
   --ignore "**/tests/*" \

git-credential/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "git-credential-oo7"
+description = "Git credential helper using oo7"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+keywords.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
+license.workspace = true
+rust-version.workspace = true
+exclude.workspace = true
+
+[dependencies]
+oo7 = { workspace = true, features = ["tokio", "schema"] }
+tokio = { workspace = true, features = ["macros", "rt"] }
+
+[features]
+default = ["native_crypto"]
+native_crypto = ["oo7/native_crypto"]
+openssl_crypto = ["oo7/openssl_crypto"]

git-credential/LICENSE

@@ -0,0 +1 @@
+../LICENSE

git-credential/README.md

@@ -0,0 +1,20 @@
+
+# git-credential-oo7
+
+[![crates.io](https://img.shields.io/crates/v/git-credential-oo7)](https://crates.io/crates/git-credential-oo7)
+
+A [git credential helper](https://git-scm.com/docs/gitcredentials) built using oo7 instead of [libsecret](https://gitlab.gnome.org/GNOME/libsecret).
+
+## Installation
+
+1 - `cargo install git-credential-oo7`
+
+2 - Set as the default credential helper
+
+```
+git config --global credential.helper oo7
+```
+
+## License
+
+The project is released under the MIT license.