Make authz asynchronous (#73)

Cargo.toml

@@ -20,23 +20,12 @@ chrono = { version = "0.4", features = ["serde"] }
 openssl = "*"
 diesel = { version = "1.4", features = ["postgres", "uuid", "chrono", "serde_json", "r2d2"] }
 diesel-derive-enum = { version = "0.4", features = ["postgres"] }
+futures = { version = "0.3", features = ["thread-pool"] }
+futures-channel = "0.3"
 svc-agent = { version = "0.9", features = ["diesel"] }
-svc-authz = "0.5"
+svc-authz = "0.9"
 svc-authn = { version = "0.5", features = ["jose", "diesel"] }
 svc-error = { version = "0.1", features = ["diesel", "r2d2", "svc-agent", "svc-authn", "svc-authz", "sentry-extension"] }
 
 [dev-dependencies]
 rand = "0.7"
-
-[dependencies.futures]
-version = "=0.3.0-alpha.18"
-package = "futures-preview"
-features = ["compat"]
-
-[dependencies.futures-channel]
-version = "=0.3.0-alpha.18"
-package = "futures-channel-preview"
-
-[patch.crates-io]
-# Use a branch with synchronous authz until 1.39 becomes stable (07.11.2019)
-svc-authz = { git = "https://github.com/netology-group/svc-authz-rs", branch = "sync" }

docker/Dockerfile

@@ -1,7 +1,7 @@
 ## -----------------------------------------------------------------------------
 ## Build
 ## -----------------------------------------------------------------------------
-FROM clux/muslrust:nightly-2019-09-05 as build-stage
+FROM clux/muslrust:nightly-2019-11-05 as build-stage
 
 WORKDIR "/build"
 COPY . .

src/app/endpoint/agent.rs

@@ -64,6 +64,7 @@ impl State {
                     vec!["rooms", &room_id, "agents"],
                     "list",
                 )
+                .await
                 .map_err(|err| SvcError::from(err))?
         };
 

src/app/endpoint/room.rs

@@ -102,6 +102,7 @@ impl State {
                 vec!["rooms"],
                 "create",
             )
+            .await
             .map_err(|err| SvcError::from(err))?;
 
         // Creating a Room
@@ -153,6 +154,7 @@ impl State {
                 vec!["rooms", &room_id],
                 "read",
             )
+            .await
             .map_err(|err| SvcError::from(err))?;
 
         shared::respond(&inreq, object, None, start_timestamp, authz_time)
@@ -188,6 +190,7 @@ impl State {
                 vec!["rooms", &room_id],
                 "update",
             )
+            .await
             .map_err(|err| SvcError::from(err))?;
 
         let object = {
@@ -234,6 +237,7 @@ impl State {
                 vec!["rooms", &room_id],
                 "delete",
             )
+            .await
             .map_err(|err| SvcError::from(err))?;
 
         {
@@ -278,6 +282,7 @@ impl State {
                 vec!["rooms", &room_id, "events"],
                 "subscribe",
             )
+            .await
             .map_err(|err| SvcError::from(err))?;
 
         agent::InsertQuery::new(inreq.properties().as_agent_id(), object.id()).execute(&conn)?;
@@ -978,7 +983,11 @@ mod test {
             let payload = json!({"id": room.id()});
             let state = State::new(authz.into(), db.connection_pool().clone());
             let request: EnterRequest = agent.build_request("room.enter", &payload).unwrap();
-            state.enter(request, Utc::now()).await.into_result().unwrap();
+            state
+                .enter(request, Utc::now())
+                .await
+                .into_result()
+                .unwrap();
 
             // Assert agent is in `in_progress` state in the DB.
             let conn = db.connection_pool().get().unwrap();

src/app/endpoint/rtc.rs

@@ -103,6 +103,7 @@ impl State {
                     vec!["rooms", &room_id, "rtcs"],
                     "create",
                 )
+                .await
                 .map_err(|err| SvcError::from(err))?
         };
 
@@ -163,6 +164,7 @@ impl State {
                     vec!["rooms", &room_id, "rtcs", &rtc_id],
                     "read",
                 )
+                .await
                 .map_err(|err| SvcError::from(err))?
         };
 
@@ -229,6 +231,7 @@ impl State {
                     vec!["rooms", &room_id, "rtcs", &rtc_id],
                     "read",
                 )
+                .await
                 .map_err(|err| SvcError::from(err))?
         };
 
@@ -281,6 +284,7 @@ impl State {
                     vec!["rooms", &room_id, "rtcs"],
                     "list",
                 )
+                .await
                 .map_err(|err| SvcError::from(err))?
         };
 

src/app/endpoint/rtc_signal.rs

@@ -215,6 +215,7 @@ impl State {
                 vec!["rooms", &room_id, "rtcs", &rtc_id],
                 action,
             )
+            .await
             .map_err(|err| SvcError::from(err))
     }
 }

src/app/endpoint/rtc_stream.rs

@@ -83,6 +83,7 @@ impl State {
                     vec!["rooms", &room_id, "rtcs"],
                     "list",
                 )
+                .await
                 .map_err(|err| SvcError::from(err))?
         };
 

src/app/endpoint/system.rs

@@ -75,6 +75,7 @@ impl State {
                 vec!["system"],
                 "update",
             )
+            .await
             .map_err(|err| SvcError::from(err))?;
 
         // TODO: Update 'finished_without_recordings' in order to return (backend,room,rtc)

src/app/mod.rs

@@ -75,7 +75,7 @@ pub(crate) async fn run(db: &ConnectionPool) -> Result<(), Error> {
     });
 
     // Authz
-    let authz = svc_authz::ClientMap::new(&config.id, config.authz)
+    let authz = svc_authz::ClientMap::new(&config.id, None, config.authz)
         .expect("Error converting authz config to clients");
 
     // Sentry
@@ -127,7 +127,7 @@ pub(crate) async fn run(db: &ConnectionPool) -> Result<(), Error> {
     .expect("Error subscribing to everyone's output messages");
 
     // Thread Pool
-    let mut threadpool = ThreadPoolBuilder::new().create()?;
+    let threadpool = ThreadPoolBuilder::new().create()?;
 
     while let Some(message) = mq_rx.next().await {
         let start_timestamp = Utc::now();

src/test_helpers/authz.rs

@@ -31,7 +31,7 @@ impl Into<ClientMap> for TestAuthz {
         config_map.insert(self.audience.to_owned(), Config::LocalWhitelist(config));
 
         let account_id = AccountId::new("conference", &self.audience);
-        ClientMap::new(&account_id, config_map).expect("Failed to build authz")
+        ClientMap::new(&account_id, None, config_map).expect("Failed to build authz")
     }
 }
 
@@ -44,5 +44,5 @@ pub(crate) fn no_authz(audience: &str) -> ClientMap {
     authz_config_map.insert(audience.to_owned(), authz_none_config);
 
     let account_id = AccountId::new("conference", audience);
-    svc_authz::ClientMap::new(&account_id, authz_config_map).expect("Failed to build authz")
+    svc_authz::ClientMap::new(&account_id, None, authz_config_map).expect("Failed to build authz")
 }