diff --git a/reflector/src/main.rs b/reflector/src/main.rs index 777dc30..481476c 100644 --- a/reflector/src/main.rs +++ b/reflector/src/main.rs @@ -44,13 +44,12 @@ fn ask_caddy( Data(parent): Data<&Option>, Query(AskQuery { domain }): Query, ) -> Response { - if let Some(parent) = parent { - if let Some(prefix) = domain.strip_suffix(&format!(".{parent}")) { - if !prefix.contains('.') { - // no sub-sub-domains allowed - return Response::builder().body("ok"); - } - } + if let Some(parent) = parent + && let Some(prefix) = domain.strip_suffix(&format!(".{parent}")) + && !prefix.contains('.') + { + // no sub-sub-domains allowed + return Response::builder().body("ok"); }; Response::builder() .status(StatusCode::FORBIDDEN) diff --git a/spacedust/src/subscriber.rs b/spacedust/src/subscriber.rs index 2e6a963..927ef25 100644 --- a/spacedust/src/subscriber.rs +++ b/spacedust/src/subscriber.rs @@ -42,11 +42,11 @@ impl Subscriber { loop { tokio::select! { l = receiver.recv() => match l { - Ok(link) => if self.filter(&link.properties) { - if let Err(e) = ws_sender.send(link.message.clone()).await { - log::warn!("failed to send link, dropping subscriber: {e:?}"); - break; - } + Ok(link) => if self.filter(&link.properties) + && let Err(e) = ws_sender.send(link.message.clone()).await + { + log::warn!("failed to send link, dropping subscriber: {e:?}"); + break; }, Err(RecvError::Closed) => self.shutdown.cancel(), Err(RecvError::Lagged(n)) => { diff --git a/who-am-i/src/server.rs b/who-am-i/src/server.rs index f6a2008..c9b6cc0 100644 --- a/who-am-i/src/server.rs +++ b/who-am-i/src/server.rs @@ -268,10 +268,10 @@ async fn prompt( Some(parent_host), ); } - if let Some(ref app) = params.app { - if !allowed_hosts.contains(app) { - return err("Login is not allowed for this app", false, Some(app)); - } + if let Some(ref app) = params.app + && !allowed_hosts.contains(app) + { + return err("Login is not allowed for this app", false, Some(app)); } let parent_origin = url.origin().ascii_serialization(); if parent_origin == "null" {