jalil/webnsupdate
1
0
Fork 0
Code Issues 2 Pull requests 3 Releases Activity Actions

Handle empty query params properly #90

Merged
jalil merged 2 commits from push-xurxqrnozzrp into main 2025-01-31 21:21:04 +01:00
Conversation 1 Commits 2 Files changed 2 +22 -4
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake-modules/tests.nix
View file

@ -237,9 +237,9 @@
if IPV4 and IPV6: if IPV4 and IPV6:
update_records("127.0.0.1", domain="test", ipv4="1.2.3.4", ipv6="::1234") update_records("127.0.0.1", domain="test", ipv4="1.2.3.4", ipv6="::1234")
elif IPV4: elif IPV4:
update_records("127.0.0.1", ipv4="1.2.3.4") update_records("127.0.0.1", ipv4="1.2.3.4", ipv6="")
elif IPV6: elif IPV6:
update_records("[::1]", ipv6="::1234") update_records("[::1]", ipv4="", ipv6="::1234")
for domain in DYNAMIC_DOMAINS: for domain in DYNAMIC_DOMAINS:
if IPV4: if IPV4:

22
src/main.rs
View file

@ -414,6 +414,24 @@ fn main() -> Result<()> {
.wrap_err("failed to run main loop") .wrap_err("failed to run main loop")
} }
/// Serde deserialization decorator to map empty Strings to None,
///
/// Adapted from: <https://github.com/tokio-rs/axum/blob/main/examples/query-params-with-empty-strings/src/main.rs>
fn empty_string_as_none<'de, D, T>(de: D) -> Result<Option<T>, D::Error>
where
D: serde::Deserializer<'de>,
T: std::str::FromStr,
T::Err: std::fmt::Display,
{
use serde::Deserialize;
let opt = Option::<&'de str>::deserialize(de)?;
match opt {
None | Some("") => Ok(None),
Some(s) => s.parse::<T>().map_err(serde::de::Error::custom).map(Some),
}
}
#[derive(Debug, serde::Deserialize)] #[derive(Debug, serde::Deserialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
struct FritzBoxUpdateParams { struct FritzBoxUpdateParams {
@ -422,10 +440,10 @@ struct FritzBoxUpdateParams {
#[serde(default)] #[serde(default)]
domain: Option<String>, domain: Option<String>,
/// IPv4 address for the domain /// IPv4 address for the domain
#[serde(default)] #[serde(default, deserialize_with = "empty_string_as_none")]
ipv4: Option<Ipv4Addr>, ipv4: Option<Ipv4Addr>,
/// IPv6 address for the domain /// IPv6 address for the domain
#[serde(default)] #[serde(default, deserialize_with = "empty_string_as_none")]
ipv6: Option<Ipv6Addr>, ipv6: Option<Ipv6Addr>,
/// IPv6 prefix for the home network /// IPv6 prefix for the home network
#[allow(unused)] #[allow(unused)]