Fixes #19675: Restart HTTP clients when configuration changes

Normation · Aug 6, 2021 · 19fe6d0 · 19fe6d0
1 parent c8cce28
commit 19fe6d0
Show file tree

Hide file tree

Showing 20 changed files with 484 additions and 255 deletions.
diff --git a/relay/sources/relayd/Cargo.lock b/relay/sources/relayd/Cargo.lock
diff --git a/relay/sources/relayd/Cargo.toml b/relay/sources/relayd/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "relayd"
+name = "rudder-relayd"
 version = "0.0.0-dev"
 authors = ["Rudder developers <dev@rudder.io>"]
 edition = "2018"
@@ -9,10 +9,6 @@ homepage = "https://www.rudder.io"
 repository = "https://github.com/Normation/rudder"
 license = "GPL-3.0-or-later"
 
-[[bin]]
-name = "rudder-relayd"
-path = "src/relayd.rs"
-
 [[bench]]
 harness = false
 name = "benches"

diff --git a/relay/sources/relayd/src/api/remote_run.rs b/relay/sources/relayd/src/api/remote_run.rs
@@ -278,7 +278,7 @@ impl RemoteRun {
             params.insert("nodes", nodes.join(","));
         }
 
-        let client = match job_config.downstream_clients.get(&id) {
+        let client = match job_config.downstream_clients.read().await.get(&id) {
             Some(c) => c.clone(),
             None => {
                 error!("unknown sub-relay '{}'", id);
@@ -287,6 +287,7 @@ impl RemoteRun {
         };
 
         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 {