diff --git a/Cargo.lock b/Cargo.lock index 82957efe..c168bd01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -24,12 +24,24 @@ version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" +[[package]] +name = "anymap" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" + [[package]] name = "arc-swap" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +[[package]] +name = "arc-swap" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73" + [[package]] name = "async-trait" version = "0.1.42" @@ -49,7 +61,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -178,7 +190,7 @@ dependencies = [ "num-integer", "num-traits", "time", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -222,6 +234,27 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "lazy_static", +] + [[package]] name = "crypto2" version = "0.1.1" @@ -301,6 +334,18 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +[[package]] +name = "filetime" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "winapi 0.3.9", +] + [[package]] name = "fnv" version = "1.0.7" @@ -338,6 +383,41 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +[[package]] +name = "fsevent" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97f347202c95c98805c216f9e1df210e8ebaec9fdb2365700a43c10797a35e63" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a29c77f1ca394c3e73a9a5d24cfcabb734682d9634fc398f2204a63c994120" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + [[package]] name = "futures" version = "0.3.9" @@ -516,7 +596,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" dependencies = [ "libc", "match_cfg", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -603,6 +683,26 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "inotify" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46dd0a94b393c730779ccfd2a872b67b1eb67be3fc33082e733bdb38b5fde4d4" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "instant" version = "0.1.9" @@ -612,6 +712,15 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + [[package]] name = "ipconfig" version = "0.2.2" @@ -620,7 +729,7 @@ checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" dependencies = [ "socket2", "widestring", - "winapi", + "winapi 0.3.9", "winreg", ] @@ -686,12 +795,28 @@ dependencies = [ "serde", ] +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "libc" version = "0.2.82" @@ -745,7 +870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1572a880d1115ff867396eee7ae2bc924554225e67a0d3c85c745b3e60ca211" dependencies = [ "anyhow", - "arc-swap", + "arc-swap 0.4.8", "chrono", "derivative", "fnv", @@ -762,7 +887,7 @@ dependencies = [ "thiserror", "thread-id", "typemap", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -798,6 +923,12 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + [[package]] name = "memchr" version = "2.3.4" @@ -813,6 +944,25 @@ dependencies = [ "libmimalloc-sys", ] +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + [[package]] name = "mio" version = "0.7.7" @@ -821,9 +971,33 @@ checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" dependencies = [ "libc", "log", - "miow", + "miow 0.3.6", "ntapi", - "winapi", + "winapi 0.3.9", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", ] [[package]] @@ -833,7 +1007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ "socket2", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -854,6 +1028,17 @@ dependencies = [ "tempfile", ] +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + [[package]] name = "nix" version = "0.19.1" @@ -866,13 +1051,33 @@ dependencies = [ "libc", ] +[[package]] +name = "notify" +version = "5.0.0-pre.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8b946889dfdad884379cd56367d93b6d0ce8889cc027d26a69a3a31c0a03bb5" +dependencies = [ + "anymap", + "bitflags", + "crossbeam-channel", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + [[package]] name = "ntapi" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -980,7 +1185,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1252,7 +1457,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1277,7 +1482,7 @@ dependencies = [ "spin 0.5.2", "untrusted", "web-sys", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1311,6 +1516,15 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.19" @@ -1318,7 +1532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1441,6 +1655,7 @@ dependencies = [ name = "shadowsocks" version = "1.9.0" dependencies = [ + "arc-swap 1.2.0", "async-trait", "base64", "bloomfilter", @@ -1452,8 +1667,9 @@ dependencies = [ "lazy_static", "libc", "log", - "mio", + "mio 0.7.7", "nix", + "notify", "pin-project 1.0.4", "serde", "serde_json", @@ -1465,7 +1681,7 @@ dependencies = [ "tokio", "trust-dns-resolver", "url", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1521,7 +1737,7 @@ dependencies = [ "log", "log4rs", "lru_time_cache", - "mio", + "mio 0.7.7", "native-tls", "nix", "pin-project 1.0.4", @@ -1579,7 +1795,7 @@ checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ "cfg-if 1.0.0", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1655,7 +1871,7 @@ dependencies = [ "rand 0.7.3", "redox_syscall", "remove_dir_all", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1665,7 +1881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1715,7 +1931,7 @@ checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" dependencies = [ "libc", "redox_syscall", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1734,7 +1950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1762,14 +1978,14 @@ dependencies = [ "bytes", "libc", "memchr", - "mio", + "mio 0.7.7", "num_cpus", "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", "tokio-macros", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2097,6 +2313,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "walkdir" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + [[package]] name = "want" version = "0.3.0" @@ -2208,6 +2435,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + [[package]] name = "winapi" version = "0.3.9" @@ -2218,6 +2451,12 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -2230,7 +2469,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2245,7 +2484,17 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" dependencies = [ - "winapi", + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", ] [[package]] diff --git a/crates/shadowsocks-service/src/lib.rs b/crates/shadowsocks-service/src/lib.rs index c2bc533b..97c1e1b5 100644 --- a/crates/shadowsocks-service/src/lib.rs +++ b/crates/shadowsocks-service/src/lib.rs @@ -79,7 +79,7 @@ fn hint_support_default_system_resolver() -> bool { cfg!(all( unix, not(target_os = "android"), - not(target_os = "macos"), - not(target_os = "ios") + /* not(target_os = "macos"), + * not(target_os = "ios") */ )) } diff --git a/crates/shadowsocks-service/src/local/mod.rs b/crates/shadowsocks-service/src/local/mod.rs index 70447f33..f8546469 100644 --- a/crates/shadowsocks-service/src/local/mod.rs +++ b/crates/shadowsocks-service/src/local/mod.rs @@ -138,7 +138,12 @@ pub async fn run(mut config: Config) -> io::Result<()> { #[cfg(feature = "trust-dns")] if context.dns_resolver().is_system_resolver() { if config.dns.is_some() || crate::hint_support_default_system_resolver() { - match DnsResolver::trust_dns_resolver(config.dns, config.ipv6_first).await { + let r = match config.dns { + None => DnsResolver::trust_dns_system_resolver(config.ipv6_first).await, + Some(dns) => DnsResolver::trust_dns_resolver(dns, config.ipv6_first).await, + }; + + match r { Ok(r) => { context.set_dns_resolver(Arc::new(r)); } diff --git a/crates/shadowsocks-service/src/manager/mod.rs b/crates/shadowsocks-service/src/manager/mod.rs index f4df64b1..d30759f6 100644 --- a/crates/shadowsocks-service/src/manager/mod.rs +++ b/crates/shadowsocks-service/src/manager/mod.rs @@ -40,8 +40,22 @@ pub async fn run(config: Config) -> io::Result<()> { if config.dns.is_some() || crate::hint_support_default_system_resolver() { use shadowsocks::dns_resolver::DnsResolver; - let resolver = Arc::new(DnsResolver::trust_dns_resolver(config.dns, config.ipv6_first).await?); - manager.set_dns_resolver(resolver); + let r = match config.dns { + None => DnsResolver::trust_dns_system_resolver(config.ipv6_first).await, + Some(dns) => DnsResolver::trust_dns_resolver(dns, config.ipv6_first).await, + }; + + match r { + Ok(r) => { + manager.set_dns_resolver(Arc::new(r)); + } + Err(err) => { + warn!( + "initialize DNS resolver failed, fallback to system resolver, error: {}", + err + ); + } + } } let mut connect_opts = ConnectOpts { diff --git a/crates/shadowsocks-service/src/server/mod.rs b/crates/shadowsocks-service/src/server/mod.rs index 2339b380..80f7e897 100644 --- a/crates/shadowsocks-service/src/server/mod.rs +++ b/crates/shadowsocks-service/src/server/mod.rs @@ -84,9 +84,21 @@ pub async fn run(config: Config) -> io::Result<()> { #[cfg(feature = "trust-dns")] let resolver = if config.dns.is_some() || crate::hint_support_default_system_resolver() { - Some(Arc::new( - DnsResolver::trust_dns_resolver(config.dns, config.ipv6_first).await?, - )) + let r = match config.dns { + None => DnsResolver::trust_dns_system_resolver(config.ipv6_first).await, + Some(dns) => DnsResolver::trust_dns_resolver(dns, config.ipv6_first).await, + }; + + match r { + Ok(r) => Some(Arc::new(r)), + Err(err) => { + warn!( + "initialize DNS resolver failed, fallback to system resolver, error: {}", + err + ); + None + } + } } else { None }; diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml index 677e64b4..7fac66e8 100644 --- a/crates/shadowsocks/Cargo.toml +++ b/crates/shadowsocks/Cargo.toml @@ -19,7 +19,7 @@ default = [ ] # Uses trust-dns instead of tokio's builtin DNS resolver -trust-dns = ["trust-dns-resolver"] +trust-dns = ["trust-dns-resolver", "arc-swap", "notify"] # Enable Stream Cipher Protocol # WARN: Stream Cipher Protocol is proved to be insecured @@ -54,6 +54,8 @@ socket2 = "0.3" tokio = { version = "1.0", features = ["io-util", "macros", "net", "parking_lot", "process", "rt"] } trust-dns-resolver = { version = "0.20", optional = true } +arc-swap = { version = "1.2", optional = true } +notify = { version = "5.0.0-alpha", optional = true } [target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies] shadowsocks-crypto = { version = "0.1.2", features = ["ring"] } @@ -61,7 +63,6 @@ shadowsocks-crypto = { version = "0.1.2", features = ["ring"] } [target.'cfg(not(any(target_arch = "x86_64", target_arch = "aarch64")))'.dependencies] shadowsocks-crypto = { version = "0.1.2", features = [] } - [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["mswsock", "winsock2"] } diff --git a/crates/shadowsocks/src/dns_resolver/resolver.rs b/crates/shadowsocks/src/dns_resolver/resolver.rs index f1e220fe..91a5ac4e 100644 --- a/crates/shadowsocks/src/dns_resolver/resolver.rs +++ b/crates/shadowsocks/src/dns_resolver/resolver.rs @@ -1,5 +1,7 @@ //! Resolver Alternatives +#[cfg(feature = "trust-dns")] +use std::sync::Arc; use std::{ fmt::{self, Debug}, io::{self, Error, ErrorKind}, @@ -7,8 +9,14 @@ use std::{ time::Instant, }; +#[cfg(feature = "trust-dns")] +use arc_swap::ArcSwap; use async_trait::async_trait; -use log::{log_enabled, trace, Level}; +#[cfg(feature = "trust-dns")] +use futures::future::{self, AbortHandle}; +use log::{error, log_enabled, trace, Level}; +#[cfg(feature = "trust-dns")] +use notify::{Event, EventKind, RecommendedWatcher, RecursiveMode, Result as NotifyResult, Watcher}; use tokio::net::lookup_host; #[cfg(feature = "trust-dns")] use trust_dns_resolver::{config::ResolverConfig, TokioAsyncResolver}; @@ -20,10 +28,22 @@ pub trait DnsResolve { async fn resolve(&self, addr: &str, port: u16) -> io::Result>; } +#[cfg(feature = "trust-dns")] +pub struct TrustDnsSystemResolver { + resolver: ArcSwap, + ipv6_first: bool, +} + /// Collections of DNS resolver pub enum DnsResolver { /// System Resolver, which is tokio's builtin resolver System, + /// Trust-DNS's system resolver + #[cfg(feature = "trust-dns")] + TrustDnsSystem { + inner: Arc, + abortable: AbortHandle, + }, #[cfg(feature = "trust-dns")] /// Trust-DNS resolver TrustDns(TokioAsyncResolver), @@ -42,12 +62,23 @@ impl Debug for DnsResolver { match *self { DnsResolver::System => f.write_str("System"), #[cfg(feature = "trust-dns")] + DnsResolver::TrustDnsSystem { .. } => f.write_str("TrustDnsSystem(..)"), + #[cfg(feature = "trust-dns")] DnsResolver::TrustDns(..) => f.write_str("TrustDns(..)"), DnsResolver::Custom(..) => f.write_str("Custom(..)"), } } } +#[cfg(feature = "trust-dns")] +impl Drop for DnsResolver { + fn drop(&mut self) { + if let DnsResolver::TrustDnsSystem { ref abortable, .. } = *self { + abortable.abort(); + } + } +} + struct EmptyResolveResult; impl Iterator for EmptyResolveResult { @@ -59,40 +90,122 @@ impl Iterator for EmptyResolveResult { } // Resolved result -enum EitherResolved { +enum EitherResolved { Tokio(A), - TrustDns(B), - Custom(C), + TrustDnsSystem(B), + TrustDns(C), + Custom(D), } -impl Iterator for EitherResolved +impl Iterator for EitherResolved where A: Iterator, B: Iterator, C: Iterator, + D: Iterator, { type Item = SocketAddr; fn next(&mut self) -> Option { match *self { EitherResolved::Tokio(ref mut a) => a.next(), - EitherResolved::TrustDns(ref mut b) => b.next(), - EitherResolved::Custom(ref mut c) => c.next(), + EitherResolved::TrustDnsSystem(ref mut b) => b.next(), + EitherResolved::TrustDns(ref mut c) => c.next(), + EitherResolved::Custom(ref mut d) => d.next(), } } } +#[cfg(all(unix, not(target_os = "android")))] +async fn trust_dns_notify_update_dns(resolver: Arc) -> NotifyResult<()> { + use log::debug; + use tokio::sync::watch; + + use super::trust_dns_resolver::create_resolver; + + let (tx, mut rx) = watch::channel::(Event::default()); + + let mut watcher: RecommendedWatcher = + Watcher::new_immediate(move |ev_result: NotifyResult| match ev_result { + Ok(ev) => { + trace!("received event {:?}", ev); + + if let EventKind::Modify(..) = ev.kind { + tx.send(ev).expect("watcher.send"); + } + } + Err(err) => { + error!("watching /etc/resolv.conf error: {}", err); + } + })?; + + // NOTE: It is an undefined behavior if this file get renamed or removed. + watcher.watch("/etc/resolv.conf", RecursiveMode::NonRecursive)?; + + while rx.changed().await.is_ok() { + trace!("received notify /etc/resolv.conf changed"); + + let new_resolver = match create_resolver(None, resolver.ipv6_first).await { + Ok(r) => r, + Err(err) => { + error!("failed to reload /etc/resolv.conf, error: {}", err); + continue; + } + }; + + debug!("auto-reload /etc/resolv.conf"); + + resolver.resolver.store(Arc::new(new_resolver)); + } + + error!("auto-reload /etc/resolv.conf task exited unexpectly"); + + Ok(()) +} + +#[cfg(any(not(unix), target_os = "android"))] +async fn trust_dns_notify_update_dns(resolver: Arc) -> NotifyResult<()> { + future::pending().await +} + impl DnsResolver { /// Use system DNS resolver. Tokio will call `getaddrinfo` in blocking pool. pub fn system_resolver() -> DnsResolver { DnsResolver::System } + /// Use trust-dns DNS system resolver (with DNS cache) + /// + /// On *nix system, it will try to read configurations from `/etc/resolv.conf`. + #[cfg(feature = "trust-dns")] + pub async fn trust_dns_system_resolver(ipv6_first: bool) -> io::Result { + use super::trust_dns_resolver::create_resolver; + + let resolver = create_resolver(None, ipv6_first).await?; + + let inner = Arc::new(TrustDnsSystemResolver { + resolver: ArcSwap::from(Arc::new(resolver)), + ipv6_first, + }); + + let (notify_task, abortable) = { + let inner = inner.clone(); + future::abortable(async { + if let Err(err) = trust_dns_notify_update_dns(inner).await { + error!("failed to watch DNS system configuration changes, error: {}", err); + } + }) + }; + tokio::spawn(notify_task); + + Ok(DnsResolver::TrustDnsSystem { inner, abortable }) + } + /// Use trust-dns DNS resolver (with DNS cache) #[cfg(feature = "trust-dns")] - pub async fn trust_dns_resolver(dns: Option, ipv6_first: bool) -> io::Result { + pub async fn trust_dns_resolver(dns: ResolverConfig, ipv6_first: bool) -> io::Result { use super::trust_dns_resolver::create_resolver; - Ok(DnsResolver::TrustDns(create_resolver(dns, ipv6_first).await?)) + Ok(DnsResolver::TrustDns(create_resolver(Some(dns), ipv6_first).await?)) } /// Custom DNS resolver @@ -146,7 +259,7 @@ impl DnsResolver { ); } #[cfg(feature = "trust-dns")] - DnsResolver::TrustDns(..) => { + DnsResolver::TrustDnsSystem { .. } | DnsResolver::TrustDns(..) => { trace!( "DNS resolved {}:{} with trust-dns {}s", self.addr, @@ -169,7 +282,7 @@ impl DnsResolver { trace!("DNS resolved {}:{} with tokio", self.addr, self.port); } #[cfg(feature = "trust-dns")] - DnsResolver::TrustDns(..) => { + DnsResolver::TrustDnsSystem { .. } | DnsResolver::TrustDns(..) => { trace!("DNS resolved {}:{} with trust-dns", self.addr, self.port); } DnsResolver::Custom(..) => { @@ -194,6 +307,19 @@ impl DnsResolver { } }, #[cfg(feature = "trust-dns")] + DnsResolver::TrustDnsSystem { ref inner, .. } => match inner.resolver.load().lookup_ip(addr).await { + Ok(lookup_result) => Ok(EitherResolved::TrustDnsSystem( + lookup_result.into_iter().map(move |ip| SocketAddr::new(ip, port)), + )), + Err(err) => { + let err = Error::new( + ErrorKind::Other, + format!("dns resolve {}:{} error: {}", addr, port, err), + ); + Err(err) + } + }, + #[cfg(feature = "trust-dns")] DnsResolver::TrustDns(ref resolver) => match resolver.lookup_ip(addr).await { Ok(lookup_result) => Ok(EitherResolved::TrustDns( lookup_result.into_iter().map(move |ip| SocketAddr::new(ip, port)),