mirror of
https://github.com/timothymiller/cloudflare-ddns.git
synced 2026-03-22 06:58:57 -03:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2446c1d6a0 | ||
|
|
9b8aba5e20 |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -109,7 +109,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cloudflare-ddns"
|
name = "cloudflare-ddns"
|
||||||
version = "2.0.6"
|
version = "2.0.8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"idna",
|
"idna",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cloudflare-ddns"
|
name = "cloudflare-ddns"
|
||||||
version = "2.0.6"
|
version = "2.0.8"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "Access your home network remotely via a custom domain name without a static IP"
|
description = "Access your home network remotely via a custom domain name without a static IP"
|
||||||
license = "GPL-3.0"
|
license = "GPL-3.0"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::pp::{self, PP};
|
use crate::pp::{self, PP};
|
||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
use std::time::Duration;
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
const CF_IPV4_URL: &str = "https://www.cloudflare.com/ips-v4";
|
const CF_IPV4_URL: &str = "https://www.cloudflare.com/ips-v4";
|
||||||
const CF_IPV6_URL: &str = "https://www.cloudflare.com/ips-v6";
|
const CF_IPV6_URL: &str = "https://www.cloudflare.com/ips-v6";
|
||||||
@@ -157,6 +157,62 @@ impl CloudflareIpFilter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Refresh interval for Cloudflare IP ranges (24 hours).
|
||||||
|
const CF_RANGE_REFRESH: Duration = Duration::from_secs(24 * 60 * 60);
|
||||||
|
|
||||||
|
/// Cached wrapper around [`CloudflareIpFilter`].
|
||||||
|
///
|
||||||
|
/// Fetches once, then re-uses the cached ranges for [`CF_RANGE_REFRESH`].
|
||||||
|
/// If a refresh fails, the previously cached ranges are kept.
|
||||||
|
pub struct CachedCloudflareFilter {
|
||||||
|
filter: Option<CloudflareIpFilter>,
|
||||||
|
fetched_at: Option<Instant>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CachedCloudflareFilter {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
filter: None,
|
||||||
|
fetched_at: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return a reference to the current filter, refreshing if stale or absent.
|
||||||
|
pub async fn get(
|
||||||
|
&mut self,
|
||||||
|
client: &Client,
|
||||||
|
timeout: Duration,
|
||||||
|
ppfmt: &PP,
|
||||||
|
) -> Option<&CloudflareIpFilter> {
|
||||||
|
let stale = match self.fetched_at {
|
||||||
|
Some(t) => t.elapsed() >= CF_RANGE_REFRESH,
|
||||||
|
None => true,
|
||||||
|
};
|
||||||
|
|
||||||
|
if stale {
|
||||||
|
match CloudflareIpFilter::fetch(client, timeout, ppfmt).await {
|
||||||
|
Some(new_filter) => {
|
||||||
|
self.filter = Some(new_filter);
|
||||||
|
self.fetched_at = Some(Instant::now());
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
if self.filter.is_some() {
|
||||||
|
ppfmt.warningf(
|
||||||
|
pp::EMOJI_WARNING,
|
||||||
|
"Failed to refresh Cloudflare IP ranges; using cached version",
|
||||||
|
);
|
||||||
|
// Keep using cached filter, but don't update fetched_at
|
||||||
|
// so we retry next cycle.
|
||||||
|
}
|
||||||
|
// If no cached filter exists, return None (caller handles fail-safe).
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self.filter.as_ref()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|||||||
@@ -467,7 +467,7 @@ impl CloudflareHandle {
|
|||||||
self.update_record(zone_id, &record.id, &payload, ppfmt).await;
|
self.update_record(zone_id, &record.id, &payload, ppfmt).await;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ppfmt.infof(pp::EMOJI_SKIP, &format!("Record {fqdn} is up to date ({ip_str})"));
|
// Caller handles "up to date" logging based on SetResult::Noop
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Find an existing managed record to update, or create new
|
// Find an existing managed record to update, or create new
|
||||||
@@ -668,10 +668,7 @@ impl CloudflareHandle {
|
|||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
if to_add.is_empty() && ids_to_delete.is_empty() {
|
if to_add.is_empty() && ids_to_delete.is_empty() {
|
||||||
ppfmt.infof(
|
// Caller handles "up to date" logging based on SetResult::Noop
|
||||||
pp::EMOJI_SKIP,
|
|
||||||
&format!("WAF list {} is up to date", waf_list.describe()),
|
|
||||||
);
|
|
||||||
return SetResult::Noop;
|
return SetResult::Noop;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
82
src/main.rs
82
src/main.rs
@@ -11,8 +11,10 @@ use crate::cloudflare::{Auth, CloudflareHandle};
|
|||||||
use crate::config::{AppConfig, CronSchedule};
|
use crate::config::{AppConfig, CronSchedule};
|
||||||
use crate::notifier::{CompositeNotifier, Heartbeat, Message};
|
use crate::notifier::{CompositeNotifier, Heartbeat, Message};
|
||||||
use crate::pp::PP;
|
use crate::pp::PP;
|
||||||
|
use std::collections::HashSet;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use reqwest::Client;
|
||||||
use tokio::signal;
|
use tokio::signal;
|
||||||
use tokio::time::{sleep, Duration};
|
use tokio::time::{sleep, Duration};
|
||||||
|
|
||||||
@@ -116,12 +118,18 @@ async fn main() {
|
|||||||
// Start heartbeat
|
// Start heartbeat
|
||||||
heartbeat.start().await;
|
heartbeat.start().await;
|
||||||
|
|
||||||
|
let mut cf_cache = cf_ip_filter::CachedCloudflareFilter::new();
|
||||||
|
let detection_client = Client::builder()
|
||||||
|
.timeout(app_config.detection_timeout)
|
||||||
|
.build()
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
if app_config.legacy_mode {
|
if app_config.legacy_mode {
|
||||||
// --- Legacy mode (original cloudflare-ddns behavior) ---
|
// --- Legacy mode (original cloudflare-ddns behavior) ---
|
||||||
run_legacy_mode(&app_config, &handle, ¬ifier, &heartbeat, &ppfmt, running).await;
|
run_legacy_mode(&app_config, &handle, ¬ifier, &heartbeat, &ppfmt, running, &mut cf_cache, &detection_client).await;
|
||||||
} else {
|
} else {
|
||||||
// --- Env var mode (cf-ddns behavior) ---
|
// --- Env var mode (cf-ddns behavior) ---
|
||||||
run_env_mode(&app_config, &handle, ¬ifier, &heartbeat, &ppfmt, running).await;
|
run_env_mode(&app_config, &handle, ¬ifier, &heartbeat, &ppfmt, running, &mut cf_cache, &detection_client).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// On shutdown: delete records if configured
|
// On shutdown: delete records if configured
|
||||||
@@ -143,12 +151,16 @@ async fn run_legacy_mode(
|
|||||||
heartbeat: &Heartbeat,
|
heartbeat: &Heartbeat,
|
||||||
ppfmt: &PP,
|
ppfmt: &PP,
|
||||||
running: Arc<AtomicBool>,
|
running: Arc<AtomicBool>,
|
||||||
|
cf_cache: &mut cf_ip_filter::CachedCloudflareFilter,
|
||||||
|
detection_client: &Client,
|
||||||
) {
|
) {
|
||||||
let legacy = match &config.legacy_config {
|
let legacy = match &config.legacy_config {
|
||||||
Some(l) => l,
|
Some(l) => l,
|
||||||
None => return,
|
None => return,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let mut noop_reported = HashSet::new();
|
||||||
|
|
||||||
if config.repeat {
|
if config.repeat {
|
||||||
match (legacy.a, legacy.aaaa) {
|
match (legacy.a, legacy.aaaa) {
|
||||||
(true, true) => println!(
|
(true, true) => println!(
|
||||||
@@ -165,7 +177,7 @@ async fn run_legacy_mode(
|
|||||||
}
|
}
|
||||||
|
|
||||||
while running.load(Ordering::SeqCst) {
|
while running.load(Ordering::SeqCst) {
|
||||||
updater::update_once(config, handle, notifier, heartbeat, ppfmt).await;
|
updater::update_once(config, handle, notifier, heartbeat, cf_cache, ppfmt, &mut noop_reported, detection_client).await;
|
||||||
|
|
||||||
for _ in 0..legacy.ttl {
|
for _ in 0..legacy.ttl {
|
||||||
if !running.load(Ordering::SeqCst) {
|
if !running.load(Ordering::SeqCst) {
|
||||||
@@ -175,7 +187,7 @@ async fn run_legacy_mode(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
updater::update_once(config, handle, notifier, heartbeat, ppfmt).await;
|
updater::update_once(config, handle, notifier, heartbeat, cf_cache, ppfmt, &mut noop_reported, detection_client).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,11 +198,15 @@ async fn run_env_mode(
|
|||||||
heartbeat: &Heartbeat,
|
heartbeat: &Heartbeat,
|
||||||
ppfmt: &PP,
|
ppfmt: &PP,
|
||||||
running: Arc<AtomicBool>,
|
running: Arc<AtomicBool>,
|
||||||
|
cf_cache: &mut cf_ip_filter::CachedCloudflareFilter,
|
||||||
|
detection_client: &Client,
|
||||||
) {
|
) {
|
||||||
|
let mut noop_reported = HashSet::new();
|
||||||
|
|
||||||
match &config.update_cron {
|
match &config.update_cron {
|
||||||
CronSchedule::Once => {
|
CronSchedule::Once => {
|
||||||
if config.update_on_start {
|
if config.update_on_start {
|
||||||
updater::update_once(config, handle, notifier, heartbeat, ppfmt).await;
|
updater::update_once(config, handle, notifier, heartbeat, cf_cache, ppfmt, &mut noop_reported, detection_client).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
schedule => {
|
schedule => {
|
||||||
@@ -206,7 +222,7 @@ async fn run_env_mode(
|
|||||||
|
|
||||||
// Update on start if configured
|
// Update on start if configured
|
||||||
if config.update_on_start {
|
if config.update_on_start {
|
||||||
updater::update_once(config, handle, notifier, heartbeat, ppfmt).await;
|
updater::update_once(config, handle, notifier, heartbeat, cf_cache, ppfmt, &mut noop_reported, detection_client).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main loop
|
// Main loop
|
||||||
@@ -233,7 +249,7 @@ async fn run_env_mode(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
updater::update_once(config, handle, notifier, heartbeat, ppfmt).await;
|
updater::update_once(config, handle, notifier, heartbeat, cf_cache, ppfmt, &mut noop_reported, detection_client).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -382,6 +398,7 @@ mod tests {
|
|||||||
config: &[LegacyCloudflareEntry],
|
config: &[LegacyCloudflareEntry],
|
||||||
ttl: i64,
|
ttl: i64,
|
||||||
purge_unknown_records: bool,
|
purge_unknown_records: bool,
|
||||||
|
noop_reported: &mut std::collections::HashSet<String>,
|
||||||
) {
|
) {
|
||||||
for entry in config {
|
for entry in config {
|
||||||
#[derive(serde::Deserialize)]
|
#[derive(serde::Deserialize)]
|
||||||
@@ -483,8 +500,10 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let noop_key = format!("{fqdn}:{record_type}");
|
||||||
if let Some(ref id) = identifier {
|
if let Some(ref id) = identifier {
|
||||||
if modified {
|
if modified {
|
||||||
|
noop_reported.remove(&noop_key);
|
||||||
if self.dry_run {
|
if self.dry_run {
|
||||||
println!("[DRY RUN] Would update record {fqdn} -> {ip}");
|
println!("[DRY RUN] Would update record {fqdn} -> {ip}");
|
||||||
} else {
|
} else {
|
||||||
@@ -500,23 +519,30 @@ mod tests {
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
} else if self.dry_run {
|
} else if noop_reported.insert(noop_key) {
|
||||||
println!("[DRY RUN] Record {fqdn} is up to date ({ip})");
|
if self.dry_run {
|
||||||
|
println!("[DRY RUN] Record {fqdn} is up to date");
|
||||||
|
} else {
|
||||||
|
println!("Record {fqdn} is up to date");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if self.dry_run {
|
|
||||||
println!("[DRY RUN] Would add new record {fqdn} -> {ip}");
|
|
||||||
} else {
|
} else {
|
||||||
println!("Adding new record {fqdn} -> {ip}");
|
noop_reported.remove(&noop_key);
|
||||||
let create_endpoint =
|
if self.dry_run {
|
||||||
format!("zones/{}/dns_records", entry.zone_id);
|
println!("[DRY RUN] Would add new record {fqdn} -> {ip}");
|
||||||
let _: Option<serde_json::Value> = self
|
} else {
|
||||||
.cf_api(
|
println!("Adding new record {fqdn} -> {ip}");
|
||||||
&create_endpoint,
|
let create_endpoint =
|
||||||
"POST",
|
format!("zones/{}/dns_records", entry.zone_id);
|
||||||
&entry.authentication.api_token,
|
let _: Option<serde_json::Value> = self
|
||||||
Some(&record),
|
.cf_api(
|
||||||
)
|
&create_endpoint,
|
||||||
.await;
|
"POST",
|
||||||
|
&entry.authentication.api_token,
|
||||||
|
Some(&record),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if purge_unknown_records {
|
if purge_unknown_records {
|
||||||
@@ -636,7 +662,7 @@ mod tests {
|
|||||||
|
|
||||||
let ddns = TestDdnsClient::new(&mock_server.uri());
|
let ddns = TestDdnsClient::new(&mock_server.uri());
|
||||||
let config = test_config(zone_id);
|
let config = test_config(zone_id);
|
||||||
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false)
|
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false, &mut std::collections::HashSet::new())
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -685,7 +711,7 @@ mod tests {
|
|||||||
|
|
||||||
let ddns = TestDdnsClient::new(&mock_server.uri());
|
let ddns = TestDdnsClient::new(&mock_server.uri());
|
||||||
let config = test_config(zone_id);
|
let config = test_config(zone_id);
|
||||||
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false)
|
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false, &mut std::collections::HashSet::new())
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -728,7 +754,7 @@ mod tests {
|
|||||||
|
|
||||||
let ddns = TestDdnsClient::new(&mock_server.uri());
|
let ddns = TestDdnsClient::new(&mock_server.uri());
|
||||||
let config = test_config(zone_id);
|
let config = test_config(zone_id);
|
||||||
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false)
|
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false, &mut std::collections::HashSet::new())
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -762,7 +788,7 @@ mod tests {
|
|||||||
|
|
||||||
let ddns = TestDdnsClient::new(&mock_server.uri()).dry_run();
|
let ddns = TestDdnsClient::new(&mock_server.uri()).dry_run();
|
||||||
let config = test_config(zone_id);
|
let config = test_config(zone_id);
|
||||||
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false)
|
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, false, &mut std::collections::HashSet::new())
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -819,7 +845,7 @@ mod tests {
|
|||||||
ip4_provider: None,
|
ip4_provider: None,
|
||||||
ip6_provider: None,
|
ip6_provider: None,
|
||||||
};
|
};
|
||||||
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, true)
|
ddns.commit_record("198.51.100.7", "A", &config.cloudflare, 300, true, &mut std::collections::HashSet::new())
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -921,7 +947,7 @@ mod tests {
|
|||||||
ip6_provider: None,
|
ip6_provider: None,
|
||||||
};
|
};
|
||||||
|
|
||||||
ddns.commit_record("203.0.113.99", "A", &config.cloudflare, 300, false)
|
ddns.commit_record("203.0.113.99", "A", &config.cloudflare, 300, false, &mut std::collections::HashSet::new())
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -406,7 +406,7 @@ fn parse_shoutrrr_url(url_str: &str) -> Result<ShoutrrrService, String> {
|
|||||||
service_type: ShoutrrrServiceType::Pushover,
|
service_type: ShoutrrrServiceType::Pushover,
|
||||||
webhook_url: format!(
|
webhook_url: format!(
|
||||||
"https://api.pushover.net/1/messages.json?token={}&user={}",
|
"https://api.pushover.net/1/messages.json?token={}&user={}",
|
||||||
parts[1], parts[0]
|
parts[0], parts[1]
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -868,7 +868,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_parse_pushover() {
|
fn test_parse_pushover() {
|
||||||
let result = parse_shoutrrr_url("pushover://userkey@apitoken").unwrap();
|
let result = parse_shoutrrr_url("pushover://apitoken@userkey").unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result.webhook_url,
|
result.webhook_url,
|
||||||
"https://api.pushover.net/1/messages.json?token=apitoken&user=userkey"
|
"https://api.pushover.net/1/messages.json?token=apitoken&user=userkey"
|
||||||
@@ -1307,7 +1307,8 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_pushover_url_query_parsing() {
|
fn test_pushover_url_query_parsing() {
|
||||||
// Verify that the pushover webhook URL format contains the right params
|
// Verify that the pushover webhook URL format contains the right params
|
||||||
let service = parse_shoutrrr_url("pushover://myuser@mytoken").unwrap();
|
// shoutrrr format: pushover://token@user
|
||||||
|
let service = parse_shoutrrr_url("pushover://mytoken@myuser").unwrap();
|
||||||
let parsed = url::Url::parse(&service.webhook_url).unwrap();
|
let parsed = url::Url::parse(&service.webhook_url).unwrap();
|
||||||
let params: std::collections::HashMap<_, _> = parsed.query_pairs().collect();
|
let params: std::collections::HashMap<_, _> = parsed.query_pairs().collect();
|
||||||
assert_eq!(params.get("token").unwrap().as_ref(), "mytoken");
|
assert_eq!(params.get("token").unwrap().as_ref(), "mytoken");
|
||||||
|
|||||||
238
src/updater.rs
238
src/updater.rs
@@ -1,4 +1,4 @@
|
|||||||
use crate::cf_ip_filter::CloudflareIpFilter;
|
use crate::cf_ip_filter::CachedCloudflareFilter;
|
||||||
use crate::cloudflare::{CloudflareHandle, SetResult};
|
use crate::cloudflare::{CloudflareHandle, SetResult};
|
||||||
use crate::config::{AppConfig, LegacyCloudflareEntry, LegacySubdomainEntry};
|
use crate::config::{AppConfig, LegacyCloudflareEntry, LegacySubdomainEntry};
|
||||||
use crate::domain::make_fqdn;
|
use crate::domain::make_fqdn;
|
||||||
@@ -6,7 +6,7 @@ use crate::notifier::{CompositeNotifier, Heartbeat, Message};
|
|||||||
use crate::pp::{self, PP};
|
use crate::pp::{self, PP};
|
||||||
use crate::provider::IpType;
|
use crate::provider::IpType;
|
||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
use std::collections::HashMap;
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
@@ -16,19 +16,17 @@ pub async fn update_once(
|
|||||||
handle: &CloudflareHandle,
|
handle: &CloudflareHandle,
|
||||||
notifier: &CompositeNotifier,
|
notifier: &CompositeNotifier,
|
||||||
heartbeat: &Heartbeat,
|
heartbeat: &Heartbeat,
|
||||||
|
cf_cache: &mut CachedCloudflareFilter,
|
||||||
ppfmt: &PP,
|
ppfmt: &PP,
|
||||||
|
noop_reported: &mut HashSet<String>,
|
||||||
|
detection_client: &Client,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
let detection_client = Client::builder()
|
|
||||||
.timeout(config.detection_timeout)
|
|
||||||
.build()
|
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
let mut all_ok = true;
|
let mut all_ok = true;
|
||||||
let mut messages = Vec::new();
|
let mut messages = Vec::new();
|
||||||
let mut notify = false; // NEW: track meaningful events
|
let mut notify = false; // NEW: track meaningful events
|
||||||
|
|
||||||
if config.legacy_mode {
|
if config.legacy_mode {
|
||||||
all_ok = update_legacy(config, ppfmt).await;
|
all_ok = update_legacy(config, cf_cache, ppfmt, noop_reported, detection_client).await;
|
||||||
} else {
|
} else {
|
||||||
// Detect IPs for each provider
|
// Detect IPs for each provider
|
||||||
let mut detected_ips: HashMap<IpType, Vec<IpAddr>> = HashMap::new();
|
let mut detected_ips: HashMap<IpType, Vec<IpAddr>> = HashMap::new();
|
||||||
@@ -69,7 +67,7 @@ pub async fn update_once(
|
|||||||
// Filter out Cloudflare IPs if enabled
|
// Filter out Cloudflare IPs if enabled
|
||||||
if config.reject_cloudflare_ips {
|
if config.reject_cloudflare_ips {
|
||||||
if let Some(cf_filter) =
|
if let Some(cf_filter) =
|
||||||
CloudflareIpFilter::fetch(&detection_client, config.detection_timeout, ppfmt).await
|
cf_cache.get(&detection_client, config.detection_timeout, ppfmt).await
|
||||||
{
|
{
|
||||||
for (ip_type, ips) in detected_ips.iter_mut() {
|
for (ip_type, ips) in detected_ips.iter_mut() {
|
||||||
let before_count = ips.len();
|
let before_count = ips.len();
|
||||||
@@ -152,9 +150,11 @@ pub async fn update_once(
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
|
let noop_key = format!("{domain_str}:{record_type}");
|
||||||
match result {
|
match result {
|
||||||
SetResult::Updated => {
|
SetResult::Updated => {
|
||||||
notify = true; // NEW
|
noop_reported.remove(&noop_key);
|
||||||
|
notify = true;
|
||||||
let ip_strs: Vec<String> = ips.iter().map(|ip| ip.to_string()).collect();
|
let ip_strs: Vec<String> = ips.iter().map(|ip| ip.to_string()).collect();
|
||||||
messages.push(Message::new_ok(&format!(
|
messages.push(Message::new_ok(&format!(
|
||||||
"Updated {domain_str} -> {}",
|
"Updated {domain_str} -> {}",
|
||||||
@@ -162,13 +162,18 @@ pub async fn update_once(
|
|||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
SetResult::Failed => {
|
SetResult::Failed => {
|
||||||
notify = true; // NEW
|
noop_reported.remove(&noop_key);
|
||||||
|
notify = true;
|
||||||
all_ok = false;
|
all_ok = false;
|
||||||
messages.push(Message::new_fail(&format!(
|
messages.push(Message::new_fail(&format!(
|
||||||
"Failed to update {domain_str}"
|
"Failed to update {domain_str}"
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
SetResult::Noop => {}
|
SetResult::Noop => {
|
||||||
|
if noop_reported.insert(noop_key) {
|
||||||
|
ppfmt.infof(pp::EMOJI_SKIP, &format!("Record {domain_str} is up to date"));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -193,32 +198,37 @@ pub async fn update_once(
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
|
let noop_key = format!("waf:{}", waf_list.describe());
|
||||||
match result {
|
match result {
|
||||||
SetResult::Updated => {
|
SetResult::Updated => {
|
||||||
notify = true; // NEW
|
noop_reported.remove(&noop_key);
|
||||||
|
notify = true;
|
||||||
messages.push(Message::new_ok(&format!(
|
messages.push(Message::new_ok(&format!(
|
||||||
"Updated WAF list {}",
|
"Updated WAF list {}",
|
||||||
waf_list.describe()
|
waf_list.describe()
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
SetResult::Failed => {
|
SetResult::Failed => {
|
||||||
notify = true; // NEW
|
noop_reported.remove(&noop_key);
|
||||||
|
notify = true;
|
||||||
all_ok = false;
|
all_ok = false;
|
||||||
messages.push(Message::new_fail(&format!(
|
messages.push(Message::new_fail(&format!(
|
||||||
"Failed to update WAF list {}",
|
"Failed to update WAF list {}",
|
||||||
waf_list.describe()
|
waf_list.describe()
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
SetResult::Noop => {}
|
SetResult::Noop => {
|
||||||
|
if noop_reported.insert(noop_key) {
|
||||||
|
ppfmt.infof(pp::EMOJI_SKIP, &format!("WAF list {} is up to date", waf_list.describe()));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send heartbeat ONLY if something meaningful happened
|
// Always ping heartbeat so monitors know the updater is alive
|
||||||
if notify {
|
let heartbeat_msg = Message::merge(messages.clone());
|
||||||
let heartbeat_msg = Message::merge(messages.clone());
|
heartbeat.ping(&heartbeat_msg).await;
|
||||||
heartbeat.ping(&heartbeat_msg).await;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send notifications ONLY when IP changed or failed
|
// Send notifications ONLY when IP changed or failed
|
||||||
if notify {
|
if notify {
|
||||||
@@ -235,29 +245,27 @@ pub async fn update_once(
|
|||||||
/// IP-family-bound clients (0.0.0.0 for IPv4, [::] for IPv6). This prevents the old
|
/// IP-family-bound clients (0.0.0.0 for IPv4, [::] for IPv6). This prevents the old
|
||||||
/// wrong-family warning on dual-stack hosts and honours `ip4_provider`/`ip6_provider`
|
/// wrong-family warning on dual-stack hosts and honours `ip4_provider`/`ip6_provider`
|
||||||
/// overrides from config.json.
|
/// overrides from config.json.
|
||||||
async fn update_legacy(config: &AppConfig, ppfmt: &PP) -> bool {
|
async fn update_legacy(
|
||||||
|
config: &AppConfig,
|
||||||
|
cf_cache: &mut CachedCloudflareFilter,
|
||||||
|
ppfmt: &PP,
|
||||||
|
noop_reported: &mut HashSet<String>,
|
||||||
|
detection_client: &Client,
|
||||||
|
) -> bool {
|
||||||
let legacy = match &config.legacy_config {
|
let legacy = match &config.legacy_config {
|
||||||
Some(l) => l,
|
Some(l) => l,
|
||||||
None => return false,
|
None => return false,
|
||||||
};
|
};
|
||||||
|
|
||||||
let client = Client::builder()
|
|
||||||
.timeout(config.update_timeout)
|
|
||||||
.build()
|
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
let ddns = LegacyDdnsClient {
|
let ddns = LegacyDdnsClient {
|
||||||
client,
|
client: Client::builder()
|
||||||
|
.timeout(config.update_timeout)
|
||||||
|
.build()
|
||||||
|
.unwrap_or_default(),
|
||||||
cf_api_base: "https://api.cloudflare.com/client/v4".to_string(),
|
cf_api_base: "https://api.cloudflare.com/client/v4".to_string(),
|
||||||
dry_run: config.dry_run,
|
dry_run: config.dry_run,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Detect IPs using the shared provider abstraction
|
|
||||||
let detection_client = Client::builder()
|
|
||||||
.timeout(config.detection_timeout)
|
|
||||||
.build()
|
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
let mut ips = HashMap::new();
|
let mut ips = HashMap::new();
|
||||||
|
|
||||||
for (ip_type, provider) in &config.providers {
|
for (ip_type, provider) in &config.providers {
|
||||||
@@ -301,7 +309,7 @@ async fn update_legacy(config: &AppConfig, ppfmt: &PP) -> bool {
|
|||||||
if config.reject_cloudflare_ips {
|
if config.reject_cloudflare_ips {
|
||||||
let before_count = ips.len();
|
let before_count = ips.len();
|
||||||
if let Some(cf_filter) =
|
if let Some(cf_filter) =
|
||||||
CloudflareIpFilter::fetch(&detection_client, config.detection_timeout, ppfmt).await
|
cf_cache.get(&detection_client, config.detection_timeout, ppfmt).await
|
||||||
{
|
{
|
||||||
ips.retain(|key, ip_info| {
|
ips.retain(|key, ip_info| {
|
||||||
if let Ok(addr) = ip_info.ip.parse::<std::net::IpAddr>() {
|
if let Ok(addr) = ip_info.ip.parse::<std::net::IpAddr>() {
|
||||||
@@ -338,6 +346,7 @@ async fn update_legacy(config: &AppConfig, ppfmt: &PP) -> bool {
|
|||||||
&legacy.cloudflare,
|
&legacy.cloudflare,
|
||||||
legacy.ttl,
|
legacy.ttl,
|
||||||
legacy.purge_unknown_records,
|
legacy.purge_unknown_records,
|
||||||
|
noop_reported,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
@@ -489,9 +498,10 @@ impl LegacyDdnsClient {
|
|||||||
config: &[LegacyCloudflareEntry],
|
config: &[LegacyCloudflareEntry],
|
||||||
ttl: i64,
|
ttl: i64,
|
||||||
purge_unknown_records: bool,
|
purge_unknown_records: bool,
|
||||||
|
noop_reported: &mut HashSet<String>,
|
||||||
) {
|
) {
|
||||||
for ip in ips.values() {
|
for ip in ips.values() {
|
||||||
self.commit_record(ip, config, ttl, purge_unknown_records)
|
self.commit_record(ip, config, ttl, purge_unknown_records, noop_reported)
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -502,6 +512,7 @@ impl LegacyDdnsClient {
|
|||||||
config: &[LegacyCloudflareEntry],
|
config: &[LegacyCloudflareEntry],
|
||||||
ttl: i64,
|
ttl: i64,
|
||||||
purge_unknown_records: bool,
|
purge_unknown_records: bool,
|
||||||
|
noop_reported: &mut HashSet<String>,
|
||||||
) {
|
) {
|
||||||
for entry in config {
|
for entry in config {
|
||||||
let zone_resp: Option<LegacyCfResponse<LegacyZoneResult>> = self
|
let zone_resp: Option<LegacyCfResponse<LegacyZoneResult>> = self
|
||||||
@@ -577,8 +588,10 @@ impl LegacyDdnsClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let noop_key = format!("{fqdn}:{}", ip.record_type);
|
||||||
if let Some(ref id) = identifier {
|
if let Some(ref id) = identifier {
|
||||||
if modified {
|
if modified {
|
||||||
|
noop_reported.remove(&noop_key);
|
||||||
if self.dry_run {
|
if self.dry_run {
|
||||||
println!("[DRY RUN] Would update record {fqdn} -> {}", ip.ip);
|
println!("[DRY RUN] Would update record {fqdn} -> {}", ip.ip);
|
||||||
} else {
|
} else {
|
||||||
@@ -589,17 +602,24 @@ impl LegacyDdnsClient {
|
|||||||
.cf_api(&update_endpoint, "PUT", entry, Some(&record))
|
.cf_api(&update_endpoint, "PUT", entry, Some(&record))
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
} else if self.dry_run {
|
} else if noop_reported.insert(noop_key) {
|
||||||
println!("[DRY RUN] Record {fqdn} is up to date ({})", ip.ip);
|
if self.dry_run {
|
||||||
|
println!("[DRY RUN] Record {fqdn} is up to date");
|
||||||
|
} else {
|
||||||
|
println!("Record {fqdn} is up to date");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if self.dry_run {
|
|
||||||
println!("[DRY RUN] Would add new record {fqdn} -> {}", ip.ip);
|
|
||||||
} else {
|
} else {
|
||||||
println!("Adding new record {fqdn} -> {}", ip.ip);
|
noop_reported.remove(&noop_key);
|
||||||
let create_endpoint = format!("zones/{}/dns_records", entry.zone_id);
|
if self.dry_run {
|
||||||
let _: Option<serde_json::Value> = self
|
println!("[DRY RUN] Would add new record {fqdn} -> {}", ip.ip);
|
||||||
.cf_api(&create_endpoint, "POST", entry, Some(&record))
|
} else {
|
||||||
.await;
|
println!("Adding new record {fqdn} -> {}", ip.ip);
|
||||||
|
let create_endpoint = format!("zones/{}/dns_records", entry.zone_id);
|
||||||
|
let _: Option<serde_json::Value> = self
|
||||||
|
.cf_api(&create_endpoint, "POST", entry, Some(&record))
|
||||||
|
.await;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if purge_unknown_records {
|
if purge_unknown_records {
|
||||||
@@ -802,11 +822,13 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// update_once returns true (all_ok) when IP is already correct (Noop).
|
/// update_once returns true (all_ok) when IP is already correct (Noop),
|
||||||
|
/// and populates noop_reported so subsequent calls suppress the message.
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_update_once_noop_when_record_up_to_date() {
|
async fn test_update_once_noop_when_record_up_to_date() {
|
||||||
let server = MockServer::start().await;
|
let server = MockServer::start().await;
|
||||||
@@ -850,8 +872,91 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let mut noop_reported = HashSet::new();
|
||||||
|
|
||||||
|
// First call: noop_reported is empty, so "up to date" is reported and key is inserted
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut noop_reported, &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
|
assert!(noop_reported.contains("home.example.com:A"), "noop_reported should contain the domain key after first noop");
|
||||||
|
|
||||||
|
// Second call: noop_reported already has the key, so the message is suppressed
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut noop_reported, &Client::new()).await;
|
||||||
|
assert!(ok);
|
||||||
|
assert_eq!(noop_reported.len(), 1, "noop_reported should still have exactly one entry");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// noop_reported is cleared when a record is updated, so "up to date" prints again
|
||||||
|
/// on the next noop cycle.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_update_once_noop_reported_cleared_on_change() {
|
||||||
|
let server = MockServer::start().await;
|
||||||
|
let zone_id = "zone-abc";
|
||||||
|
let domain = "home.example.com";
|
||||||
|
let old_ip = "198.51.100.42";
|
||||||
|
let new_ip = "198.51.100.99";
|
||||||
|
|
||||||
|
// Zone lookup
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/zones"))
|
||||||
|
.and(query_param("name", domain))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200).set_body_json(zones_response(zone_id, "example.com")),
|
||||||
|
)
|
||||||
|
.mount(&server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
// List existing records - record has old IP, will be updated
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path_regex(format!("/zones/{zone_id}/dns_records")))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_json(dns_records_one("rec-1", domain, old_ip)),
|
||||||
|
)
|
||||||
|
.mount(&server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
// Create record (new IP doesn't match existing, so it creates + deletes stale)
|
||||||
|
Mock::given(method("POST"))
|
||||||
|
.and(path(format!("/zones/{zone_id}/dns_records")))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_json(dns_record_created("rec-2", domain, new_ip)),
|
||||||
|
)
|
||||||
|
.mount(&server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
// Delete stale record
|
||||||
|
Mock::given(method("DELETE"))
|
||||||
|
.and(path(format!("/zones/{zone_id}/dns_records/rec-1")))
|
||||||
|
.respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({"result": {}})))
|
||||||
|
.mount(&server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let mut providers = HashMap::new();
|
||||||
|
providers.insert(
|
||||||
|
IpType::V4,
|
||||||
|
ProviderType::Literal {
|
||||||
|
ips: vec![new_ip.parse::<IpAddr>().unwrap()],
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let mut domains = HashMap::new();
|
||||||
|
domains.insert(IpType::V4, vec![domain.to_string()]);
|
||||||
|
|
||||||
|
let config = make_config(providers, domains, vec![], false);
|
||||||
|
let cf = handle(&server.uri());
|
||||||
|
let notifier = empty_notifier();
|
||||||
|
let heartbeat = empty_heartbeat();
|
||||||
|
let ppfmt = pp();
|
||||||
|
|
||||||
|
// Pre-populate noop_reported as if a previous cycle reported it
|
||||||
|
let mut noop_reported = HashSet::new();
|
||||||
|
noop_reported.insert("home.example.com:A".to_string());
|
||||||
|
|
||||||
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut noop_reported, &Client::new()).await;
|
||||||
|
assert!(ok);
|
||||||
|
assert!(!noop_reported.contains("home.example.com:A"), "noop_reported should be cleared after an update");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// update_once returns true even when IP detection yields empty (no providers configured),
|
/// update_once returns true even when IP detection yields empty (no providers configured),
|
||||||
@@ -894,7 +999,8 @@ mod tests {
|
|||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
// all_ok = true because no zone-level errors occurred (empty ips just noop or warn)
|
// all_ok = true because no zone-level errors occurred (empty ips just noop or warn)
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
// Providers with None are not inserted in loop, so no IP detection warning is emitted,
|
// Providers with None are not inserted in loop, so no IP detection warning is emitted,
|
||||||
// no detected_ips entry is created, and set_ips is called with empty slice -> Noop.
|
// no detected_ips entry is created, and set_ips is called with empty slice -> Noop.
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
@@ -943,7 +1049,8 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(!ok, "Expected false when zone is not found");
|
assert!(!ok, "Expected false when zone is not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -992,7 +1099,8 @@ mod tests {
|
|||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
// dry_run returns Updated from set_ips (it signals intent), all_ok should be true
|
// dry_run returns Updated from set_ips (it signals intent), all_ok should be true
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1057,7 +1165,8 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1110,7 +1219,8 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1149,7 +1259,8 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(!ok, "Expected false when WAF list is not found");
|
assert!(!ok, "Expected false when WAF list is not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1233,7 +1344,8 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1249,7 +1361,8 @@ mod tests {
|
|||||||
let heartbeat = empty_heartbeat();
|
let heartbeat = empty_heartbeat();
|
||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1633,7 +1746,8 @@ mod tests {
|
|||||||
let ppfmt = pp();
|
let ppfmt = pp();
|
||||||
|
|
||||||
// set_ips with empty ips and no existing records = Noop; all_ok = true
|
// set_ips with empty ips and no existing records = Noop; all_ok = true
|
||||||
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &ppfmt).await;
|
let mut cf_cache = CachedCloudflareFilter::new();
|
||||||
|
let ok = update_once(&config, &cf, ¬ifier, &heartbeat, &mut cf_cache, &ppfmt, &mut HashSet::new(), &Client::new()).await;
|
||||||
assert!(ok);
|
assert!(ok);
|
||||||
}
|
}
|
||||||
// -------------------------------------------------------
|
// -------------------------------------------------------
|
||||||
@@ -1838,7 +1952,7 @@ mod tests {
|
|||||||
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
||||||
proxied: false,
|
proxied: false,
|
||||||
}];
|
}];
|
||||||
ddns.commit_record(&ip, &config, 300, false).await;
|
ddns.commit_record(&ip, &config, 300, false, &mut HashSet::new()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -1894,7 +2008,7 @@ mod tests {
|
|||||||
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
||||||
proxied: false,
|
proxied: false,
|
||||||
}];
|
}];
|
||||||
ddns.commit_record(&ip, &config, 300, false).await;
|
ddns.commit_record(&ip, &config, 300, false, &mut HashSet::new()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -1937,7 +2051,7 @@ mod tests {
|
|||||||
proxied: false,
|
proxied: false,
|
||||||
}];
|
}];
|
||||||
// Should not POST
|
// Should not POST
|
||||||
ddns.commit_record(&ip, &config, 300, false).await;
|
ddns.commit_record(&ip, &config, 300, false, &mut HashSet::new()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -1990,7 +2104,7 @@ mod tests {
|
|||||||
}],
|
}],
|
||||||
proxied: false,
|
proxied: false,
|
||||||
}];
|
}];
|
||||||
ddns.commit_record(&ip, &config, 300, false).await;
|
ddns.commit_record(&ip, &config, 300, false, &mut HashSet::new()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -2042,7 +2156,7 @@ mod tests {
|
|||||||
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
||||||
proxied: false,
|
proxied: false,
|
||||||
}];
|
}];
|
||||||
ddns.commit_record(&ip, &config, 300, true).await;
|
ddns.commit_record(&ip, &config, 300, true, &mut HashSet::new()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -2092,7 +2206,7 @@ mod tests {
|
|||||||
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
subdomains: vec![LegacySubdomainEntry::Simple("@".to_string())],
|
||||||
proxied: false,
|
proxied: false,
|
||||||
}];
|
}];
|
||||||
ddns.update_ips(&ips, &config, 300, false).await;
|
ddns.update_ips(&ips, &config, 300, false, &mut HashSet::new()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|||||||
Reference in New Issue
Block a user