Merge pull request #54 from EFForg/mac-bugfix

bugfix for mac install process

Cargo.lock

@@ -638,6 +638,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "exr"
 version = "1.72.0"
@@ -654,6 +664,12 @@ dependencies = [
  "zune-inflate",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.4"
@@ -697,12 +713,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1160,6 +1170,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -1545,19 +1561,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1566,7 +1569,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -1576,24 +1579,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -1629,7 +1617,7 @@ dependencies = [
  "once_cell",
  "paste",
  "profiling",
- "rand 0.8.5",
+ "rand",
  "rand_chacha",
  "simd_helpers",
  "system-deps",
@@ -1691,7 +1679,7 @@ dependencies = [
  "rayhunter",
  "serde",
  "serde_json",
- "tempdir",
+ "tempfile",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -1719,15 +1707,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -1766,15 +1745,6 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "rgb"
 version = "0.8.37"
@@ -1807,6 +1777,19 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -2031,13 +2014,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "tempdir"
-version = "0.3.7"
+name = "tempfile"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
- "rand 0.4.6",
- "remove_dir_all",
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]

bin/Cargo.toml

@@ -25,10 +25,10 @@ tokio-util = { version = "0.7.10", features = ["rt"] }
 futures-macro = "0.3.30"
 include_dir = "0.7.3"
 mime_guess = "2.0.4"
-tempdir = "0.3.7"
 chrono = { version = "0.4.31", features = ["serde"] }
 tokio-stream = "0.1.14"
 futures = "0.3.30"
 clap = { version = "4.5.2", features = ["derive"] }
 serde_json = "1.0.114"
 image = "0.25.1"
+tempfile = "3.10.1"

bin/src/qmdl_store.rs

@@ -203,12 +203,16 @@ impl RecordingStore {
 
 #[cfg(test)]
 mod tests {
-    use tempdir::TempDir;
+    use tempfile::{TempDir, Builder};
     use super::*;
 
+    fn make_temp_dir() -> TempDir {
+        Builder::new().prefix("qmdl_store_test").tempdir().unwrap()
+    }
+
     #[tokio::test]
     async fn test_load_from_empty_dir() {
-        let dir = TempDir::new("qmdl_store_test").unwrap();
+        let dir = make_temp_dir();
         assert!(!RecordingStore::exists(dir.path()).await.unwrap());
         let _created_store = RecordingStore::create(dir.path()).await.unwrap();
         assert!(RecordingStore::exists(dir.path()).await.unwrap());
@@ -218,7 +222,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_creating_updating_and_closing_entries() {
-        let dir = TempDir::new("qmdl_store_test").unwrap();
+        let dir = make_temp_dir();
         let mut store = RecordingStore::create(dir.path()).await.unwrap();
         let _ = store.new_entry().await.unwrap();
         let entry_index = store.current_entry.unwrap();
@@ -237,7 +241,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_repeated_new_entries() {
-        let dir = TempDir::new("qmdl_store_test").unwrap();
+        let dir = make_temp_dir();
         let mut store = RecordingStore::create(dir.path()).await.unwrap();
         let _ = store.new_entry().await.unwrap();
         let entry_index = store.current_entry.unwrap();

dist/install-common.sh

@@ -20,20 +20,28 @@ check_adb() {
 }
 
 force_debug_mode() {
-    echo " Force a switch into the debug mode to enable ADB"
+    echo "Force a switch into the debug mode to enable ADB"
     "$SERIAL_PATH" --root
-    echo -n "adb enabled, waiting for reboot"
+    echo -n "adb enabled, waiting for reboot..."
     wait_for_adb_shell
-    echo "it's alive!"
+    echo " it's alive!"
+    echo -n "waiting for atfwd_daemon to startup..."
+    wait_for_atfwd_daemon
+    echo " done!"
+}
+
+wait_for_atfwd_daemon() {
+    until [ -n "$(adb shell 'pgrep atfwd_daemon')" ]
+    do
+        sleep 1
+    done
 }
 
 wait_for_adb_shell() {
     until adb shell true 2> /dev/null
     do
-        echo -n .
         sleep 1
     done
-    echo
 }
 
 setup_rootshell() {
@@ -43,8 +51,8 @@ setup_rootshell() {
     "$SERIAL_PATH" "AT+SYSCMD=chown root /bin/rootshell"
     sleep 1
     "$SERIAL_PATH" "AT+SYSCMD=chmod 4755 /bin/rootshell"
-    echo "we have root!"
     adb shell /bin/rootshell -c id
+    echo "we have root!"
 }
 
 _adb_push() {
@@ -61,36 +69,34 @@ setup_rayhunter() {
     adb shell '/bin/rootshell -c "cp /tmp/misc-daemon /etc/init.d/misc-daemon"'
     adb shell '/bin/rootshell -c "chmod 755 /etc/init.d/rayhunter_daemon"'
     adb shell '/bin/rootshell -c "chmod 755 /etc/init.d/misc-daemon"'
-    echo -n "rebooting, this may take a sec..."
+    echo -n "waiting for reboot..."
     adb shell '/bin/rootshell -c reboot'
 
     # first wait for shutdown (it can take ~10s)
     until ! adb shell true 2> /dev/null
     do
-        echo -n '.'
         sleep 1
     done
 
     # now wait for boot to finish
     wait_for_adb_shell
 
-    echo "rebooted successfully!"
+    echo " done!"
 }
 
 test_rayhunter() {
     URL="http://localhost:8080"
-    adb forward tcp:8080 tcp:8080
+    adb forward tcp:8080 tcp:8080 > /dev/null
     echo -n "checking for rayhunter server..."
 
     SECONDS=0
     while (( SECONDS < 30 )); do
         if curl -L --fail-with-body "$URL" -o /dev/null -s; then
-            echo
-            echo "success! you can access rayhunter at $URL"
+            echo "success!"
+            echo "you can access rayhunter at $URL"
             return
         fi
         sleep 1
-        echo -n "."
     done
     echo "timeout reached! failed to reach rayhunter url $URL, something went wrong :("
 }

dist/install-mac.sh

@@ -1,6 +1,6 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 set -e
-export SERIAL_PATH="./serial-mac-latest/serial"
+export SERIAL_PATH="./serial-macos-latest/serial"
 . "$(dirname "$0")"/install-common.sh
 install

lib/src/analysis/null_cipher.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use telcom_parser::lte_rrc::{CipheringAlgorithm_r12, DL_CCCH_MessageType, DL_CCCH_MessageType_c1, DL_DCCH_MessageType, DL_DCCH_MessageType_c1, PCCH_MessageType, PCCH_MessageType_c1, PagingUE_Identity, RRCConnectionReconfiguration, RRCConnectionReconfigurationCriticalExtensions, RRCConnectionReconfigurationCriticalExtensions_c1, RRCConnectionReconfiguration_r8_IEs, RRCConnectionRelease_v890_IEs, SCG_Configuration_r12, SecurityConfigHO_v1530HandoverType_v1530, SecurityModeCommand, SecurityModeCommandCriticalExtensions, SecurityModeCommandCriticalExtensions_c1};
+use telcom_parser::lte_rrc::{CipheringAlgorithm_r12, DL_DCCH_MessageType, DL_DCCH_MessageType_c1, RRCConnectionReconfiguration, RRCConnectionReconfigurationCriticalExtensions, RRCConnectionReconfigurationCriticalExtensions_c1, SCG_Configuration_r12, SecurityConfigHO_v1530HandoverType_v1530, SecurityModeCommand, SecurityModeCommandCriticalExtensions, SecurityModeCommandCriticalExtensions_c1};
 
 use super::analyzer::{Analyzer, Event, EventType, Severity};
 use super::information_element::{InformationElement, LteInformationElement};

serial/src/main.rs

@@ -20,7 +20,6 @@
 //!	Err(e) => panic!("Failed to initialize libusb: {0}", e),
 //! ````
 use std::str;
-use std::thread::sleep;
 use std::time::Duration;
 
 use rusb::{Context, DeviceHandle, UsbContext};
@@ -28,19 +27,21 @@ use rusb::{Context, DeviceHandle, UsbContext};
 fn main() {
     let args: Vec<String> = std::env::args().collect();
 
-    if args.len() < 2 {
-        println!("usage: {0} <command>", args[0]);
+    if args.len() != 2 {
+        println!("usage: {0} [<command> | --root]", args[0]);
         return;
     }
 
     match Context::new() {
-        Ok(mut context) => match open_orbic(&mut context) {
-            Some(mut handle) => {
-                if &args[1] != "--root" {
-                    send_command(&mut handle, &args[1])
+        Ok(mut context) => {
+            if args[1] == "--root" {
+                enable_command_mode(&mut context);
+            } else {
+                match open_orbic(&mut context) {
+                    Some(mut handle) => send_command(&mut handle, &args[1]),
+                    None => panic!("No Orbic device found"),
                 }
             }
-            None => panic!("No Orbic device found"),
         },
         Err(e) => panic!("Failed to initialize libusb: {0}", e),
     }
@@ -78,30 +79,38 @@ fn send_command<T: UsbContext>(handle: &mut DeviceHandle<T>, command: &str) {
         .expect("Failed to read response");
 
     let responsestr = str::from_utf8(&response).expect("Failed to parse response");
-    if !responsestr.starts_with("\r\nOK\r\n") {
-        println!("Received unexpected response{0}", responsestr)
+    if !responsestr.contains("\r\nOK\r\n") {
+        println!("Received unexpected response{0}", responsestr);
+        std::process::exit(1);
     }
 }
 
 /// Send a command to switch the device into generic mode, exposing serial
 ///
 /// If the device reboots while the command is still executing you may get a pipe error here, not sure what to do about this race condition.
-fn switch_device<T: UsbContext>(handle: &mut DeviceHandle<T>) {
-    let timeout = Duration::from_secs(1);
-
-    if let Err(e) = handle.write_control(0x40, 0xa0, 0, 0, &[], timeout) {
-        // If the device reboots while the command is still executing we
-        // may get a pipe error here
-        if e == rusb::Error::Pipe {
-            return;
-        }
-        panic!("Failed to send device switch control request: {0}", e)
+fn enable_command_mode<T: UsbContext>(context: &mut T) {
+    if open_orbic(context).is_some() {
+        println!("Device already in command mode. Doing nothing...");
+        return;
     }
+
+    let timeout = Duration::from_secs(1);
+    if let Some(handle) = open_device(context, 0x05c6, 0xf626) {
+        if let Err(e) = handle.write_control(0x40, 0xa0, 0, 0, &[], timeout) {
+            // If the device reboots while the command is still executing we
+            // may get a pipe error here
+            if e == rusb::Error::Pipe {
+                return;
+            }
+            panic!("Failed to send device switch control request: {0}", e)
+        }
+        return;
+    }
+
+    panic!("No Orbic device found");
 }
 
 /// Get a handle and contet for the orbic device
-///
-/// If the device isn't already in command mode this function will call swtich_device to switch it into command mode
 fn open_orbic<T: UsbContext>(context: &mut T) -> Option<DeviceHandle<T>> {
     // Device after initial mode switch
     if let Some(handle) = open_device(context, 0x05c6, 0xf601) {
@@ -113,19 +122,7 @@ fn open_orbic<T: UsbContext>(context: &mut T) -> Option<DeviceHandle<T>> {
         return Some(handle);
     }
 
-    // Device in out-of-the-box state, need to switch to diag mode
-    match open_device(context, 0x05c6, 0xf626) {
-        Some(mut handle) => switch_device(&mut handle),
-        None => panic!("No Orbic device detected"),
-    }
-
-    for _ in 1..10 {
-        if let Some(handle) = open_device(context, 0x05c6, 0xf601) {
-            return Some(handle);
-        }
-        sleep(Duration::from_secs(10))
-    }
-    panic!("No Orbic device detected")
+    None
 }
 
 /// Generic function to open a USB device