public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Lukas Wagner" <l.wagner@proxmox.com>
To: "Christoph Heiss" <c.heiss@proxmox.com>, <pdm-devel@lists.proxmox.com>
Subject: Re: [PATCH installer v3 26/38] common: http: allow passing custom headers to post()
Date: Tue, 14 Apr 2026 14:13:37 +0200	[thread overview]
Message-ID: <DHSVAQ69NYKH.2X5RWQ6KFG120@proxmox.com> (raw)
In-Reply-To: <20260403165437.2166551-27-c.heiss@proxmox.com>

On Fri Apr 3, 2026 at 6:53 PM CEST, Christoph Heiss wrote:
> Add an additional parameter to allow passing in additional headers.
>
> No functional changes.
>
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>

[...]

> +///
> +/// # 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>)> {

Maybe a custom type for the response would be a bit nicer here, instead
of the tuple?


>      // 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))
>  }
>  

[...]

>  
>  /// 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" =>
>                  {

These seem to be unrelated changes caused by your auto-formatter, maybe
split these out into a separate patch?


>                      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 {


Looks good in general, my suggestion with the custom type is a mere
suggestion, not a requirement.

Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>




  reply	other threads:[~2026-04-14 12:12 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-03 16:53 [PATCH proxmox/yew-pwt/datacenter-manager/installer v3 00/38] add auto-installer integration Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 01/38] api-macro: allow $ in identifier name Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 02/38] schema: oneOf: allow single string variant Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 03/38] schema: implement UpdaterType for HashMap and BTreeMap Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 04/38] network-types: move `Fqdn` type from proxmox-installer-common Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 05/38] network-types: implement api type for Fqdn Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 06/38] network-types: add api wrapper type for std::net::IpAddr Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 07/38] network-types: cidr: implement generic `IpAddr::new` constructor Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 08/38] network-types: fqdn: implement standard library Error for Fqdn Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 09/38] node-status: make KernelVersionInformation Clone + PartialEq Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 10/38] installer-types: add common types used by the installer Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 11/38] installer-types: add types used by the auto-installer Christoph Heiss
2026-04-03 16:53 ` [PATCH proxmox v3 12/38] installer-types: implement api type for all externally-used types Christoph Heiss
2026-04-03 16:53 ` [PATCH yew-widget-toolkit v3 13/38] widget: kvlist: add widget for user-modifiable data tables Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 14/38] api-types, cli: use ReturnType::new() instead of constructing it manually Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 15/38] api-types: add api types for auto-installer integration Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 16/38] config: add auto-installer configuration module Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 17/38] acl: wire up new /system/auto-installation acl path Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 18/38] server: api: add auto-installer integration module Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 19/38] server: api: auto-installer: add access token management endpoints Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 20/38] client: add bindings for auto-installer endpoints Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 21/38] ui: auto-installer: add installations overview panel Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 22/38] ui: auto-installer: add prepared answer configuration panel Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 23/38] ui: auto-installer: add access token " Christoph Heiss
2026-04-03 16:53 ` [PATCH datacenter-manager v3 24/38] docs: add documentation for auto-installer integration Christoph Heiss
2026-04-03 16:53 ` [PATCH installer v3 25/38] install: iso env: use JSON boolean literals for product config Christoph Heiss
2026-04-03 16:53 ` [PATCH installer v3 26/38] common: http: allow passing custom headers to post() Christoph Heiss
2026-04-14 12:13   ` Lukas Wagner [this message]
2026-04-15  8:53     ` Christoph Heiss
2026-04-03 16:53 ` [PATCH installer v3 27/38] common: options: move regex construction out of loop Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 28/38] assistant: support adding an authorization token for HTTP-based answers Christoph Heiss
2026-04-14 12:13   ` Lukas Wagner
2026-04-03 16:54 ` [PATCH installer v3 29/38] tree-wide: used moved `Fqdn` type to proxmox-network-types Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 30/38] tree-wide: use `Cidr` type from proxmox-network-types Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 31/38] tree-wide: switch to filesystem types from proxmox-installer-types Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 32/38] post-hook: switch to types in proxmox-installer-types Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 33/38] auto: sysinfo: switch to types from proxmox-installer-types Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 34/38] fetch-answer: " Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 35/38] fetch-answer: http: prefer json over toml for answer format Christoph Heiss
2026-04-14 12:13   ` Lukas Wagner
2026-04-03 16:54 ` [PATCH installer v3 36/38] fetch-answer: send auto-installer HTTP authorization token if set Christoph Heiss
2026-04-14 12:13   ` Lukas Wagner
2026-04-14 12:14   ` Lukas Wagner
2026-04-03 16:54 ` [PATCH installer v3 37/38] tree-wide: switch out `Answer` -> `AutoInstallerConfig` types Christoph Heiss
2026-04-03 16:54 ` [PATCH installer v3 38/38] auto: drop now-dead answer file definitions Christoph Heiss
2026-04-14 12:16 ` [PATCH proxmox/yew-pwt/datacenter-manager/installer v3 00/38] add auto-installer integration Lukas Wagner
2026-04-14 13:58 ` Lukas Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DHSVAQ69NYKH.2X5RWQ6KFG120@proxmox.com \
    --to=l.wagner@proxmox.com \
    --cc=c.heiss@proxmox.com \
    --cc=pdm-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal