From 2bb388a47784c13bfb63ea7ed92fa828101e91f2 Mon Sep 17 00:00:00 2001
From: Paul Z <info@pfz4.de>
Date: Wed, 6 Sep 2023 23:27:57 +0200
Subject: [PATCH] removed src requirement

---
 Cargo.lock                        | 172 +++---------------------------
 rebacs_server/Cargo.toml          |   7 +-
 rebacs_server/src/grpc_service.rs |  37 ++++---
 3 files changed, 34 insertions(+), 182 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 899f946..98db67b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -155,15 +155,6 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.13.0"
@@ -176,15 +167,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
-[[package]]
-name = "castaway"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.83"
@@ -201,35 +183,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "compact_str"
-version = "0.7.1"
+name = "crc32fast"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "castaway",
  "cfg-if",
- "itoa",
- "ryu",
- "static_assertions",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
 ]
 
 [[package]]
@@ -238,16 +197,6 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
 
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -321,6 +270,16 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "flate2"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -388,16 +347,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -458,12 +407,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "home"
 version = "0.5.5"
@@ -666,16 +609,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
-[[package]]
-name = "lock_api"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.20"
@@ -781,29 +714,6 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
-
 [[package]]
 name = "pem"
 version = "1.1.1"
@@ -990,17 +900,14 @@ dependencies = [
 name = "rebacs_server"
 version = "0.1.0"
 dependencies = [
- "compact_str",
  "dotenvy",
  "env_logger",
- "hex",
  "jsonwebtoken",
  "log",
  "prost",
  "rebacs_core",
  "reqwest",
  "serde",
- "sha2",
  "thiserror",
  "tokio",
  "tonic",
@@ -1161,12 +1068,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -1220,26 +1121,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "simple_asn1"
 version = "0.6.2"
@@ -1261,12 +1142,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "smallvec"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
-
 [[package]]
 name = "socket2"
 version = "0.4.9"
@@ -1293,12 +1168,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -1423,9 +1292,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
- "parking_lot",
  "pin-project-lite",
- "signal-hook-registry",
  "socket2 0.5.3",
  "tokio-macros",
  "windows-sys",
@@ -1498,6 +1365,7 @@ dependencies = [
  "axum",
  "base64 0.21.3",
  "bytes",
+ "flate2",
  "futures-core",
  "futures-util",
  "h2",
@@ -1601,12 +1469,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.13"
@@ -1645,12 +1507,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
 [[package]]
 name = "want"
 version = "0.3.1"
diff --git a/rebacs_server/Cargo.toml b/rebacs_server/Cargo.toml
index e630a75..6bb7646 100644
--- a/rebacs_server/Cargo.toml
+++ b/rebacs_server/Cargo.toml
@@ -11,13 +11,10 @@ log = "0.4.17"
 env_logger = "0.10.0"
 
 serde = { version="1.0", features=["derive"] }
-tokio = { version = "1.27.0", features = ["full"] }
+tokio = { version = "1.27.0", features = ["rt-multi-thread", "macros", "fs"] }
 
-tonic = { version="0.9.2", features=["tls"] }
+tonic = { version="0.9.2", features=["tls", "prost", "gzip"] }
 prost = "0.11.9"
-sha2 = "0.10.6"
-hex = "0.4.3"
-compact_str = "0.7.0"
 
 thiserror = "1.0.47"
 
diff --git a/rebacs_server/src/grpc_service.rs b/rebacs_server/src/grpc_service.rs
index ebf09c3..063eeb5 100644
--- a/rebacs_server/src/grpc_service.rs
+++ b/rebacs_server/src/grpc_service.rs
@@ -26,27 +26,26 @@ const USER_NS: &str = "user";
 
 macro_rules! extract {
     ($type:ident::Src($src:expr)) => {{
-        let src = $src
-            .as_ref()
-            .ok_or(Status::invalid_argument("src must be set"))?;
-        let src: RObjectOrSet = match src {
-            $type::Src::SrcObj(obj) => (obj.namespace.clone(), obj.id.clone(), None).into(),
-            $type::Src::SrcSet(set) => (
-                set.namespace.clone(),
-                set.id.clone(),
-                Some(set.relation.clone()),
-            )
-                .into(),
-        };
+        if let Some(src) = $src.as_ref() {
+            let src: RObjectOrSet = match src {
+                $type::Src::SrcObj(obj) => (obj.namespace.clone(), obj.id.clone(), None).into(),
+                $type::Src::SrcSet(set) => (
+                    set.namespace.clone(),
+                    set.id.clone(),
+                    Some(set.relation.clone()),
+                )
+                    .into(),
+            };
 
-        if src.namespace().is_empty() && src.id().is_empty() {
-            None
-        } else if src.namespace().is_empty() {
-            return Err(Status::invalid_argument("src.namespace must be set"));
-        } else if src.id().is_empty() {
-            return Err(Status::invalid_argument("src.id must be set"));
+            if src.namespace().is_empty() {
+                return Err(Status::invalid_argument("src.namespace must be set"));
+            } else if src.id().is_empty() {
+                return Err(Status::invalid_argument("src.id must be set"));
+            } else {
+                Some(src)
+            }
         } else {
-            Some(src)
+            None
         }
     }};
 }