studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix and enable collapsible_if lint

Browse Source 
Signed-off-by: June Strawberry <june@vern.cc>
This commit is contained in:
June Strawberry
2026-01-15 17:39:33 -05:00
parent fb102f0e0a
commit 04e66a03d3
54 changed files with 453 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/service/media/mod.rs
View File

@@ -337,10 +337,10 @@ impl Service {
let file_rm = fs::remove_file(&path);
let legacy_rm = fs::remove_file(&legacy);
let (file_rm, legacy_rm) = tokio::join!(file_rm, legacy_rm);
if let Err(e) = legacy_rm {
if self.services.server.config.media_compat_file_link {
debug_error!(?key, ?legacy, "Failed to remove legacy media symlink: {e}");
}
if let Err(e) = legacy_rm
&& self.services.server.config.media_compat_file_link
{
debug_error!(?key, ?legacy, "Failed to remove legacy media symlink: {e}");
}
Ok(file_rm?)

16
src/service/media/preview.rs
View File

@@ -79,10 +79,10 @@ pub async fn get_url_preview(&self, url: &Url) -> Result<UrlPreviewData> {
#[implement(Service)]
async fn request_url_preview(&self, url: &Url) -> Result<UrlPreviewData> {
if let Ok(ip) = IPAddress::parse(url.host_str().expect("URL previously validated")) {
if !self.services.client.valid_cidr_range(&ip) {
return Err!(Request(Forbidden("Requesting from this address is forbidden")));
}
if let Ok(ip) = IPAddress::parse(url.host_str().expect("URL previously validated"))
&& !self.services.client.valid_cidr_range(&ip)
{
return Err!(Request(Forbidden("Requesting from this address is forbidden")));
}
let client = &self.services.client.url_preview;
@@ -93,10 +93,10 @@ async fn request_url_preview(&self, url: &Url) -> Result<UrlPreviewData> {
if let Some(remote_addr) = response.remote_addr() {
debug!(?url, "URL preview response remote address: {:?}", remote_addr);
if let Ok(ip) = IPAddress::parse(remote_addr.ip().to_string()) {
if !self.services.client.valid_cidr_range(&ip) {
return Err!(Request(Forbidden("Requesting from this address is forbidden")));
}
if let Ok(ip) = IPAddress::parse(remote_addr.ip().to_string())
&& !self.services.client.valid_cidr_range(&ip)
{
return Err!(Request(Forbidden("Requesting from this address is forbidden")));
}
}