[PATCH installer v3 26/38] common: http: allow passing custom headers to post()

[Christoph Heiss <c.heiss@proxmox.com>]

Add an additional parameter to allow passing in additional headers.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Changes v2 -> v3:
  * new patch

 .../src/fetch_plugins/http.rs                 | 12 ++++--
 proxmox-installer-common/src/http.rs          | 40 ++++++++++++++++---
 proxmox-post-hook/src/main.rs                 | 22 ++++------
 3 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/proxmox-fetch-answer/src/fetch_plugins/http.rs b/proxmox-fetch-answer/src/fetch_plugins/http.rs
index e2fd633..b958a35 100644
--- a/proxmox-fetch-answer/src/fetch_plugins/http.rs
+++ b/proxmox-fetch-answer/src/fetch_plugins/http.rs
@@ -7,6 +7,7 @@ use std::{
 };
 
 use proxmox_auto_installer::{sysinfo::SysInfo, utils::HttpOptions};
+use proxmox_installer_common::http::{self, header::HeaderMap};
 
 static ANSWER_URL_SUBDOMAIN: &str = "proxmox-auto-installer";
 static ANSWER_CERT_FP_SUBDOMAIN: &str = "proxmox-auto-installer-cert-fingerprint";
@@ -130,9 +131,14 @@ impl FetchFromHTTP {
         let payload = HttpFetchPayload::as_json()?;
 
         info!("Sending POST request to '{answer_url}'.");
-        let answer =
-            proxmox_installer_common::http::post(&answer_url, fingerprint.as_deref(), payload)?;
-        Ok(answer)
+
+        Ok(http::post(
+            &answer_url,
+            fingerprint.as_deref(),
+            HeaderMap::new(),
+            payload,
+        )?
+        .0)
     }
 
     /// Fetches search domain from resolv.conf file
diff --git a/proxmox-installer-common/src/http.rs b/proxmox-installer-common/src/http.rs
index 7662673..f04552a 100644
--- a/proxmox-installer-common/src/http.rs
+++ b/proxmox-installer-common/src/http.rs
@@ -13,6 +13,9 @@ use ureq::unversioned::transport::{
     Transport, TransportAdapter,
 };
 
+// Re-export for conviencence when using post()
+pub use ureq::http::header;
+
 /// Builds an [`Agent`] with TLS suitable set up, depending whether a custom fingerprint was
 /// supplied or not. If a fingerprint was supplied, only matching certificates will be accepted.
 /// Otherwise, the system certificate store is loaded.
@@ -95,18 +98,43 @@ pub fn get_as_bytes(url: &str, fingerprint: Option<&str>, max_size: usize) -> Re
 /// openssl s_client -connect <host>:443 < /dev/null 2>/dev/null | openssl x509 -fingerprint -sha256  -noout -in /dev/stdin
 /// ```
 ///
+/// The `Content-Type` header is automatically set to `application/json`.
+///
 /// # Arguments
 /// * `url` - URL to call
 /// * `fingerprint` - SHA256 cert fingerprint if certificate pinning should be used. Optional.
+/// * `headers` - Additional headers to add to the request.
 /// * `payload` - The payload to send to the server. Expected to be a JSON formatted string.
-pub fn post(url: &str, fingerprint: Option<&str>, payload: String) -> Result<String> {
+///
+/// # Returns
+///
+/// A tuple containing
+/// * The body contents, as returned by the server
+/// * The content type of the response, if set in the response headers
+pub fn post(
+    url: &str,
+    fingerprint: Option<&str>,
+    headers: header::HeaderMap,
+    payload: String,
+) -> Result<(String, Option<String>)> {
     // TODO: read_to_string limits the size to 10 MB, should be increase that?
-    Ok(build_agent(fingerprint)?
+
+    let mut request = build_agent(fingerprint)?
         .post(url)
-        .header("Content-Type", "application/json; charset=utf-8")
-        .send(&payload)?
-        .body_mut()
-        .read_to_string()?)
+        .header("Content-Type", "application/json; charset=utf-8");
+
+    for (name, value) in headers.iter() {
+        request = request.header(name, value);
+    }
+
+    let mut response = request.send(&payload)?;
+    let content_type = response
+        .headers()
+        .get(header::CONTENT_TYPE)
+        .and_then(|h| h.to_str().ok())
+        .map(|s| s.to_owned());
+
+    Ok((response.body_mut().read_to_string()?, content_type))
 }
 
 #[derive(Debug)]
diff --git a/proxmox-post-hook/src/main.rs b/proxmox-post-hook/src/main.rs
index a792b6d..2ee0231 100644
--- a/proxmox-post-hook/src/main.rs
+++ b/proxmox-post-hook/src/main.rs
@@ -9,6 +9,8 @@
 //! Relies on `proxmox-chroot` as an external dependency to (bind-)mount the
 //! previously installed system.
 
+use anyhow::{Context, Result, anyhow, bail};
+use serde::Serialize;
 use std::{
     collections::HashSet,
     ffi::CStr,
@@ -19,7 +21,6 @@ use std::{
     process::{Command, ExitCode},
 };
 
-use anyhow::{Context, Result, anyhow, bail};
 use proxmox_auto_installer::{
     answer::{
         Answer, FqdnConfig, FqdnExtendedConfig, FqdnSourceMode, PostNotificationHookInfo,
@@ -27,6 +28,7 @@ use proxmox_auto_installer::{
     },
     udevinfo::{UdevInfo, UdevProperties},
 };
+use proxmox_installer_common::http::{self, header::HeaderMap};
 use proxmox_installer_common::{
     options::{Disk, FsType, NetworkOptions},
     setup::{
@@ -36,7 +38,6 @@ use proxmox_installer_common::{
     sysinfo::SystemDMI,
     utils::CidrAddress,
 };
-use serde::Serialize;
 
 /// Information about the system boot status.
 #[derive(Serialize)]
@@ -536,11 +537,7 @@ impl PostHookInfo {
             .map(|v| {
                 // /proc/version: "Linux version 6.17.2-1-pve (...) #1 SMP ..."
                 // extract everything after the second space
-                v.splitn(3, ' ')
-                    .nth(2)
-                    .unwrap_or("")
-                    .trim()
-                    .to_owned()
+                v.splitn(3, ' ').nth(2).unwrap_or("").trim().to_owned()
             })
             .unwrap_or_default();
 
@@ -640,16 +637,12 @@ impl PostHookInfo {
                     sockets.insert(value);
                 }
                 // x86: "flags", ARM64: "Features"
-                Some((key, value))
-                    if key.trim() == "flags"
-                        || key.trim() == "Features" =>
-                {
+                Some((key, value)) if key.trim() == "flags" || key.trim() == "Features" => {
                     value.trim().clone_into(&mut result.flags);
                 }
                 // x86: "model name", ARM64: "CPU implementer"
                 Some((key, value))
-                    if key.trim() == "model name"
-                        || key.trim() == "CPU implementer" =>
+                    if key.trim() == "model name" || key.trim() == "CPU implementer" =>
                 {
                     if result.model.is_empty() {
                         value.trim().clone_into(&mut result.model);
@@ -727,9 +720,10 @@ fn do_main() -> Result<()> {
             );
         }
 
-        proxmox_installer_common::http::post(
+        http::post(
             url,
             cert_fingerprint.as_deref(),
+            HeaderMap::new(),
             serde_json::to_string(&info)?,
         )?;
     } else {
-- 
2.53.0