slim-bindings 0.4.0__tar.gz → 0.4.1__tar.gz

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/Cargo.lock

@@ -17,6 +17,16 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "agntcy-protoc-srpc-plugin"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "prost 0.14.1",
+ "prost-types 0.14.1",
+]
+
 [[package]]
 name = "agntcy-slim"
 version = "0.4.0"
@@ -94,6 +104,7 @@ name = "agntcy-slim-config"
 version = "0.2.0"
 dependencies = [
  "agntcy-slim-auth",
+ "base64 0.22.1",
  "drain",
  "duration-str",
  "futures",
@@ -102,8 +113,9 @@ dependencies = [
  "hyper-util",
  "lazy_static",
  "parking_lot",
- "prost",
+ "prost 0.13.5",
  "protoc-bin-vendored",
+ "rand 0.9.1",
  "regex",
  "rustls",
  "rustls-native-certs",
@@ -137,7 +149,7 @@ dependencies = [
  "drain",
  "h2 0.4.10",
  "parking_lot",
- "prost",
+ "prost 0.13.5",
  "protoc-bin-vendored",
  "serde",
  "serde_json",
@@ -166,7 +178,7 @@ dependencies = [
  "h2 0.4.10",
  "opentelemetry",
  "parking_lot",
- "prost",
+ "prost 0.13.5",
  "protoc-bin-vendored",
  "rand 0.9.1",
  "thiserror 2.0.12",
@@ -2114,11 +2126,11 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -2380,12 +2392,11 @@ checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2540,7 +2551,7 @@ dependencies = [
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry_sdk",
- "prost",
+ "prost 0.13.5",
  "reqwest",
  "thiserror 2.0.12",
  "tokio",
@@ -2556,7 +2567,7 @@ checksum = "8c40da242381435e18570d5b9d50aca2a4f4f4d8e146231adb4e7768023309b3"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
- "prost",
+ "prost 0.13.5",
  "tonic 0.12.3",
 ]
 
@@ -2604,12 +2615,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2842,7 +2847,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.13.5",
+]
+
+[[package]]
+name = "prost"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
+dependencies = [
+ "bytes",
+ "prost-derive 0.14.1",
 ]
 
 [[package]]
@@ -2858,8 +2873,8 @@ dependencies = [
  "once_cell",
  "petgraph",
  "prettyplease 0.2.34",
- "prost",
- "prost-types",
+ "prost 0.13.5",
+ "prost-types 0.13.5",
  "regex",
  "syn 2.0.103",
  "tempfile",
@@ -2878,13 +2893,35 @@ dependencies = [
  "syn 2.0.103",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
+dependencies = [
+ "anyhow",
+ "itertools 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.103",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
 dependencies = [
- "prost",
+ "prost 0.13.5",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72"
+dependencies = [
+ "prost 0.14.1",
 ]
 
 [[package]]
@@ -3240,17 +3277,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -3261,15 +3289,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -3747,9 +3769,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slim-examples"
@@ -4167,7 +4189,7 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost",
+ "prost 0.13.5",
  "tokio",
  "tokio-stream",
  "tower 0.4.13",
@@ -4195,7 +4217,7 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost",
+ "prost 0.13.5",
  "socket2",
  "tokio",
  "tokio-stream",
@@ -4214,7 +4236,7 @@ dependencies = [
  "prettyplease 0.2.34",
  "proc-macro2",
  "prost-build",
- "prost-types",
+ "prost-types 0.13.5",
  "quote",
  "syn 2.0.103",
 ]
@@ -4370,14 +4392,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -4687,22 +4709,6 @@ dependencies = [
  "rustix 0.38.44",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
@@ -4712,12 +4718,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.61.2"

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/Cargo.toml

@@ -10,6 +10,7 @@ default-members = [
     "core/service",
     "core/signal",
     "core/tracing",
+    "srpc-compiler",
     "examples",
     "testing",
 ]
@@ -30,6 +31,8 @@ agntcy-slim-service = { path = "core/service", version = "0.5.0" }
 agntcy-slim-signal = { path = "core/signal", version = "0.1.3" }
 agntcy-slim-tracing = { path = "core/tracing", version = "0.2.2" }
 
+anyhow = "1.0.98"
+
 async-trait = "0.1.88"
 aws-lc-rs = "1.13.1"
 base64 = "0.22"

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slim-bindings
-Version: 0.4.0
+Version: 0.4.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/core/auth/src/builder.rs

@@ -654,7 +654,7 @@ mod tests {
 
         let claims = signer.create_claims();
         let token = signer.sign(&claims).unwrap();
-        let verified: crate::traits::StandardClaims = verifier.verify(&token).await.unwrap();
+        let verified: crate::traits::StandardClaims = verifier.get_claims(&token).await.unwrap();
 
         assert_eq!(verified.iss.unwrap(), "test-issuer");
         assert_eq!(verified.aud.unwrap(), &["test-audience"]);
@@ -710,7 +710,7 @@ mod tests {
         };
 
         let token = signer.sign(&custom_claims).unwrap();
-        let verified: CustomClaims = verifier.verify(&token).await.unwrap();
+        let verified: CustomClaims = verifier.get_claims(&token).await.unwrap();
 
         assert_eq!(verified, custom_claims);
     }

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/core/auth/src/jwt.rs

@@ -540,14 +540,26 @@ impl TokenProvider for StaticTokenProvider {
 
 #[async_trait]
 impl Verifier for VerifierJwt {
-    async fn verify<Claims>(&self, token: impl Into<String> + Send) -> Result<Claims, AuthError>
+    async fn verify(&self, token: impl Into<String> + Send) -> Result<(), AuthError> {
+        // Just verify the token is valid, don't extract claims
+        self.verify_claims::<StandardClaims>(token)
+            .await
+            .map(|_| ())
+    }
+
+    fn try_verify(&self, token: impl Into<String>) -> Result<(), AuthError> {
+        // Just verify the token is valid, don't extract claims
+        self.try_verify_claims::<StandardClaims>(token).map(|_| ())
+    }
+
+    async fn get_claims<Claims>(&self, token: impl Into<String> + Send) -> Result<Claims, AuthError>
     where
         Claims: serde::de::DeserializeOwned + Send,
     {
         self.verify_claims(token).await
     }
 
-    fn try_verify<Claims>(&self, token: impl Into<String>) -> Result<Claims, AuthError>
+    fn try_get_claims<Claims>(&self, token: impl Into<String>) -> Result<Claims, AuthError>
     where
         Claims: serde::de::DeserializeOwned + Send,
     {
@@ -710,7 +722,7 @@ mod tests {
         let claims = signer.create_claims();
         let token = signer.sign(&claims).unwrap();
 
-        let verified_claims: StandardClaims = jwt.verify(token.clone()).await.unwrap();
+        let verified_claims: StandardClaims = jwt.get_claims(token.clone()).await.unwrap();
 
         assert_eq!(verified_claims.iss.unwrap(), "test-issuer");
         assert_eq!(verified_claims.aud.unwrap(), &["test-audience"]);
@@ -739,7 +751,7 @@ mod tests {
         let claims = signer.create_claims();
         let token = signer.sign(&claims).unwrap();
 
-        let verified_claims: StandardClaims = jwt.verify(token.clone()).await.unwrap();
+        let verified_claims: StandardClaims = jwt.get_claims(token.clone()).await.unwrap();
 
         assert_eq!(verified_claims.iss.unwrap(), "test-issuer");
         assert_eq!(verified_claims.aud.unwrap(), &["test-audience"]);
@@ -777,7 +789,7 @@ mod tests {
         let claims = signer.create_claims();
         let token = signer.sign_claims(&claims).unwrap();
 
-        let verified_claims: StandardClaims = verifier.verify(token.clone()).await.unwrap();
+        let verified_claims: StandardClaims = verifier.get_claims(token.clone()).await.unwrap();
 
         assert_eq!(verified_claims.iss.unwrap(), "test-issuer");
         assert_eq!(verified_claims.aud.unwrap(), ["test-audience"]);
@@ -786,7 +798,7 @@ mod tests {
         // Try to verify with an invalid token
         let invalid_token = "invalid.token.string";
         let result: Result<StandardClaims, AuthError> =
-            verifier.verify(invalid_token.to_string()).await;
+            verifier.get_claims(invalid_token.to_string()).await;
         assert!(
             result.is_err(),
             "Expected verification to fail for invalid token"
@@ -804,7 +816,8 @@ mod tests {
             })
             .build()
             .unwrap();
-        let wrong_result: Result<StandardClaims, AuthError> = wrong_verifier.verify(token).await;
+        let wrong_result: Result<StandardClaims, AuthError> =
+            wrong_verifier.get_claims(token).await;
         assert!(
             wrong_result.is_err(),
             "Expected verification to fail with wrong key"
@@ -854,7 +867,7 @@ mod tests {
         claims.custom_claims = custom_claims;
         let token = signer.sign_claims(&claims).unwrap();
 
-        let verified_claims: StandardClaims = verifier.verify(token).await.unwrap();
+        let verified_claims: StandardClaims = verifier.get_claims(token).await.unwrap();
 
         assert_eq!(verified_claims.custom_claims.get("role").unwrap(), "admin");
         assert_eq!(
@@ -897,7 +910,7 @@ mod tests {
 
         // Sign and verify the token
         let token = signer.sign_claims(&signer.create_claims()).unwrap();
-        let claims: StandardClaims = verifier.verify(token).await.unwrap();
+        let claims: StandardClaims = verifier.get_claims(token).await.unwrap();
 
         // Validate the claims
         assert_eq!(claims.iss.unwrap(), mock_server.uri());
@@ -982,14 +995,14 @@ mod tests {
         let token = signer.sign_claims(&claims).unwrap();
 
         // First verification
-        let first_result: StandardClaims = verifier.try_verify(token.clone()).unwrap();
+        let first_result: StandardClaims = verifier.try_get_claims(token.clone()).unwrap();
 
         // Alter the decoding_key to simulate a situation where signature verification would fail
         // if attempted again. Since we're using the cache, it should still work.
         verifier.decoding_key = None;
 
         // Second verification with the same token - should use the cache
-        let second_result: StandardClaims = verifier.try_verify(token.clone()).unwrap();
+        let second_result: StandardClaims = verifier.try_get_claims(token.clone()).unwrap();
 
         // Both results should be the same
         assert_eq!(first_result.iss, second_result.iss);
@@ -1010,7 +1023,7 @@ mod tests {
         let token2 = signer.sign_claims(&claims2).unwrap();
 
         // Verify the new token - should fail because we removed the decoding_key
-        let result = verifier.try_verify::<StandardClaims>(token2);
+        let result = verifier.try_get_claims::<StandardClaims>(token2);
         assert!(
             result.is_err(),
             "Should have failed due to missing decoding key"

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/core/auth/src/jwt_middleware.rs

@@ -274,7 +274,7 @@ where
                 let bearer_token = bearer.token().to_string();
 
                 // Let's first try to perform the verification without cloning the verifier
-                match self.verifier.try_verify::<Claim>(&bearer_token) {
+                match self.verifier.try_get_claims::<Claim>(&bearer_token) {
                     Ok(claims) => {
                         // Store claims in request extensions
                         req.extensions_mut().insert(claims);
@@ -294,7 +294,7 @@ where
                             request: req,
                             verifier_future: Box::pin(async move {
                                 // Perform the verification asynchronously
-                                verifier.verify::<Claim>(&bearer_token).await
+                                verifier.get_claims::<Claim>(&bearer_token).await
                             }),
                             service: inner,
                             _phantom: self._phantom,
@@ -702,7 +702,7 @@ mod tests {
         );
 
         let ret_claims = verifier
-            .try_verify::<StandardClaims>(&token)
+            .try_get_claims::<StandardClaims>(&token)
             .expect("Failed to verify token");
 
         // Check the claims are as expected

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/core/auth/src/shared_secret.rs

@@ -50,20 +50,11 @@ impl TokenProvider for SharedSecret {
 
 #[async_trait::async_trait]
 impl Verifier for SharedSecret {
-    async fn verify<Claims>(&self, token: impl Into<String> + Send) -> Result<Claims, AuthError>
-    where
-        Claims: serde::de::DeserializeOwned + Send,
-    {
+    async fn verify(&self, token: impl Into<String> + Send) -> Result<(), AuthError> {
         self.try_verify(token)
     }
 
-    fn try_verify<Claims>(
-        &self,
-        token: impl Into<String>,
-    ) -> Result<Claims, crate::errors::AuthError>
-    where
-        Claims: serde::de::DeserializeOwned + Send,
-    {
+    fn try_verify(&self, token: impl Into<String>) -> Result<(), AuthError> {
         let token = token.into();
 
         // Split the token into shared_secret and id
@@ -73,11 +64,26 @@ impl Verifier for SharedSecret {
         }
 
         if parts[0] == self.shared_secret {
-            Ok(serde_json::from_str(r#"{"exp":0}"#).unwrap())
+            Ok(())
         } else {
             Err(AuthError::TokenInvalid(
                 "shared secret mismatch".to_string(),
             ))
         }
     }
+
+    async fn get_claims<Claims>(&self, token: impl Into<String> + Send) -> Result<Claims, AuthError>
+    where
+        Claims: serde::de::DeserializeOwned + Send,
+    {
+        self.try_get_claims(token)
+    }
+
+    fn try_get_claims<Claims>(&self, token: impl Into<String>) -> Result<Claims, AuthError>
+    where
+        Claims: serde::de::DeserializeOwned + Send,
+    {
+        self.try_verify(token.into())?;
+        Ok(serde_json::from_str(r#"{"exp":0}"#).unwrap())
+    }
 }

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/core/auth/src/traits.rs

@@ -66,16 +66,24 @@ impl StandardClaims {
 /// Trait for verifying JWT tokens
 #[async_trait]
 pub trait Verifier {
-    /// Verifies the JWT token and returns the claims if valid.
-    ///
+    /// Verifies the token.
+    async fn verify(&self, token: impl Into<String> + Send) -> Result<(), AuthError>;
+
+    /// Try to verify the token without async context.
+    fn try_verify(&self, token: impl Into<String>) -> Result<(), AuthError>;
+
+    /// Gets the claims from the token after verification.
     /// The `Claims` type parameter represents the expected structure of the JWT claims.
-    async fn verify<Claims>(&self, token: impl Into<String> + Send) -> Result<Claims, AuthError>
+    async fn get_claims<Claims>(
+        &self,
+        token: impl Into<String> + Send,
+    ) -> Result<Claims, AuthError>
     where
         Claims: DeserializeOwned + Send;
 
-    /// Try to verify the JWT token without async context and return the claims if valid.
+    /// Try to get claims from the token without async context.
     /// If an async operation is needed, an error is returned.
-    fn try_verify<Claims>(&self, token: impl Into<String>) -> Result<Claims, AuthError>
+    fn try_get_claims<Claims>(&self, token: impl Into<String>) -> Result<Claims, AuthError>
     where
         Claims: DeserializeOwned + Send;
 }

{slim_bindings-0.4.0 → slim_bindings-0.4.1}/core/config/Cargo.toml

@@ -15,12 +15,13 @@ path = "src/grpc/schema/generate_schema.rs"
 
 [dependencies]
 agntcy-slim-auth.workspace = true
+base64 = { workspace = true }
 drain = { workspace = true }
 duration-str = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
 hyper-rustls = { workspace = true }
-hyper-util = { workspace = true }
+hyper-util = { workspace = true, features = ["client-proxy-system"] }
 lazy_static = { workspace = true }
 parking_lot = { workspace = true }
 prost = { workspace = true }
@@ -48,5 +49,6 @@ protoc-bin-vendored = { workspace = true }
 tonic-build = { workspace = true }
 
 [dev-dependencies]
+rand = { workspace = true }
 serde_json = { workspace = true }
 tracing-test = { workspace = true }