From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id DCC291FF165
for <inbox@lore.proxmox.com>; Thu, 27 Mar 2025 16:18:18 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 06DB918715;
Thu, 27 Mar 2025 16:18:00 +0100 (CET)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 27 Mar 2025 16:17:16 +0100
Message-ID: <20250327151718.1084841-6-c.heiss@proxmox.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250327151718.1084841-1-c.heiss@proxmox.com>
References: <20250327151718.1084841-1-c.heiss@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.029 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
Subject: [pve-devel] [PATCH installer 5/6] common: options: allow
user-supplied domain for network options
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Add an optional parameter to allow specifying a domain, which will take
precedence over both the DHCP-supplied domain (if any) and the hardcoded
default domain.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
proxmox-auto-installer/src/utils.rs | 2 +-
proxmox-installer-common/src/options.rs | 95 ++++++++++++++++++++-----
proxmox-tui-installer/src/main.rs | 2 +-
3 files changed, 80 insertions(+), 19 deletions(-)
diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs
index 655fecb..cf072b8 100644
--- a/proxmox-auto-installer/src/utils.rs
+++ b/proxmox-auto-installer/src/utils.rs
@@ -24,7 +24,7 @@ fn get_network_settings(
runtime_info: &RuntimeInfo,
setup_info: &SetupInfo,
) -> Result<NetworkOptions> {
- let mut network_options = NetworkOptions::defaults_from(setup_info, &runtime_info.network);
+ let mut network_options = NetworkOptions::defaults_from(setup_info, &runtime_info.network, None);
info!("Setting network configuration");
diff --git a/proxmox-installer-common/src/options.rs b/proxmox-installer-common/src/options.rs
index 28f2971..562d285 100644
--- a/proxmox-installer-common/src/options.rs
+++ b/proxmox-installer-common/src/options.rs
@@ -408,10 +408,18 @@ pub struct NetworkOptions {
impl NetworkOptions {
const DEFAULT_DOMAIN: &'static str = "example.invalid";
- pub fn defaults_from(setup: &SetupInfo, network: &NetworkInfo) -> Self {
+ pub fn defaults_from(
+ setup: &SetupInfo,
+ network: &NetworkInfo,
+ default_domain: Option<&str>,
+ ) -> Self {
let mut this = Self {
ifname: String::new(),
- fqdn: Self::construct_fqdn(network, setup.config.product.default_hostname()),
+ fqdn: Self::construct_fqdn(
+ network,
+ setup.config.product.default_hostname(),
+ default_domain,
+ ),
// Safety: The provided mask will always be valid.
address: CidrAddress::new(Ipv4Addr::UNSPECIFIED, 0).unwrap(),
gateway: Ipv4Addr::UNSPECIFIED.into(),
@@ -454,14 +462,23 @@ impl NetworkOptions {
this
}
- fn construct_fqdn(network: &NetworkInfo, default_hostname: &str) -> Fqdn {
+ pub fn construct_fqdn(
+ network: &NetworkInfo,
+ default_hostname: &str,
+ default_domain: Option<&str>,
+ ) -> Fqdn {
let hostname = network.hostname.as_deref().unwrap_or(default_hostname);
- let domain = network
- .dns
- .domain
- .as_deref()
- .unwrap_or(Self::DEFAULT_DOMAIN);
+ // First, use the provided default domain if provided. If that is unset,
+ // use the one from the host network configuration, i.e. as and if provided by DHCP.
+ // As last fallback, use [`Self::DEFAULT_DOMAIN`].
+ let domain = default_domain.unwrap_or_else(|| {
+ network
+ .dns
+ .domain
+ .as_deref()
+ .unwrap_or(Self::DEFAULT_DOMAIN)
+ });
Fqdn::from(&format!("{hostname}.{domain}")).unwrap_or_else(|_| {
// Safety: This will always result in a valid FQDN, as we control & know
@@ -527,10 +544,7 @@ mod tests {
}
}
- #[test]
- fn network_options_from_setup_network_info() {
- let setup = SetupInfo::mocked();
-
+ fn mock_setup_network() -> (SetupInfo, NetworkInfo) {
let mut interfaces = BTreeMap::new();
interfaces.insert(
"eth0".to_owned(),
@@ -545,7 +559,7 @@ mod tests {
},
);
- let mut info = NetworkInfo {
+ let info = NetworkInfo {
dns: Dns {
domain: Some("bar.com".to_owned()),
dns: Vec::new(),
@@ -561,8 +575,15 @@ mod tests {
hostname: Some("foo".to_owned()),
};
+ (SetupInfo::mocked(), info)
+ }
+
+ #[test]
+ fn network_options_from_setup_network_info() {
+ let (setup, mut info) = mock_setup_network();
+
pretty_assertions::assert_eq!(
- NetworkOptions::defaults_from(&setup, &info),
+ NetworkOptions::defaults_from(&setup, &info, None),
NetworkOptions {
ifname: "eth0".to_owned(),
fqdn: Fqdn::from("foo.bar.com").unwrap(),
@@ -574,7 +595,7 @@ mod tests {
info.hostname = None;
pretty_assertions::assert_eq!(
- NetworkOptions::defaults_from(&setup, &info),
+ NetworkOptions::defaults_from(&setup, &info, None),
NetworkOptions {
ifname: "eth0".to_owned(),
fqdn: Fqdn::from("pve.bar.com").unwrap(),
@@ -586,7 +607,7 @@ mod tests {
info.dns.domain = None;
pretty_assertions::assert_eq!(
- NetworkOptions::defaults_from(&setup, &info),
+ NetworkOptions::defaults_from(&setup, &info, None),
NetworkOptions {
ifname: "eth0".to_owned(),
fqdn: Fqdn::from("pve.example.invalid").unwrap(),
@@ -598,7 +619,7 @@ mod tests {
info.hostname = Some("foo".to_owned());
pretty_assertions::assert_eq!(
- NetworkOptions::defaults_from(&setup, &info),
+ NetworkOptions::defaults_from(&setup, &info, None),
NetworkOptions {
ifname: "eth0".to_owned(),
fqdn: Fqdn::from("foo.example.invalid").unwrap(),
@@ -608,4 +629,44 @@ mod tests {
}
);
}
+
+ #[test]
+ fn network_options_correctly_handles_user_supplied_default_domain() {
+ let (setup, mut info) = mock_setup_network();
+
+ pretty_assertions::assert_eq!(
+ NetworkOptions::defaults_from(&setup, &info, None),
+ NetworkOptions {
+ ifname: "eth0".to_owned(),
+ fqdn: Fqdn::from("foo.bar.com").unwrap(),
+ address: CidrAddress::new(Ipv4Addr::new(192, 168, 0, 2), 24).unwrap(),
+ gateway: IpAddr::V4(Ipv4Addr::new(192, 168, 0, 1)),
+ dns_server: Ipv4Addr::UNSPECIFIED.into(),
+ }
+ );
+
+ info.dns.domain = None;
+ pretty_assertions::assert_eq!(
+ NetworkOptions::defaults_from(&setup, &info, Some("custom.local")),
+ NetworkOptions {
+ ifname: "eth0".to_owned(),
+ fqdn: Fqdn::from("foo.custom.local").unwrap(),
+ address: CidrAddress::new(Ipv4Addr::new(192, 168, 0, 2), 24).unwrap(),
+ gateway: IpAddr::V4(Ipv4Addr::new(192, 168, 0, 1)),
+ dns_server: Ipv4Addr::UNSPECIFIED.into(),
+ }
+ );
+
+ info.dns.domain = Some("some.domain.local".to_owned());
+ pretty_assertions::assert_eq!(
+ NetworkOptions::defaults_from(&setup, &info, Some("custom.local")),
+ NetworkOptions {
+ ifname: "eth0".to_owned(),
+ fqdn: Fqdn::from("foo.custom.local").unwrap(),
+ address: CidrAddress::new(Ipv4Addr::new(192, 168, 0, 2), 24).unwrap(),
+ gateway: IpAddr::V4(Ipv4Addr::new(192, 168, 0, 1)),
+ dns_server: Ipv4Addr::UNSPECIFIED.into(),
+ }
+ );
+ }
}
diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs
index 341e60c..57a334f 100644
--- a/proxmox-tui-installer/src/main.rs
+++ b/proxmox-tui-installer/src/main.rs
@@ -169,7 +169,7 @@ fn main() {
bootdisk: BootdiskOptions::defaults_from(&runtime_info.disks[0]),
timezone: TimezoneOptions::defaults_from(&runtime_info, &locales),
password: Default::default(),
- network: NetworkOptions::defaults_from(&setup_info, &runtime_info.network),
+ network: NetworkOptions::defaults_from(&setup_info, &runtime_info.network, None),
autoreboot: true,
},
setup_info,
--
2.48.1
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel