Filter plus pools for free accounts in bridge query and remove unused…

… broker settings UI code
geph-official · Aug 4, 2024 · 002ff74 · 002ff74
1 parent 31374ca
commit 002ff74
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 79 deletions.
diff --git a/binaries/geph5-broker/src/rpc_impl.rs b/binaries/geph5-broker/src/rpc_impl.rs
@@ -234,7 +234,7 @@ impl BrokerProtocol for BrokerImpl {
         exit: SocketAddr,
     ) -> Result<RouteDescriptor, GenericError> {
         // authenticate the token
-        let _account_level = if PLUS_MIZARU_SK
+        let account_level = if PLUS_MIZARU_SK
             .to_public_key()
             .blind_verify(token, &sig)
             .is_ok()
@@ -249,6 +249,17 @@ impl BrokerProtocol for BrokerImpl {
         // TODO filter out plus only
 
         let raw_descriptors = query_bridges(&format!("{:?}", token)).await?;
+
+        let plus_pools = ["ls_ap_northeast_1", "ls_ap_northeast_2"];
+        let raw_descriptors = if account_level == AccountLevel::Free {
+            raw_descriptors
+                .into_iter()
+                .filter(|s| !plus_pools.iter().any(|plus_group| &s.pool == plus_group))
+                .collect()
+        } else {
+            raw_descriptors
+        };
+
         let mut routes = vec![];
         for route in join_all(
             raw_descriptors

diff --git a/binaries/geph5-client-gui/src/tabs/settings.rs b/binaries/geph5-client-gui/src/tabs/settings.rs
@@ -263,81 +263,3 @@ pub fn render_language_settings(ui: &mut egui::Ui) -> anyhow::Result<()> {
     });
     Ok(())
 }
-
-// pub fn render_broker_settings(ui: &mut egui::Ui) -> anyhow::Result<()> {
-//     CUSTOM_BROKER.modify(|custom_broker| {
-//         let mut broker_type = match custom_broker {
-//             None => 1,
-//             Some(BrokerSource::Direct(_)) => 2,
-//             Some(BrokerSource::Fronted { front: _, host: _ }) => 3,
-//             Some(BrokerSource::DirectTcp(_)) => 4,
-//         };
-//         ui.vertical(|ui| {
-//             egui::ComboBox::from_id_source("custombroker")
-//                 .selected_text(match broker_type {
-//                     1 => l10n("broker_none"),
-//                     2 => l10n("broker_direct"),
-//                     3 => l10n("broker_fronted"),
-//                     4 => l10n("broker_direct_tcp"),
-//                     _ => unreachable!(),
-//                 })
-//                 .show_ui(ui, |ui| {
-//                     ui.selectable_value(&mut broker_type, 1, l10n("broker_none"));
-//                     ui.selectable_value(&mut broker_type, 2, l10n("broker_direct"));
-//                     ui.selectable_value(&mut broker_type, 3, l10n("broker_fronted"));
-//                     ui.selectable_value(&mut broker_type, 4, l10n("broker_direct_tcp"));
-//                 });
-//             match broker_type {
-//                 1 => {
-//                     *custom_broker = None;
-//                 }
-//                 2 => {
-//                     let mut addr = if let Some(BrokerSource::Direct(addr)) = custom_broker {
-//                         addr.to_owned()
-//                     } else {
-//                         "".into()
-//                     };
-//                     ui.text_edit_singleline(&mut addr);
-//                     *custom_broker = Some(BrokerSource::Direct(addr));
-//                 }
-//                 3 => {
-//                     let (mut front, mut host) =
-//                         if let Some(BrokerSource::Fronted { front, host }) = custom_broker {
-//                             (front.to_owned(), host.to_owned())
-//                         } else {
-//                             ("".into(), "".into())
-//                         };
-//                     ui.horizontal(|ui| {
-//                         ui.label(l10n("broker_fronted_front"));
-//                         ui.text_edit_singleline(&mut front);
-//                     });
-//                     ui.horizontal(|ui| {
-//                         ui.label(l10n("broker_fronted_host"));
-//                         ui.text_edit_singleline(&mut host);
-//                     });
-//                     *custom_broker = Some(BrokerSource::Fronted { front, host });
-//                 }
-//                 4 => {
-//                     let mut text = BROKER_DIRECT_TCP_TEXT.lock();
-//                     if text.is_none() {
-//                         if let Some(BrokerSource::DirectTcp(addr)) = custom_broker {
-//                             *text = Some(addr.to_owned().to_string());
-//                         } else {
-//                             *text = Some("".into());
-//                         }
-//                     }
-//                     ui.text_edit_singleline(text.as_mut().unwrap());
-//                     if let Ok(addr) = SocketAddr::from_str(text.clone().unwrap().as_str()) {
-//                         *custom_broker = Some(BrokerSource::DirectTcp(addr));
-//                     } else {
-//                         *custom_broker = Some(BrokerSource::DirectTcp(SocketAddr::V4(
-//                             SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), 0),
-//                         )));
-//                     }
-//                 }
-//                 _ => unreachable!(),
-//             }
-//         });
-//     });
-//     Ok(())
-// }