fix(webnsupdate): make IP none when query is empty
This happens when one of the IPs hasn't changed (but the other has) in the FRITZ!Box DDNS client.
This commit is contained in:
parent
09bd450a46
commit
2f97008475
1 changed files with 64 additions and 2 deletions
66
src/main.rs
66
src/main.rs
|
@ -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::<std::borrow::Cow<'de, str>>::deserialize(de)?;
|
||||||
|
match opt.as_deref() {
|
||||||
|
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)]
|
||||||
|
@ -653,4 +671,48 @@ mod parse_query_params {
|
||||||
)
|
)
|
||||||
"#);
|
"#);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ipv4_and_empty_ipv6() {
|
||||||
|
let uri = http::Uri::builder()
|
||||||
|
.path_and_query("/update?ipv4=1.2.3.4&ipv6=")
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
let query: Query<FritzBoxUpdateParams> = Query::try_from_uri(&uri).unwrap();
|
||||||
|
insta::assert_debug_snapshot!(query, @r#"
|
||||||
|
Query(
|
||||||
|
FritzBoxUpdateParams {
|
||||||
|
domain: None,
|
||||||
|
ipv4: Some(
|
||||||
|
1.2.3.4,
|
||||||
|
),
|
||||||
|
ipv6: None,
|
||||||
|
ipv6prefix: None,
|
||||||
|
dualstack: None,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn empty_ipv4_and_ipv6() {
|
||||||
|
let uri = http::Uri::builder()
|
||||||
|
.path_and_query("/update?ipv4=&ipv6=%3A%3A1234")
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
let query: Query<FritzBoxUpdateParams> = Query::try_from_uri(&uri).unwrap();
|
||||||
|
insta::assert_debug_snapshot!(query, @r#"
|
||||||
|
Query(
|
||||||
|
FritzBoxUpdateParams {
|
||||||
|
domain: None,
|
||||||
|
ipv4: None,
|
||||||
|
ipv6: Some(
|
||||||
|
::1234,
|
||||||
|
),
|
||||||
|
ipv6prefix: None,
|
||||||
|
dualstack: None,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
"#);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue