commit fc49d46885d65f9f9a39214b874690de53ce53ea · nekomimi.pet/microcosm-rs

+6 -7

reflector/src/main.rs

···

       44
        
           Data(parent): Data<&Option<String>>,

     

       45
        
           Query(AskQuery { domain }): Query<AskQuery>,

     

       46
        
       ) -> Response {

     

       47
       -
           if let Some(parent) = parent {

     

       48
       -
               if let Some(prefix) = domain.strip_suffix(&format!(".{parent}")) {

     

       49
       -
                   if !prefix.contains('.') {

     

       50
       -
                       // no sub-sub-domains allowed

     

       51
       -
                       return Response::builder().body("ok");

     

       52
       -
                   }

     

       53
       -
               }

     

       54
        
           };

     

       55
        
           Response::builder()

     

       56
        
               .status(StatusCode::FORBIDDEN)

···

       44
        
           Data(parent): Data<&Option<String>>,

     

       45
        
           Query(AskQuery { domain }): Query<AskQuery>,

     

       46
        
       ) -> Response {

     

       47
       +
           if let Some(parent) = parent

     

       48
       +
               && let Some(prefix) = domain.strip_suffix(&format!(".{parent}"))

     

       49
       +
               && !prefix.contains('.')

     

       50
       +
           {

     

       51
       +
               // no sub-sub-domains allowed

     

       52
       +
               return Response::builder().body("ok");

     

       0
        
       
     

       53
        
           };

     

       54
        
           Response::builder()

     

       55
        
               .status(StatusCode::FORBIDDEN)

+5 -5

spacedust/src/subscriber.rs

···

       42
        
               loop {

     

       43
        
                   tokio::select! {

     

       44
        
                       l = receiver.recv() => match l {

     

       45
       -
                           Ok(link) => if self.filter(&link.properties) {

     

       46
       -
                               if let Err(e) = ws_sender.send(link.message.clone()).await {

     

       47
       -
                                   log::warn!("failed to send link, dropping subscriber: {e:?}");

     

       48
       -
                                   break;

     

       49
       -
                               }

     

       50
        
                           },

     

       51
        
                           Err(RecvError::Closed) => self.shutdown.cancel(),

     

       52
        
                           Err(RecvError::Lagged(n)) => {

···

       42
        
               loop {

     

       43
        
                   tokio::select! {

     

       44
        
                       l = receiver.recv() => match l {

     

       45
       +
                           Ok(link) => if self.filter(&link.properties)

     

       46
       +
                               && let Err(e) = ws_sender.send(link.message.clone()).await

     

       47
       +
                           {

     

       48
       +
                               log::warn!("failed to send link, dropping subscriber: {e:?}");

     

       49
       +
                               break;

     

       50
        
                           },

     

       51
        
                           Err(RecvError::Closed) => self.shutdown.cancel(),

     

       52
        
                           Err(RecvError::Lagged(n)) => {

+4 -4

who-am-i/src/server.rs

···

       268
        
                   Some(parent_host),

     

       269
        
               );

     

       270
        
           }

     

       271
       -
           if let Some(ref app) = params.app {

     

       272
       -
               if !allowed_hosts.contains(app) {

     

       273
       -
                   return err("Login is not allowed for this app", false, Some(app));

     

       274
       -
               }

     

       275
        
           }

     

       276
        
           let parent_origin = url.origin().ascii_serialization();

     

       277
        
           if parent_origin == "null" {

···

       268
        
                   Some(parent_host),

     

       269
        
               );

     

       270
        
           }

     

       271
       +
           if let Some(ref app) = params.app

     

       272
       +
               && !allowed_hosts.contains(app)

     

       273
       +
           {

     

       274
       +
               return err("Login is not allowed for this app", false, Some(app));

     

       275
        
           }

     

       276
        
           let parent_origin = url.origin().ascii_serialization();

     

       277
        
           if parent_origin == "null" {