Work in progress

amousset · Aug 6, 2021 · 656efa0 · 656efa0
1 parent c8cce28
commit 656efa0
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 112 deletions.
diff --git a/relay/sources/relayd/Cargo.lock b/relay/sources/relayd/Cargo.lock
diff --git a/relay/sources/relayd/src/api/remote_run.rs b/relay/sources/relayd/src/api/remote_run.rs
@@ -279,14 +279,15 @@ impl RemoteRun {
         }
 
         let client = match job_config.downstream_clients.get(&id) {
-            Some(c) => c.clone(),
+            Some(c) => c.read().await.clone(),
             None => {
                 error!("unknown sub-relay '{}'", id);
                 return Box::new(futures::stream::empty());
             }
         };
 
         let response = client
+            .client()
             .post(&format!(
                 "https://{}:{}/rudder/relay-api/remote-run/{}",
                 hostname,

diff --git a/relay/sources/relayd/src/api/shared_files.rs b/relay/sources/relayd/src/api/shared_files.rs
@@ -160,9 +160,8 @@ async fn put_forward(
     job_config: Arc<JobConfig>,
     body: Bytes,
 ) -> Result<StatusCode, Error> {
-    job_config
-        .upstream_client
-        .clone()
+    let client = job_config.upstream_client.read().await.client().clone();
+    client
         .put(&format!(
             "{}/{}/{}",
             job_config.cfg.upstream_url(),
@@ -299,9 +298,9 @@ async fn head_forward(
     params: SharedFilesHeadParams,
     job_config: Arc<JobConfig>,
 ) -> Result<StatusCode, Error> {
-    job_config
-        .upstream_client
-        .clone()
+    let client = job_config.upstream_client.read().await.client().clone();
+
+    client
         .head(&format!(
             "{}/{}/{}",
             job_config.cfg.upstream_url(),

diff --git a/relay/sources/relayd/src/configuration/main.rs b/relay/sources/relayd/src/configuration/main.rs
@@ -121,6 +121,16 @@ impl Configuration {
         })
     }
 
+    pub fn peer_authentication(&self) -> PeerAuthentication {
+        // compute actual model
+        if !self.output.upstream.verify_certificates {
+            warn!("output.upstream.verify_certificates parameter is deprecated, use general.peer_authentication instead");
+            PeerAuthentication::DangerousNone
+        } else {
+            self.general.peer_authentication
+        }
+    }
+
     /// Gives current url of the upstream relay API
     /// Can be removed once upstream.url is removed
     pub fn upstream_url(&self) -> String {
@@ -175,7 +185,7 @@ pub struct GeneralConfig {
     pub https_port: u16,
     /// Which certificate validation model to use
     #[serde(default = "GeneralConfig::default_peer_authentication")]
-    pub peer_authentication: PeerAuthentication,
+    peer_authentication: PeerAuthentication,
 }
 
 impl GeneralConfig {