update deps and remove CORS

Author: fiji-flo

Cargo.lock

@@ -5,9 +5,9 @@ authors = ["Florian Merz <flomerz@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-dino_park_gate = { git = "https://github.com/fiji-flo/dino-park-gate", branch = "0.3.0", version = "0.3.0" }
-cis_client = { git = "https://github.com/mozilla-iam/cis_client-rust", branch = "0.4.0", version = "0.4.0", features = ["sync"] }
-cis_profile = { git = "https://github.com/mozilla-iam/cis_profile-rust", branch = "0.3.1", version = "0.3.1" }
+cis_client = { git = "https://github.com/mozilla-iam/cis_client-rust", tag = "0.6.2", version = "0.6.2", features = ["sync"] }
+cis_profile = { git = "https://github.com/mozilla-iam/cis_profile-rust", tag = "0.4.1", version = "0.4.1", features = ["aws", "vendored"] }
+dino_park_gate = { git = "https://github.com/mozilla-iam/dino-park-gate", tag = "0.7.0", version = "0.7.0" }
 actix-web = "2.0"
 actix-rt = "1.0"
 actix-cors = "0.2"

Cargo.toml

@@ -1,8 +1,6 @@
 use crate::notification::Notification;
 use crate::updater::UpdaterClient;
-use actix_cors::Cors;
 use actix_web::dev::HttpServiceFactory;
-use actix_web::http;
 use actix_web::web;
 use actix_web::web::Data;
 use actix_web::web::Json;
@@ -22,14 +20,6 @@ pub fn update_app<U: UpdaterClient + Clone + Send + 'static>(
     updater: U,
 ) -> impl HttpServiceFactory {
     web::scope("/update")
-        .wrap(
-            Cors::new()
-                .allowed_methods(vec!["POST"])
-                .allowed_headers(vec![http::header::AUTHORIZATION, http::header::ACCEPT])
-                .allowed_header(http::header::CONTENT_TYPE)
-                .max_age(3600)
-                .finish(),
-        )
         .data(updater)
         .service(web::resource("").route(web::post().to(update_event::<U>)))
 }

src/events/app.rs

@@ -1,6 +1,4 @@
-use actix_cors::Cors;
 use actix_web::dev::HttpServiceFactory;
-use actix_web::http;
 use actix_web::web;
 use actix_web::HttpRequest;
 use actix_web::HttpResponse;
@@ -10,14 +8,5 @@ fn healthz(_: HttpRequest) -> HttpResponse {
 }
 
 pub fn healthz_app() -> impl HttpServiceFactory {
-    web::scope("/healthz")
-        .wrap(
-            Cors::new()
-                .allowed_methods(vec!["GET", "HEAD"])
-                .allowed_headers(vec![http::header::AUTHORIZATION, http::header::ACCEPT])
-                .allowed_header(http::header::CONTENT_TYPE)
-                .max_age(3600)
-                .finish(),
-        )
-        .service(web::resource("").to(healthz))
+    web::scope("/healthz").service(web::resource("").to(healthz))
 }

src/healthz.rs

@@ -2,11 +2,9 @@ use crate::bulk::Bulk;
 use crate::settings::DinoParkSettings;
 use crate::updater::send_profile;
 use crate::updater::UpdaterClient;
-use actix_cors::Cors;
 use actix_web::dev::HttpServiceFactory;
 use actix_web::error;
 use actix_web::error::Error;
-use actix_web::http;
 use actix_web::web;
 use actix_web::web::Data;
 use actix_web::web::Json;
@@ -56,14 +54,6 @@ pub fn internal_app<U: UpdaterClient + Clone + Send + 'static>(
     updater: U,
 ) -> impl HttpServiceFactory {
     web::scope("")
-        .wrap(
-            Cors::new()
-                .allowed_methods(vec!["POST"])
-                .allowed_headers(vec![http::header::AUTHORIZATION, http::header::ACCEPT])
-                .allowed_header(http::header::CONTENT_TYPE)
-                .max_age(3600)
-                .finish(),
-        )
         .data(updater)
         .data(dino_park_settings)
         .app_data(web::JsonConfig::default().limit(1_048_576))

src/internal/app.rs

@@ -39,13 +39,18 @@ fn main() -> Result<(), Error> {
     );
     env_logger::init();
     info!("building the lookout");
+    let mut rt = System::new("lookout-actix-rt");
     let s = settings::Settings::new().map_err(|e| format_err!("unable to load settings: {}", e))?;
-    let cis_client = CisClient::from_settings(&s.cis)
-        .map_err(|e| format_err!("unable to create cis_client: {}", e))?;
+    let cis_settings = s.cis.clone();
+    let cis_client = rt.block_on(async move {
+        CisClient::from_settings(&cis_settings)
+            .await
+            .map_err(|e| format_err!("unable to create cis_client: {}", e))
+    })?;
     let dino_park = s.dino_park.clone();
     let validation_settings = s.auth.validation.clone();
-    let mut rt = tokio::runtime::Runtime::new()?;
-    let provider = rt.block_on(Provider::from_issuer(&s.auth.issuer))?;
+    let issuer = s.auth.issuer;
+    let provider = rt.block_on(async move { Provider::from_issuer(&issuer).await })?;
     // Start http server
     let updater = InternalUpdater::new(cis_client, dino_park.clone());
 
@@ -76,7 +81,7 @@ fn main() -> Result<(), Error> {
     })
     .bind("0.0.0.0:8082")?;
 
-    System::new("lookout-actix-rt").block_on(async move { server.run().await })?;
+    rt.block_on(async move { server.run().await })?;
 
     info!("Stopped http server");
     stop_client.stop();

src/main.rs

@@ -204,12 +204,7 @@ pub async fn update(
     };
     info!(
         "{} is active: {}",
-        profile
-            .user_id
-            .value
-            .as_ref()
-            .map(String::as_str)
-            .unwrap_or_else(|| "?"),
+        profile.user_id.value.as_deref().unwrap_or_else(|| "?"),
         profile.active.value.as_ref().unwrap_or_else(|| &false)
     );
     send_profile(dp, profile).await