upd wifimarauder companion

xMasterX · Dec 6, 2024 · 998c107 · 998c107
1 parent 8f853c4
commit 998c107
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 11 deletions.
diff --git a/base_pack/wifi_marauder_companion/application.fam b/base_pack/wifi_marauder_companion/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="esp32_wifi_marauder",
     name="[ESP32] WiFi Marauder",
-    fap_version=(7, 1),
+    fap_version=(7, 2),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],

diff --git a/base_pack/wifi_marauder_companion/docs/changelog.md b/base_pack/wifi_marauder_companion/docs/changelog.md
@@ -1,3 +1,24 @@
+## v0.7.2
+
+Thanks to @justcallmekoko for adding app support for the new features in Marauder firmware v1.1.0! See the additions and grab the firmware for your wifi board here: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v1.1.0
+
+<3 @0xchocolate (cococode)
+
+
+## v0.7.1
+
+Bug fixes and improvements!
+
+- Back to working on latest official firmware ( @GeorgeBotsev )
+- Now the Evil Portal and wardrive dumps will be saved to a new directory apps_data/marauder/dumps, and the "-serial" argument for all commands will respect your "save pcaps" app setting ( @Willy-JL )
+- You'll also notice an apps_data/marauder/html directory, to support migrating from the standalone Evil Portal ( @RogueMaster )
+- Fixes an issue with loading scripts due to upstream toolchain changes ( @Willy-JL , @vollukas )
+
+As always, make sure you're running the latest version of Marauder FW on your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+
+<3 @0xchocolate (cococode)
+
+
 ## v0.7.0
 
 Unified serial update! No more complicated wiring of 2x UART connections - all your boards are supported now, with PCAPs and text both going over just ONE, SINGLE serial channel! Thanks to @Willy-JL for adding this amazing feature and fixing up the app for the new APIs.

diff --git a/base_pack/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c b/base_pack/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c
@@ -12,7 +12,7 @@ typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE
 #define SHOW_STOPSCAN_TIP (true)
 #define NO_TIP (false)
 
-#define MAX_OPTIONS (9)
+#define MAX_OPTIONS (10)
 typedef struct {
     const char* item_string;
     const char* options_menu[MAX_OPTIONS];
@@ -41,9 +41,9 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_START,
      NO_TIP},
     {"List",
-     {"ap", "ssid", "station"},
-     3,
-     {"list -a", "list -s", "list -c"},
+     {"ap", "ssid", "station", "airtag"},
+     4,
+     {"list -a", "list -s", "list -c", "list -t"},
      NO_ARGS,
      FOCUS_CONSOLE_START,
      NO_TIP},
@@ -69,19 +69,28 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
       "swiftpair spam",
       "samsung spam",
       "google spam",
+      "flipper spam",
       "bt spam all"},
-     8,
+     9,
      {"attack -t deauth",
       "attack -t probe",
       "attack -t rickroll",
       "blespam -t apple",
       "blespam -t windows",
       "blespam -t samsung",
       "blespam -t google",
+      "blespam -t flipper",
       "blespam -t all"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
+    {"Spoof Airtag",
+     {""},
+     1,
+     {"spoofat -t"},
+     INPUT_ARGS,
+     FOCUS_CONSOLE_END,
+     NO_TIP},
     {"Wardrive",
      {"ap", "station", "bt", "bt cont"},
      4,
@@ -118,16 +127,18 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
     {"Sniff",
-     {"beacon", "deauth", "pmkid", "probe", "pwn", "raw", "bt", "skim"},
-     8,
+     {"beacon", "deauth", "pmkid", "probe", "pwn", "raw", "bt", "skim", "airtag", "flipper"},
+     10,
      {"sniffbeacon",
       "sniffdeauth",
       "sniffpmkid",
       "sniffprobe",
       "sniffpwn",
       "sniffraw",
       "sniffbt",
-      "sniffskim"},
+      "sniffskim",
+      "sniffbt -t airtag",
+      "sniffbt -t flipper"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},

diff --git a/base_pack/wifi_marauder_companion/wifi_marauder_app.h b/base_pack/wifi_marauder_companion/wifi_marauder_app.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.7.1"
+#define WIFI_MARAUDER_APP_VERSION "v0.7.2"
 
 typedef struct WifiMarauderApp WifiMarauderApp;
 

diff --git a/base_pack/wifi_marauder_companion/wifi_marauder_app_i.h b/base_pack/wifi_marauder_companion/wifi_marauder_app_i.h
@@ -27,7 +27,7 @@
 #include <lib/toolbox/path.h>
 #include <dialogs/dialogs.h>
 
-#define NUM_MENU_ITEMS (24)
+#define NUM_MENU_ITEMS (25)
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)