From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B83451FF137 for ; Tue, 14 Apr 2026 14:13:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE0FD17080; Tue, 14 Apr 2026 14:14:36 +0200 (CEST) Content-Type: text/plain; charset=UTF-8 Date: Tue, 14 Apr 2026 14:14:02 +0200 Message-Id: Subject: Re: [PATCH installer v3 36/38] fetch-answer: send auto-installer HTTP authorization token if set From: "Lukas Wagner" To: "Christoph Heiss" , Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 X-Mailer: aerc 0.21.0-0-g5549850facc2-dirty References: <20260403165437.2166551-1-c.heiss@proxmox.com> <20260403165437.2166551-37-c.heiss@proxmox.com> In-Reply-To: <20260403165437.2166551-37-c.heiss@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776168767087 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 64OM2Z3VOFDIELBLPWACZ7XQDHWQ73H4 X-Message-ID-Hash: 64OM2Z3VOFDIELBLPWACZ7XQDHWQ73H4 X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Fri Apr 3, 2026 at 6:54 PM CEST, Christoph Heiss wrote: > If an authorization token is present in the internal auto-installer > HTTP configuration, add it as > > Authorization: ProxmoxInstallerToken > As mentioned in the other patch, *maybe* this should just be a `Bearer` token, but no hard feelings. > header to the POST HTTP request when retrieving the answer. > > Signed-off-by: Christoph Heiss > --- > Changes v2 -> v3: > * new patch > > .../src/fetch_plugins/http.rs | 8 +++++++ > proxmox-fetch-answer/src/main.rs | 22 ++++++++++++------- > 2 files changed, 22 insertions(+), 8 deletions(-) > > diff --git a/proxmox-fetch-answer/src/fetch_plugins/http.rs b/proxmox-fet= ch-answer/src/fetch_plugins/http.rs > index 6508721..121b620 100644 > --- a/proxmox-fetch-answer/src/fetch_plugins/http.rs > +++ b/proxmox-fetch-answer/src/fetch_plugins/http.rs > @@ -95,6 +95,14 @@ impl FetchFromHTTP { > HeaderValue::from_str("application/json, application/toml;q= =3D0.5")?, > ); > =20 > + if let Some(token) =3D &settings.token { > + info!("Authentication token provided through ISO."); > + headers.insert( > + http::header::AUTHORIZATION, > + HeaderValue::from_str(&format!("ProxmoxInstallerToken {t= oken}"))?, > + ); > + } > + > let (body, content_type) =3D > http::post(&answer_url, fingerprint.as_deref(), headers, pay= load)?; > =20 > diff --git a/proxmox-fetch-answer/src/main.rs b/proxmox-fetch-answer/src/= main.rs > index 18b27e7..2e399d1 100644 > --- a/proxmox-fetch-answer/src/main.rs > +++ b/proxmox-fetch-answer/src/main.rs > @@ -23,8 +23,13 @@ const CLI_USAGE_HELPTEXT: &str =3D concat!( > =20 > Commands: > iso Fetch the builtin answer file from the ISO > + > http Fetch the answer file via HTTP(S) > - Additional parameters: [] [] > + Additional parameters: [] [] [] > + > + To provide an authentication token without a certificate f= ingerprint, pass an > + empty string to . > + > partition Fetch the answer file from a mountable partition > Additional parameters: [] > =20 > @@ -47,18 +52,18 @@ fn fetch_answer(install_settings: &AutoInstSettings) = -> Result { > let answer_path =3D PathBuf::from("/cdrom/answer.toml"); > match fs::read_to_string(answer_path) { > Ok(answer) =3D> return Ok(answer), > - Err(err) =3D> info!("Fetching answer file from ISO faile= d: {err}"), > + Err(err) =3D> info!("Fetching answer file from ISO faile= d: {err:#}"), > } > } > FetchAnswerFrom::Partition =3D> { > match FetchFromPartition::get_answer(&install_settings.parti= tion_label) { > Ok(answer) =3D> return Ok(answer), > - Err(err) =3D> info!("Fetching answer file from partition= failed: {err}"), > + Err(err) =3D> info!("Fetching answer file from partition= failed: {err:#}"), > } > } > FetchAnswerFrom::Http =3D> match FetchFromHTTP::get_answer(&inst= all_settings.http) { > Ok(answer) =3D> return Ok(answer), > - Err(err) =3D> info!("Fetching answer file via HTTP failed: {= err}"), > + Err(err) =3D> info!("Fetching answer file via HTTP failed: {= err:#}"), It's only a pretty minor change, but it seems like these should be split out, especially since you also touch the CDROM/Partition paths > }, > } > bail!("Could not find any answer file!"); > @@ -80,8 +85,8 @@ fn settings_from_cli_args(args: &[String]) -> Result { > FetchAnswerFrom::Iso if args.len() > 2 =3D> { > bail!("'iso' mode does not take any additional arguments") > } > - FetchAnswerFrom::Http if args.len() > 4 =3D> { > - bail!("'http' mode takes at most 2 additional arguments") > + FetchAnswerFrom::Http if args.len() > 5 =3D> { > + bail!("'http' mode takes at most 3 additional arguments") > } > FetchAnswerFrom::Partition if args.len() > 3 =3D> { > bail!("'partition' mode takes at most 1 additional argument"= ) > @@ -97,8 +102,9 @@ fn settings_from_cli_args(args: &[String]) -> Result { > .cloned()?, > http: HttpOptions { > url: args.get(2).cloned(), > - cert_fingerprint: args.get(3).cloned(), > - token: None, > + // treat empty value as not existing > + cert_fingerprint: args.get(3).cloned().filter(|s| !s.is_empt= y()), > + token: args.get(4).cloned(), > }, > }) > } Code-wise this looks okay, maybe split out the logging out changes into a separate patch. Reviewed-by: Lukas Wagner