mitm: add remove tap restriction feature

Author: manio

README.md

@@ -12,6 +12,7 @@ Currently it is intended to run as a more-or-less drop-in replacement of the `aa
 - stall transfer detection
 - MITM (man-in-the-middle) mode support with the following features:
   - DPI change
+  - Remove tap restriction
   - Disable media sink
   - Disable TTS sink
   - Developer mode
@@ -189,6 +190,9 @@ OPTIONS:
     -m, --mitm
             Enable MITM mode (experimental)
 
+        --remove-tap-restriction
+            MITM: remove tap restriction
+
     -s, --stats-interval <SECONDS>
             Interval of showing data transfer statistics (0 = disabled) [default: 0]
 

src/io_uring.rs

@@ -269,6 +269,7 @@ pub async fn io_loop(
     developer_mode: bool,
     disable_media_sink: bool,
     disable_tts_sink: bool,
+    remove_tap_restriction: bool,
 ) -> Result<()> {
     info!("{} 🛰️ Starting TCP server...", NAME);
     let bind_addr = format!("0.0.0.0:{}", TCP_SERVER_PORT).parse().unwrap();
@@ -353,6 +354,7 @@ pub async fn io_loop(
                 developer_mode,
                 disable_media_sink,
                 disable_tts_sink,
+                remove_tap_restriction,
             ));
             from_stream = tokio_uring::spawn(proxy(
                 ProxyType::MobileDevice,
@@ -365,6 +367,7 @@ pub async fn io_loop(
                 developer_mode,
                 disable_media_sink,
                 disable_tts_sink,
+                remove_tap_restriction,
             ));
         } else {
             // We need to copy in both directions...

src/main.rs

@@ -98,6 +98,10 @@ struct Args {
     #[clap(long, requires("mitm"))]
     dpi: Option<u16>,
 
+    /// MITM: remove tap restriction
+    #[clap(long, requires("mitm"))]
+    remove_tap_restriction: bool,
+
     /// MITM: Disable media sink
     #[clap(long, requires("mitm"))]
     disable_media_sink: bool,
@@ -309,6 +313,7 @@ fn main() {
     let developer_mode = args.developer_mode;
     let disable_media_sink = args.disable_media_sink;
     let disable_tts_sink = args.disable_tts_sink;
+    let remove_tap_restriction = args.remove_tap_restriction;
 
     // build and spawn main tokio runtime
     let runtime = Builder::new_multi_thread().enable_all().build().unwrap();
@@ -326,6 +331,7 @@ fn main() {
         developer_mode,
         disable_media_sink,
         disable_tts_sink,
+        remove_tap_restriction,
     ));
 
     info!(

src/mitm.rs

@@ -17,6 +17,7 @@ use tokio_uring::buf::BoundedBuf;
 include!(concat!(env!("OUT_DIR"), "/protos/mod.rs"));
 use crate::mitm::protos::*;
 use crate::mitm::AudioStreamType::*;
+use crate::mitm::SensorType::*;
 use protobuf::text_format::print_to_string_pretty;
 use protobuf::{Enum, Message, MessageDyn};
 use protos::ControlMessageType::{self, *};
@@ -244,6 +245,7 @@ pub async fn pkt_modify_hook(
     developer_mode: bool,
     disable_media_sink: bool,
     disable_tts_sink: bool,
+    remove_tap_restriction: bool,
 ) -> Result<()> {
     if pkt.channel != 0 {
         return Ok(());
@@ -311,6 +313,21 @@ pub async fn pkt_modify_hook(
                 );
             }
 
+            // remove tap restriction by removing SENSOR_SPEED
+            if remove_tap_restriction {
+                if let Some(svc) = msg
+                    .services
+                    .iter_mut()
+                    .find(|svc| !svc.sensor_source_service.sensors.is_empty())
+                {
+                    svc.sensor_source_service
+                        .as_mut()
+                        .unwrap()
+                        .sensors
+                        .retain(|s| s.sensor_type() != SENSOR_SPEED);
+                }
+            }
+
             // enabling developer mode
             if developer_mode {
                 msg.set_make("Google".into());
@@ -465,6 +482,7 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
     developer_mode: bool,
     disable_media_sink: bool,
     disable_tts_sink: bool,
+    remove_tap_restriction: bool,
 ) -> Result<()> {
     let ssl = ssl_builder(proxy_type).await?;
 
@@ -545,6 +563,7 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
                 developer_mode,
                 disable_media_sink,
                 disable_tts_sink,
+                remove_tap_restriction,
             )
             .await?;
             pkt.encrypt_payload(&mut mem_buf, &mut server).await?;