Merge pull request #24 from eried/next

Update
RogueMaster · Nov 19, 2023 · 12d73a3 · 12d73a3
2 parents 232d88c + fd006dd
commit 12d73a3
Show file tree

Hide file tree

Showing 13 changed files with 210 additions and 42 deletions.
diff --git a/docs/webinstaller/build/esp32cam_marauder.ino.bin b/docs/webinstaller/build/esp32cam_marauder.ino.bin
diff --git a/docs/webinstaller/build/esp32cam_marauder.ino.bootloader.bin b/docs/webinstaller/build/esp32cam_marauder.ino.bootloader.bin
diff --git a/docs/webinstaller/build/esp32cam_marauder.ino.elf b/docs/webinstaller/build/esp32cam_marauder.ino.elf
diff --git a/docs/webinstaller/index.html b/docs/webinstaller/index.html
@@ -61,6 +61,9 @@ <h1>Mayhem for Flipper Zero -installer</h1>
 
 <div class="changelog-box">
 Changelog<br><br>
+v0.13.4 2023-11-19<br>
+* Updated Marauder to latest version<br>
+<br>
 v0.13.3 2023-11-08<br>
 * Updated Marauder to latest version<br>
 * Updated Marauder companion to v0.6.4<br>

diff --git a/esp32cam_marauder/CommandLine.h b/esp32cam_marauder/CommandLine.h
@@ -82,6 +82,7 @@ const char PROGMEM SSID_CMD[] = "ssid";
 const char PROGMEM BT_SNIFF_CMD[] = "sniffbt";
 const char PROGMEM BT_SOUR_APPLE_CMD[] = "sourapple";
 const char PROGMEM BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
+const char PROGMEM BT_SPAM_ALL_CMD[] = "btspamall";
 const char PROGMEM BT_WARDRIVE_CMD[] = "btwardrive";
 const char PROGMEM BT_SKIM_CMD[] = "sniffskim";
 
@@ -129,6 +130,7 @@ const char PROGMEM HELP_SSID_CMD_B[] = "ssid -r <index>";
 const char PROGMEM HELP_BT_SNIFF_CMD[] = "sniffbt";
 const char PROGMEM HELP_BT_SOUR_APPLE_CMD[] = "sourapple";
 const char PROGMEM HELP_BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
+const char PROGMEM HELP_BT_SPAM_ALL_CMD[] = "btspamall";
 const char PROGMEM HELP_BT_WARDRIVE_CMD[] = "btwardrive [-c]";
 const char PROGMEM HELP_BT_SKIM_CMD[] = "sniffskim";
 const char PROGMEM HELP_FOOT[] = "==================================";

diff --git a/esp32cam_marauder/CommandLine.ino b/esp32cam_marauder/CommandLine.ino
@@ -404,6 +404,7 @@ void CommandLine::runCommand(String input) {
       Serial.println(HELP_BT_SNIFF_CMD);
       Serial.println(HELP_BT_SOUR_APPLE_CMD);
       Serial.println(HELP_BT_SWIFTPAIR_SPAM_CMD);
+      Serial.println(HELP_BT_SPAM_ALL_CMD);
       #ifdef HAS_GPS
         Serial.println(HELP_BT_WARDRIVE_CMD);
       #endif
@@ -988,6 +989,18 @@ void CommandLine::runCommand(String input) {
         Serial.println("Bluetooth not supported");
       #endif
     }
+    else if (cmd_args.get(0) == BT_SPAM_ALL_CMD) {
+      #ifdef HAS_BT
+        Serial.println("Starting BT Spam All attack. Stop with " + (String)STOPSCAN_CMD);
+        #ifdef HAS_SCREEN
+          display_obj.clearScreen();
+          menu_function_obj.drawStatusBar();
+        #endif
+        wifi_scan_obj.StartScan(BT_ATTACK_SPAM_ALL, TFT_MAGENTA);
+      #else
+        Serial.println("Bluetooth not supported");
+      #endif
+    }
     // Wardrive
     else if (cmd_args.get(0) == BT_WARDRIVE_CMD) {
       #ifdef HAS_BT

diff --git a/esp32cam_marauder/MenuFunctions.cpp b/esp32cam_marauder/MenuFunctions.cpp
@@ -507,6 +507,7 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SOUR_APPLE) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
+          (wifi_scan_obj.currentScanMode == BT_ATTACK_SPAM_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE_CONT) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS))
@@ -565,6 +566,7 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SOUR_APPLE) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
+          (wifi_scan_obj.currentScanMode == BT_ATTACK_SPAM_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE_CONT) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS) ||
@@ -686,6 +688,8 @@ void MenuFunctions::main(uint32_t currentTime)
                   (wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL)) {
             if (wifi_scan_obj.set_channel < 14)
               wifi_scan_obj.changeChannel(wifi_scan_obj.set_channel + 1);
+            else
+              wifi_scan_obj.changeChannel(1);
           }
         }
       #endif
@@ -719,6 +723,8 @@ void MenuFunctions::main(uint32_t currentTime)
                 (wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL)) {
           if (wifi_scan_obj.set_channel > 1)
             wifi_scan_obj.changeChannel(wifi_scan_obj.set_channel - 1);
+          else
+            wifi_scan_obj.changeChannel(14);
         }
       }
       if(c_btn_press){
@@ -1469,6 +1475,11 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(BT_ATTACK_SWIFTPAIR_SPAM, TFT_CYAN);
   });
+  this->addNodes(&bluetoothAttackMenu, "BLE Spam All", TFT_MAGENTA, NULL, DEAUTH_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(BT_ATTACK_SPAM_ALL, TFT_MAGENTA);
+  });
 
   // Device menu
   deviceMenu.parentMenu = &mainMenu;