diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs index 778457f42..a7af1364c 100644 --- a/src/service/pusher/mod.rs +++ b/src/service/pusher/mod.rs @@ -3,7 +3,7 @@ mod webpush; use std::{fmt::Debug, mem, net::IpAddr, sync::Arc}; use bytes::BytesMut; -use conduwuit::utils::response::LimitReadExt; +use conduwuit::{config::experiments::ToggledExperiment, utils::response::LimitReadExt}; use conduwuit_core::{ Err, Event, Result, Server, debug_warn, err, trace, utils::{stream::TryIgnore, string_from_bytes}, @@ -133,7 +133,9 @@ impl Service { self.validate_push_url(&http.url, PUSH_GATEWAY_SCHEMES) .await?; }, - | PusherKind::WebPush(data) => { + | PusherKind::WebPush(data) + if self.services.config.experiments.msc4174.is_enabled() => + { self.validate_push_url(&data.url, WEBPUSH_SCHEMES).await?; webpush::decode_pushkey(pushkey)?; webpush::decode_auth(&data.auth)?; @@ -147,7 +149,7 @@ impl Service { } } }, - | PusherKind::Email(_) | PusherKind::Custom { .. } => (), + | _ => (), } let key = (sender, pushkey); @@ -547,7 +549,9 @@ impl Service { Ok(()) }, - | PusherKind::WebPush(data) => { + | PusherKind::WebPush(data) + if self.services.config.experiments.msc4174.is_enabled() => + { let notify = self .build_notification( user, @@ -562,7 +566,7 @@ impl Service { self.send_webpush_notice(user, pusher, data, notify).await }, - | PusherKind::Email(_) | PusherKind::Custom { .. } => Ok(()), + | _ => Ok(()), } } diff --git a/src/service/pusher/webpush/mod.rs b/src/service/pusher/webpush/mod.rs index 2a428d539..e8f9572ae 100644 --- a/src/service/pusher/webpush/mod.rs +++ b/src/service/pusher/webpush/mod.rs @@ -3,6 +3,7 @@ mod vapid; use std::time::{Duration, SystemTime}; +use conduwuit::config::experiments::ToggledExperiment; use conduwuit_core::{ Err, Result, debug, debug_warn, err, utils::{self, string::constant_time_eq}, @@ -85,6 +86,9 @@ impl Service { /// Reports whether a Web Push pusher has completed its activation /// handshake. pub async fn is_webpush_activated(&self, sender: &UserId, pushkey: &str) -> bool { + if !self.services.config.experiments.msc4174.is_enabled() { + return false; + } self.webpush_state(sender, pushkey).await.activated } @@ -109,6 +113,9 @@ impl Service { pusher: &Pusher, previous: Option<&Pusher>, ) -> bool { + if !self.services.config.experiments.msc4174.is_enabled() { + return false; + } let Some(data) = pusher.kind.as_webpush() else { return false; }; @@ -126,6 +133,13 @@ impl Service { } pub(super) fn begin_webpush_activation(&self, sender: &UserId, pusher: &Pusher) { + debug_assert!( + self.services.config.experiments.msc4174.is_enabled(), + "begin_webpush_activation should not be called with MSC4174 disabled" + ); + if !self.services.config.experiments.msc4174.is_enabled() { + return; + } // Send a one-time encrypted token before allowing notification // delivery. let token = utils::rand::string(ACK_TOKEN_LENGTH);