Mirrors/continuwuity
0
0 Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-11-15 13:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Formatting + Commenting

Browse Source 
diff --git c/src/service/resolver/actual.rs i/src/service/resolver/actual.rs
index 9cd1aec15..495d83172 100644
--- c/src/service/resolver/actual.rs
+++ i/src/service/resolver/actual.rs
@@ -1,9 +1,5 @@
 use std::fmt::Debug;

-use super::{
-	cache::{CachedDest, CachedOverride, MAX_IPS},
-	fed::{FedDest, PortString, add_port_to_hostname, ensure_host_has_port, get_ip_with_port},
-};
 use conduwuit::{Err, Result, debug, debug_info, err, error, trace};
 use futures::{FutureExt, TryFutureExt};
 use hickory_resolver::{
@@ -15,9 +11,11 @@

 use super::{
 	cache::{CachedDest, CachedOverride, MAX_IPS},
-	fed::{FedDest, PortString, add_port_to_hostname, get_ip_with_port},
+	fed::{FedDest, PortString, add_port_to_hostname, ensure_host_has_port, get_ip_with_port},
 };

+const DEFAULT_PORT: u16 = 8448;
+
 #[derive(Clone, Debug)]
 pub(crate) struct ActualDest {
 	pub(crate) dest: FedDest,
@@ -26,9 +24,7 @@ pub(crate) struct ActualDest {

 impl ActualDest {
 	#[inline]
-	pub(crate) fn string(&self) -> String {
-		self.dest.https_string()
-	}
+	pub(crate) fn string(&self) -> String { self.dest.https_string() }
 }

 impl super::Service {
@@ -75,7 +71,8 @@ pub async fn resolve_actual_dest(
 		// Ensure dest is a valid connection endpoint
 		self.validate_dest(dest)?;

-		// Clippy believes this can be a clone, however we are actually converting ServerName to String
+		// Clippy believes this can be a clone, however we are actually converting
+		// ServerName to String
 		#[allow(clippy::implicit_clone)]
 		let mut host = dest.to_string().to_owned();
 		let actual_dest = self.resolve_server_name(dest, cache, &mut host).await?;
@@ -103,8 +100,8 @@ async fn resolve_server_name(
 		cache: bool,
 		host: &mut String,
 	) -> Result<FedDest> {
-		// 1. If `dest` is an IP, use it directly. If a port is provided as well (IP:port socket pair)
-		//    use that, otherwise default to port 8448
+		// 1. If `dest` is an IP, use it directly. If a port is provided as well
+		//    (IP:port socket pair) use that, otherwise default to port 8448
 		if let Some(fed_dest) = get_ip_with_port(dest.as_str()) {
 			debug!("1: IP literal with provided or default port");
 			return Ok(fed_dest);
@@ -117,8 +114,8 @@ async fn resolve_server_name(
 				.await?;
 		}

-		// Pre-resolve IP? Unsure what overrides exactly do, system is due to be removed either way
-		// https://matrix.to/#/!da26JtAjE6APGLnX8ncWsvc-skF2KQZ9Nw_MbNpYD2k/%24_hq6JP0JXANbMTMPdV64iZbgbsZdhy92M5ndDYGy6No
+		// Pre-resolve IP? Unsure what overrides exactly do, system is due to be removed
+		// either way https://matrix.to/#/!da26JtAjE6APGLnX8ncWsvc-skF2KQZ9Nw_MbNpYD2k/%24_hq6JP0JXANbMTMPdV64iZbgbsZdhy92M5ndDYGy6No
 		self.conditional_query_and_cache(dest.as_str(), DEFAULT_PORT, true)
 			.await?;

@@ -126,7 +123,8 @@ async fn resolve_server_name(
 		self.services.server.check_running()?;

 		// 3. If `dest` is a hostname with no port, send GET to `https://<dest>/.well-known/matrix/server`.
-		// If invalid JSON (throws error), skip to step 4. Otherwise, parse `delegated` as `<hostname>[:<port>]` and...
+		// If invalid JSON (throws error), skip to step 4. Otherwise, parse `delegated`
+		// as `<hostname>[:<port>]` and...
 		if let Some(delegated) = self.request_well_known(dest.as_str()).await? {
 			// delegated=matrix-federation.matrix.org:443 // host=matrix.org
 			self.resolve_3_well_known(host, cache, delegated).await?;
@@ -137,11 +135,13 @@ async fn resolve_server_name(
 			self.resolve_4_srv_lookup(host, cache, overrider).await?;
 		}

-		// 5. if .well-known errored and no SRV exists, resolve IP and connect on default port (8448)
+		// 5. if .well-known errored and no SRV exists, resolve IP and connect on
+		//    default port (8448)
 		self.resolve_5_direct(dest, cache).await
 	}

-	/// Parse a host:port socket pair into separate parts, and resolve the hostname into an IP address
+	/// Parse a host:port socket pair into separate parts, and resolve the
+	/// hostname into an IP address
 	async fn resolve_2_host_port(
 		&self,
 		dest: &ServerName,
@@ -180,14 +180,16 @@ async fn resolve_3_well_known(
 			return Ok(host_and_port);
 		}

-		// 3.2 - If <delegated> is not an IP and a port is present, lookup IP for hostname and connect
+		// 3.2 - If <delegated> is not an IP and a port is present, lookup IP for
+		// hostname and connect
 		if let Some(pos) = &delegated.find(':') {
 			self.resolve_3_2_hostname_port(cache, &delegated, *pos)
 				.await?;
 		}

-		// 3.3 - If <delegated> is not an IP and there is no port, lookup SRV `_matrix._tcp.<delegated>`
-		// (which may provide a new hostname + port to use, see steps 3.1 and 3.2)
+		// 3.3 - If <delegated> is not an IP and there is no port, lookup SRV
+		// `_matrix._tcp.<delegated>` (which may provide a new hostname + port to use,
+		// see steps 3.1 and 3.2)
 		trace!("Delegated hostname has no port, querying SRV");
 		if let Some(overrider) = self.query_srv_record(&delegated).await? {
 			self.resolve_3_3_use_srv(cache, &delegated, overrider)
@@ -342,17 +344,14 @@ async fn query_and_cache_override(
 		match self.resolver.resolver.lookup_ip(hostname.to_owned()).await {
 			| Err(e) => Self::handle_resolve_error(&e, hostname),
 			| Ok(override_ip) => {
-				self.cache.set_override(
-					untername,
-					&CachedOverride {
-						ips: override_ip.iter().take(MAX_IPS).collect(),
-						port,
-						expire: CachedOverride::default_expire(),
-						overriding: (hostname != untername)
-							.then_some(hostname.into())
-							.inspect(|_| debug_info!("{untername:?} overridden by {hostname:?}")),
-					},
-				);
+				self.cache.set_override(untername, &CachedOverride {
+					ips: override_ip.into_iter().take(MAX_IPS).collect(),
+					port,
+					expire: CachedOverride::default_expire(),
+					overriding: (hostname != untername)
+						.then_some(hostname.into())
+						.inspect(|_| debug_info!("{untername:?} overridden by {hostname:?}")),
+				});

 				Ok(())
 			},
@@ -415,7 +414,8 @@ fn handle_resolve_error(err: &NetError, host: &'_ str) -> Result<()> {
 		}
 	}

-	/// Ensure `dest` is a valid destination (valid ip if it is an IP), and not ourselves (unless in config)
+	/// Ensure `dest` is a valid destination (valid ip if it is an IP), and not
+	/// ourselves (unless in config)
 	fn validate_dest(&self, dest: &ServerName) -> Result<()> {
 		if dest == self.services.server.name && !self.services.server.config.federation_loopback {
 			return Err!("Won't send federation request to ourselves");
diff --git c/src/service/resolver/fed.rs i/src/service/resolver/fed.rs
index b43f62eed..83601a98a 100644
--- c/src/service/resolver/fed.rs
+++ i/src/service/resolver/fed.rs
@@ -9,8 +9,8 @@

 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub enum FedDest {
-	Literal(SocketAddr),
-	Named(String, PortString),
+	Literal(SocketAddr),       // "ip:port"
+	Named(String, PortString), // ("hostname", ":port")
 }

 /// numeric or service-name
@@ -18,6 +18,9 @@ pub enum FedDest {

 const DEFAULT_PORT: &str = ":8448";

+/// Attempt to parse `dest_str` as either an IP:port socket pair or as a plain
+/// IP (adding the default port), returning `None` if dest_str is neither a
+/// socket pair nor a plain IP.
 pub(crate) fn get_ip_with_port(dest_str: &str) -> Option<FedDest> {
 	if let Ok(dest) = dest_str.parse::<SocketAddr>() {
 		Some(FedDest::Literal(dest))
@@ -28,6 +31,8 @@ pub(crate) fn get_ip_with_port(dest_str: &str) -> Option<FedDest> {
 	}
 }

+/// Convert a `dest` string with or without port into a FedDest with either
+/// the provided port (if host:port format) or the default port (8448)
 pub(crate) fn add_port_to_hostname(dest: &str) -> FedDest {
 	let (host, port) = match dest.find(':') {
 		| None => (dest, DEFAULT_PORT),
@@ -42,8 +47,8 @@ pub(crate) fn add_port_to_hostname(dest: &str) -> FedDest {

 /// Ensure `host` always has a port
 ///
-/// `get_ip_with_port` returns `None` if `host` isn't an IP:port string or plain IP,
-/// in which case `add_port_to_hostname` adds it instead
+/// `get_ip_with_port` returns `None` if `host` isn't an IP:port string or plain
+/// IP, in which case `add_port_to_hostname` adds it instead
 #[inline]
 pub(crate) fn ensure_host_has_port(host: &str) -> FedDest {
 	get_ip_with_port(host).unwrap_or_else(|| add_port_to_hostname(host))
This commit is contained in:
theS1LV3R committed 2026-07-03 10:59:10 +02:00
1 parent cb031aef84
commit 03e312f2b4
2 files changed
+40 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/service/resolver/actual.rs
+31 -31
View File
@@ -1,9 +1,5 @@
use std::fmt::Debug; use std::fmt::Debug;
use super::{
cache::{CachedDest, CachedOverride, MAX_IPS},
fed::{FedDest, PortString, add_port_to_hostname, ensure_host_has_port, get_ip_with_port},
};
use conduwuit::{Err, Result, debug, debug_info, err, error, trace}; use conduwuit::{Err, Result, debug, debug_info, err, error, trace};
use futures::{FutureExt, TryFutureExt}; use futures::{FutureExt, TryFutureExt};
use hickory_resolver::{ use hickory_resolver::{
@@ -15,9 +11,11 @@ use ruma::ServerName;
use super::{ use super::{
cache::{CachedDest, CachedOverride, MAX_IPS}, cache::{CachedDest, CachedOverride, MAX_IPS},
fed::{FedDest, PortString, add_port_to_hostname, get_ip_with_port}, fed::{FedDest, PortString, add_port_to_hostname, ensure_host_has_port, get_ip_with_port},
}; };
const DEFAULT_PORT: u16 = 8448;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub(crate) struct ActualDest { pub(crate) struct ActualDest {
pub(crate) dest: FedDest, pub(crate) dest: FedDest,
@@ -26,9 +24,7 @@ pub(crate) struct ActualDest {
impl ActualDest { impl ActualDest {
#[inline] #[inline]
pub(crate) fn string(&self) -> String { pub(crate) fn string(&self) -> String { self.dest.https_string() }
self.dest.https_string()
}
} }
impl super::Service { impl super::Service {
@@ -75,7 +71,8 @@ impl super::Service {
// Ensure dest is a valid connection endpoint // Ensure dest is a valid connection endpoint
self.validate_dest(dest)?; self.validate_dest(dest)?;
// Clippy believes this can be a clone, however we are actually converting ServerName to String // Clippy believes this can be a clone, however we are actually converting
// ServerName to String
#[allow(clippy::implicit_clone)] #[allow(clippy::implicit_clone)]
let mut host = dest.to_string().to_owned(); let mut host = dest.to_string().to_owned();
let actual_dest = self.resolve_server_name(dest, cache, &mut host).await?; let actual_dest = self.resolve_server_name(dest, cache, &mut host).await?;
@@ -103,8 +100,8 @@ impl super::Service {
cache: bool, cache: bool,
host: &mut String, host: &mut String,
) -> Result<FedDest> { ) -> Result<FedDest> {
// 1. If `dest` is an IP, use it directly. If a port is provided as well (IP:port socket pair) // 1. If `dest` is an IP, use it directly. If a port is provided as well
// use that, otherwise default to port 8448 // (IP:port socket pair) use that, otherwise default to port 8448
if let Some(fed_dest) = get_ip_with_port(dest.as_str()) { if let Some(fed_dest) = get_ip_with_port(dest.as_str()) {
debug!("1: IP literal with provided or default port"); debug!("1: IP literal with provided or default port");
return Ok(fed_dest); return Ok(fed_dest);
@@ -117,8 +114,8 @@ impl super::Service {
.await?; .await?;
} }
// Pre-resolve IP? Unsure what overrides exactly do, system is due to be removed either way // Pre-resolve IP? Unsure what overrides exactly do, system is due to be removed
// https://matrix.to/#/!da26JtAjE6APGLnX8ncWsvc-skF2KQZ9Nw_MbNpYD2k/%24_hq6JP0JXANbMTMPdV64iZbgbsZdhy92M5ndDYGy6No // either way https://matrix.to/#/!da26JtAjE6APGLnX8ncWsvc-skF2KQZ9Nw_MbNpYD2k/%24_hq6JP0JXANbMTMPdV64iZbgbsZdhy92M5ndDYGy6No
self.conditional_query_and_cache(dest.as_str(), DEFAULT_PORT, true) self.conditional_query_and_cache(dest.as_str(), DEFAULT_PORT, true)
.await?; .await?;
@@ -126,7 +123,8 @@ impl super::Service {
self.services.server.check_running()?; self.services.server.check_running()?;
// 3. If `dest` is a hostname with no port, send GET to `https://<dest>/.well-known/matrix/server`. // 3. If `dest` is a hostname with no port, send GET to `https://<dest>/.well-known/matrix/server`.
// If invalid JSON (throws error), skip to step 4. Otherwise, parse `delegated` as `<hostname>[:<port>]` and... // If invalid JSON (throws error), skip to step 4. Otherwise, parse `delegated`
// as `<hostname>[:<port>]` and...
if let Some(delegated) = self.request_well_known(dest.as_str()).await? { if let Some(delegated) = self.request_well_known(dest.as_str()).await? {
// delegated=matrix-federation.matrix.org:443 // host=matrix.org // delegated=matrix-federation.matrix.org:443 // host=matrix.org
self.resolve_3_well_known(host, cache, delegated).await?; self.resolve_3_well_known(host, cache, delegated).await?;
@@ -137,11 +135,13 @@ impl super::Service {
self.resolve_4_srv_lookup(host, cache, overrider).await?; self.resolve_4_srv_lookup(host, cache, overrider).await?;
} }
// 5. if .well-known errored and no SRV exists, resolve IP and connect on default port (8448) // 5. if .well-known errored and no SRV exists, resolve IP and connect on
// default port (8448)
self.resolve_5_direct(dest, cache).await self.resolve_5_direct(dest, cache).await
} }
/// Parse a host:port socket pair into separate parts, and resolve the hostname into an IP address /// Parse a host:port socket pair into separate parts, and resolve the
/// hostname into an IP address
async fn resolve_2_host_port( async fn resolve_2_host_port(
&self, &self,
dest: &ServerName, dest: &ServerName,
@@ -180,14 +180,16 @@ impl super::Service {
return Ok(host_and_port); return Ok(host_and_port);
} }
// 3.2 - If <delegated> is not an IP and a port is present, lookup IP for hostname and connect // 3.2 - If <delegated> is not an IP and a port is present, lookup IP for
// hostname and connect
if let Some(pos) = &delegated.find(':') { if let Some(pos) = &delegated.find(':') {
self.resolve_3_2_hostname_port(cache, &delegated, *pos) self.resolve_3_2_hostname_port(cache, &delegated, *pos)
.await?; .await?;
} }
// 3.3 - If <delegated> is not an IP and there is no port, lookup SRV `_matrix._tcp.<delegated>` // 3.3 - If <delegated> is not an IP and there is no port, lookup SRV
// (which may provide a new hostname + port to use, see steps 3.1 and 3.2) // `_matrix._tcp.<delegated>` (which may provide a new hostname + port to use,
// see steps 3.1 and 3.2)
trace!("Delegated hostname has no port, querying SRV"); trace!("Delegated hostname has no port, querying SRV");
if let Some(overrider) = self.query_srv_record(&delegated).await? { if let Some(overrider) = self.query_srv_record(&delegated).await? {
self.resolve_3_3_use_srv(cache, &delegated, overrider) self.resolve_3_3_use_srv(cache, &delegated, overrider)
@@ -342,17 +344,14 @@ impl super::Service {
match self.resolver.resolver.lookup_ip(hostname.to_owned()).await { match self.resolver.resolver.lookup_ip(hostname.to_owned()).await {
| Err(e) => Self::handle_resolve_error(&e, hostname), | Err(e) => Self::handle_resolve_error(&e, hostname),
| Ok(override_ip) => { | Ok(override_ip) => {
self.cache.set_override( self.cache.set_override(untername, &CachedOverride {
untername, ips: override_ip.into_iter().take(MAX_IPS).collect(),
&CachedOverride { port,
ips: override_ip.iter().take(MAX_IPS).collect(), expire: CachedOverride::default_expire(),
port, overriding: (hostname != untername)
expire: CachedOverride::default_expire(), .then_some(hostname.into())
overriding: (hostname != untername) .inspect(|_| debug_info!("{untername:?} overridden by {hostname:?}")),
.then_some(hostname.into()) });
.inspect(|_| debug_info!("{untername:?} overridden by {hostname:?}")),
},
);
Ok(()) Ok(())
}, },
@@ -415,7 +414,8 @@ impl super::Service {
} }
} }
/// Ensure `dest` is a valid destination (valid ip if it is an IP), and not ourselves (unless in config) /// Ensure `dest` is a valid destination (valid ip if it is an IP), and not
/// ourselves (unless in config)
fn validate_dest(&self, dest: &ServerName) -> Result<()> { fn validate_dest(&self, dest: &ServerName) -> Result<()> {
if dest == self.services.server.name && !self.services.server.config.federation_loopback { if dest == self.services.server.name && !self.services.server.config.federation_loopback {
return Err!("Won't send federation request to ourselves"); return Err!("Won't send federation request to ourselves");
src/service/resolver/fed.rs
+9 -4
View File
@@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)] #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
pub enum FedDest { pub enum FedDest {
Literal(SocketAddr), Literal(SocketAddr), // "ip:port"
Named(String, PortString), Named(String, PortString), // ("hostname", ":port")
} }
/// numeric or service-name /// numeric or service-name
@@ -18,6 +18,9 @@ pub type PortString = ArrayString<16>;
const DEFAULT_PORT: &str = ":8448"; const DEFAULT_PORT: &str = ":8448";
/// Attempt to parse `dest_str` as either an IP:port socket pair or as a plain
/// IP (adding the default port), returning `None` if dest_str is neither a
/// socket pair nor a plain IP.
pub(crate) fn get_ip_with_port(dest_str: &str) -> Option<FedDest> { pub(crate) fn get_ip_with_port(dest_str: &str) -> Option<FedDest> {
if let Ok(dest) = dest_str.parse::<SocketAddr>() { if let Ok(dest) = dest_str.parse::<SocketAddr>() {
Some(FedDest::Literal(dest)) Some(FedDest::Literal(dest))
@@ -28,6 +31,8 @@ pub(crate) fn get_ip_with_port(dest_str: &str) -> Option<FedDest> {
} }
} }
/// Convert a `dest` string with or without port into a FedDest with either
/// the provided port (if host:port format) or the default port (8448)
pub(crate) fn add_port_to_hostname(dest: &str) -> FedDest { pub(crate) fn add_port_to_hostname(dest: &str) -> FedDest {
let (host, port) = match dest.find(':') { let (host, port) = match dest.find(':') {
| None => (dest, DEFAULT_PORT), | None => (dest, DEFAULT_PORT),
@@ -42,8 +47,8 @@ pub(crate) fn add_port_to_hostname(dest: &str) -> FedDest {
/// Ensure `host` always has a port /// Ensure `host` always has a port
/// ///
/// `get_ip_with_port` returns `None` if `host` isn't an IP:port string or plain IP, /// `get_ip_with_port` returns `None` if `host` isn't an IP:port string or plain
/// in which case `add_port_to_hostname` adds it instead /// IP, in which case `add_port_to_hostname` adds it instead
#[inline] #[inline]
pub(crate) fn ensure_host_has_port(host: &str) -> FedDest { pub(crate) fn ensure_host_has_port(host: &str) -> FedDest {
get_ip_with_port(host).unwrap_or_else(|| add_port_to_hostname(host)) get_ip_with_port(host).unwrap_or_else(|| add_port_to_hostname(host))