From 67cb1bfb984678ddbe802d35d8dcaa8a7c3318cb Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 22 May 2024 10:41:17 -0700 Subject: [PATCH 1/4] CI: rename rust.yml to check-and-test.yml --- .github/workflows/{rust.yml => check-and-test.yml} | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename .github/workflows/{rust.yml => check-and-test.yml} (72%) diff --git a/.github/workflows/rust.yml b/.github/workflows/check-and-test.yml similarity index 72% rename from .github/workflows/rust.yml rename to .github/workflows/check-and-test.yml index 31000a2..052a588 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/check-and-test.yml @@ -1,4 +1,4 @@ -name: Rust +name: Check and Test on: push: @@ -10,13 +10,11 @@ env: CARGO_TERM_COLOR: always jobs: - build: - + check_and_test: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - - name: Build - run: cargo build --verbose + - name: Check + run: cargo check --verbose - name: Run tests run: cargo test --verbose From b5cd3d39117163eb5216e3659b6280aea4380892 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 22 May 2024 10:41:26 -0700 Subject: [PATCH 2/4] CI: add release workflow --- .github/workflows/build-release.yml | 79 +++++++++++++++++++ .../config.toml.example | 0 dist/install-common.sh | 61 ++++++++++++++ dist/install-linux.sh | 6 ++ dist/install-mac.sh | 6 ++ dist/install-windows.bat | 1 + {scripts => dist/scripts}/misc-daemon | 0 {scripts => dist/scripts}/rayhunter_daemon | 0 8 files changed, 153 insertions(+) create mode 100644 .github/workflows/build-release.yml rename config.toml.example => dist/config.toml.example (100%) create mode 100644 dist/install-common.sh create mode 100644 dist/install-linux.sh create mode 100644 dist/install-mac.sh create mode 100644 dist/install-windows.bat rename {scripts => dist/scripts}/misc-daemon (100%) rename {scripts => dist/scripts}/rayhunter_daemon (100%) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 0000000..ed62ffa --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,79 @@ +name: Build Release + +on: + push: + branches: [workflows] # FIXME: replace w/ main before merging + +env: + CARGO_TERM_COLOR: always + +jobs: + build_serial: + strategy: + matrix: + platform: + - os: ubuntu-latest + build_name: serial + - os: windows-latest + build_name: serial.exe + - os: macos-latest + build_name: serial + runs-on: ${{ matrix.platform.os }} + steps: + - uses: actions/checkout@v4 + - name: Build serial + run: cargo build --bin serial --release + - uses: actions/upload-artifact@v4 + with: + name: serial-${{ matrix.platform.os }} + path: ./target/release/${{ matrix.platform.build_name }} + if-no-files-found: error + build_rootshell_and_rayhunter: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + targets: armv7-unknown-linux-gnueabihf + - name: Install cross-compilation dependencies + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: build-essential libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf + version: 1.0 + - name: Build rootshell (arm32) + run: cargo build --bin rootshell --target armv7-unknown-linux-gnueabihf --release + - uses: actions/upload-artifact@v4 + with: + name: rootshell + path: target/armv7-unknown-linux-gnueabihf/release/rootshell + if-no-files-found: error + - name: Build rayhunter-daemon (arm32) + run: cargo build --bin rayhunter-daemon --target armv7-unknown-linux-gnueabihf --release + - uses: actions/upload-artifact@v4 + with: + name: rayhunter-daemon + path: target/armv7-unknown-linux-gnueabihf/release/rayhunter-daemon + if-no-files-found: error + build_release_zip: + needs: + - build_serial + - build_rootshell_and_rayhunter + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + - name: Setup release directory + run: mv rayhunter-daemon/rayhunter-daemon rootshell/rootshell serial-* dist + - name: Archive release directory + uses: thedoctor0/zip-release@0.7.5 + with: + type: 'zip' + filename: 'release.zip' + directory: 'dist' + # TODO: have this create a release directly + - name: Upload release + uses: actions/upload-artifact@v4 + with: + name: release.zip + path: dist/release.zip + if-no-files-found: error diff --git a/config.toml.example b/dist/config.toml.example similarity index 100% rename from config.toml.example rename to dist/config.toml.example diff --git a/dist/install-common.sh b/dist/install-common.sh new file mode 100644 index 0000000..a02b30d --- /dev/null +++ b/dist/install-common.sh @@ -0,0 +1,61 @@ +#!/bin/env bash + +install() { + if [[ -z "${SERIAL_PATH}" ]]; then + echo "SERIAL_PATH not set, did you run this from install-linux.sh or install-mac.sh?" + exit 1 + fi + check_adb + force_debug_mode + setup_rootshell + setup_rayhunter +} + +check_adb() { + if ! command -v adb &> /dev/null + then + echo "adb not found, please ensure it's installed or check the README.md" + exit 1 + fi +} + +force_debug_mode() { + # Force a switch into the debug mode to enable ADB + $(SERIAL_PATH) AT + echo -n "adb enabled, waiting for reboot" + until adb shell true 2> /dev/null + do + echo -n . + sleep 1 + done + echo + echo "it's alive!" +} + +setup_rootshell() { + _adb_push rootshell /tmp/ + $(SERIAL_PATH) "AT+SYSCMD=mv /tmp/rootshell /bin/rootshell" + sleep 1 + $(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 +} + +_adb_push() { + adb push "$(dirname "$0")/$1" "$2" +} + +setup_rayhunter() { + adb shell '/bin/rootshell -c "mkdir /data/rayhunter"' + _adb_push config.toml.example /data/rayhunter/config.toml + _adb_push rayhunter-daemon /data/rayhunter/ + _adb_push scripts/rayhunter_daemon /tmp/rayhunter_daemon + _adb_push scripts/misc-daemon /tmp/misc-daemon + adb shell '/bin/rootshell -c "mv /tmp/rayhunter_daemon /etc/init.d/rayhunter_daemon"' + adb shell '/bin/rootshell -c "mv /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"' + adb shell '/bin/rootshell -c "/etc/init.d/rayhunter_daemon start"' +} diff --git a/dist/install-linux.sh b/dist/install-linux.sh new file mode 100644 index 0000000..b188f9c --- /dev/null +++ b/dist/install-linux.sh @@ -0,0 +1,6 @@ +#!/bin/env bash + +set -e +export SERIAL_PATH="./serial-ubuntu-latest/serial" +. "$(dirname "$0")"/install-common.sh +install diff --git a/dist/install-mac.sh b/dist/install-mac.sh new file mode 100644 index 0000000..90c6064 --- /dev/null +++ b/dist/install-mac.sh @@ -0,0 +1,6 @@ +#!/bin/env bash + +set -e +export SERIAL_PATH="./serial-mac-latest/serial" +. "$(dirname "$0")"/install-common.sh +install diff --git a/dist/install-windows.bat b/dist/install-windows.bat new file mode 100644 index 0000000..05276bc --- /dev/null +++ b/dist/install-windows.bat @@ -0,0 +1 @@ +ECHO TODO diff --git a/scripts/misc-daemon b/dist/scripts/misc-daemon similarity index 100% rename from scripts/misc-daemon rename to dist/scripts/misc-daemon diff --git a/scripts/rayhunter_daemon b/dist/scripts/rayhunter_daemon similarity index 100% rename from scripts/rayhunter_daemon rename to dist/scripts/rayhunter_daemon From 166f94677215254b3e7d5d3e2b07269d8302e8b7 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 22 May 2024 13:35:42 -0700 Subject: [PATCH 3/4] Update README for new build process --- README.md | 42 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index e7fcd25..92a7a55 100644 --- a/README.md +++ b/README.md @@ -32,41 +32,17 @@ Rayhunter is an IMSI Catcher Catcher for the Orbic mobile hotspot. Based on code Code is built and tested for the Orbic RC400L mobile hotspot, it may work on other orbics and other linux/qualcom devices but this is the only one we have tested on. Buy the orbic [using bezos bucks](https://www.amazon.com/gp/product/B09CLS6Z7X/) - - - ## Setup -### If your are on x86 linux -on your linux laptop install rust the usual way and then install cross compiling dependences. -run `sudo apt install build-essential libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf` - -set up cross compliing for rust: -``` -rustup target add x86_64-unknown-linux-gnu -rustup target add armv7-unknown-linux-gnueabihf -``` - -Now you can root your device and install rayhunter by running `./install.sh` - **Note:** You will have to install the cross compile tooling below before running this. - - -### If you aren't on linux or can't run the install scripts -Root your device on windows using the instructions here: https://xdaforums.com/t/resetting-verizon-orbic-speed-rc400l-firmware-flash-kajeet.4334899/#post-87855183 - -Build for arm using `cargo build` - -Run tests using `cargo test_pc` - -Push the scripts in `scripts/` to /etc/init.d on device and make a directory called /data/rayhunter using `adb shell` (and sshell for your root shell if you followed the steps above) - -you also need to copy `config.toml.example` to /data/rayhunter/config.toml - -Then run `./make.sh` this will build the binary and push it over adb. Restart your device or run `/etc/init.d/rayhunter_daemon start` on the device and you are good to go. -## Development -Write your code and write tests +1. Install the Android Debug Bridge (ADB) on your computer (don't worry about instructions for installing it on a phone/device yet). You can find instructions for doing so on your platform [here](https://www.xda-developers.com/install-adb-windows-macos-linux/#how-to-set-up-adb-on-your-computer). +2. Download the latest rayhunter release bundle and unzip it. +3. Run the install script inside the bundle corresponding to your platform (`install-linux.sh`, `install-mac.sh`, or `install-windows.bat`). +4. Once finished, rayhunter should be running! You can verify this by visiting the web UI as described below. -Build for arm using `cargo build` +## Usage -Run tests using `cargo test_pc` +Once installed, rayhunter will run automatically whenever your Orbic device is running. It serves a web UI that provides some basic controls, such as being able to start/stop recordings, download captures, and view heuristic analyses of captures. You can access this UI in one of two ways: -push to the device with `./make.sh` \ No newline at end of file +1. Over wifi: Connect your phone/laptop to the Orbic's wifi network and visit `http://192.168.1.1:8080` (click past your browser warning you about the connection not being secure, rayhunter doesn't have HTTPS yet!) + * Note that you'll need the Orbic's wifi password for this, which can be retrieved by pressing the "MENU" button on the device and opening the 2.4 GHz menu. +2. Over usb: Connect the Orbic device to your laptop via usb. Run `adb forward tcp:8080 tcp:8080`, then visit `http://localhost:8080`. From 8a514e4e7009c4a6f6f5351860203b853e02e40d Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 22 May 2024 14:02:52 -0700 Subject: [PATCH 4/4] CI: change target branch to main --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ed62ffa..2bae78c 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -2,7 +2,7 @@ name: Build Release on: push: - branches: [workflows] # FIXME: replace w/ main before merging + branches: [main] env: CARGO_TERM_COLOR: always