Previously, only HTTP clients targeting matrix servers (and using the
resolution spec) would use the DNS servers configured in the c10y config.
This happened because reqwest requires any DNS resolvers passed in to
implement reqwest::dns::Resolve, which only the matrix resolver did,
and no other HTTP client had a proper DNS resolver (which used the
configured DNS servers) passed into it.

To fix this we make a custom resolution struct based on reqwest's
reqwest::dns::HickoryDnsResolver, which implements Request with no
other modifications to the DNS response. HickoryDnsResolver itself isn't
exported, which is why we re-created it instead of using it directly.

no im not an LLM i just wrote this to remember my own changes later on

@@ -314,3 +339,3 @@
 		.map_err(|e| err!(error!("Failed to configure DNS resolver from system: {e}")))?;
 
-	let mut conf = hickory_resolver::config::ResolverConfig::default();
+	let mut conf = ResolverConfig::from_name_servers(vec![]);

@@ -983,7 +983,7 @@ impl crate::Context<'_> {
 		let resolver: &MatrixResolver = if no_cache {

@@ -130,3 +151,2 @@
 
-			appservice: base(config)?
-				.dns_resolver(matrix_dns_resolver)
+			appservice: base(config, matrix_dns_resolver)?

@@ -0,0 +1 @@
+Ensure HTTP clients actually follow the `dns_servers` config option. Contributed by @silversys

@@ -0,0 +38,4 @@
+		Box::pin(async move {
+			let lookup = resolver.lookup_ip(name.as_str()).await?;
+			let addrs: Addrs = Box::new(SocketAddrs {
+				iter: lookup.iter().collect::<Vec<_>>().into_iter(),

@@ -21,3 +26,3 @@
 	pub dns_resolver: Arc<TokioResolver>,
 
-	pub dns: reqwest::Client,
+	/// Tokio system resolver wrapped

@@ -24,0 +31,4 @@
+	/// Matrix server resolver according to server resolution spec
+	pub matrix_resolver: Arc<MatrixResolver>,
+
+	/// HTTP client following matrix server resolution spec for requests

@@ -231,3 +253,1 @@
-		.pool_max_idle_per_host(config.request_idle_per_host.into())
-		.user_agent(conduwuit::user_agent())
-		.redirect(redirect::Policy::limited(6))
+        .hickory_dns(true)