Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/api/firewall/models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,22 @@ impl<'de> Deserialize<'de> for PortRange {

let value: &str = Deserialize::deserialize(deserializer)?;

// Handle range with dash (e.g., "80-90")
if let Some((start, end)) = value.split_once('-') {
let start = start.parse::<u16>().map_err(D::Error::custom)?;
let end = end.parse::<u16>().map_err(D::Error::custom)?;

Ok(PortRange(RangeInclusive::new(start, end)))
} else {
}
// Handle comma-separated ports - use first port only for now
// TODO: This is a limitation - API can return multiple discrete ports but PortRange only supports ranges
else if let Some((first, _rest)) = value.split_once(',') {
let port = first.parse::<u16>().map_err(D::Error::custom)?;

Ok(PortRange(RangeInclusive::new(port, port)))
}
// Handle single port
else {
let port = value.parse::<u16>().map_err(D::Error::custom)?;

Ok(PortRange(RangeInclusive::new(port, port)))
Expand Down
4 changes: 4 additions & 0 deletions src/api/firewall/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ impl From<FirewallTemplateConfig> for InternalFirewallTemplateConfig {

#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct InternalFirewall {
#[serde(skip_serializing_if = "Option::is_none")]
pub server_ip: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub server_number: Option<u32>,
pub status: State,
pub filter_ipv6: bool,
#[serde(rename = "whitelist_hos")]
Expand Down