From b43a79e036968d3f9d757a063059575d245b8eb4 Mon Sep 17 00:00:00 2001 From: Bartek Pokrywka Date: Mon, 7 Jul 2025 16:49:24 +0200 Subject: [PATCH 1/3] Added captive endopints redirection to index_html --- esp32_marauder/EvilPortal.cpp | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/esp32_marauder/EvilPortal.cpp b/esp32_marauder/EvilPortal.cpp index 991c608..0c33405 100644 --- a/esp32_marauder/EvilPortal.cpp +++ b/esp32_marauder/EvilPortal.cpp @@ -1,3 +1,4 @@ +#include "HardwareSerial.h" #include "EvilPortal.h" #ifdef HAS_PSRAM @@ -72,6 +73,30 @@ void EvilPortal::setupServer() { }); #endif + const char* captiveEndpoints[] = { + "/hotspot-detect.html", + "/library/test/success.html", + "/success.txt", + "/generate_204", + "/gen_204", + "/ncsi.txt", + "/connecttest.txt", + "/redirect" + }; + + for (int i = 0; i < sizeof(captiveEndpoints) / sizeof(captiveEndpoints[0]); i++) { + + #ifndef HAS_PSRAM + server.on(captiveEndpoints[i], HTTP_GET, [this](AsyncWebServerRequest *request){ + request->send_P(200, "text/html", index_html); + }); + #else + server.on(captiveEndpoints[i], HTTP_GET, [this](AsyncWebServerRequest *request){ + request->send(200, "text/html", index_html); + }); + #endif + } + server.on("/get-ap-name", HTTP_GET, [this](AsyncWebServerRequest *request) { request->send(200, "text/plain", WiFi.softAPSSID()); }); @@ -93,9 +118,10 @@ void EvilPortal::setupServer() { this->password = inputMessage; this->password_received = true; } + request->send( - 200, "text/html", - ""); + 200, "text/html", + ""); }); Serial.println("web server up"); } From a10bb164ac185b547becd2498da9db6a4f23e3e0 Mon Sep 17 00:00:00 2001 From: Bartek Pokrywka Date: Mon, 7 Jul 2025 16:52:27 +0200 Subject: [PATCH 2/3] Added captive endopints redirection to index_html --- esp32_marauder/EvilPortal.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/esp32_marauder/EvilPortal.cpp b/esp32_marauder/EvilPortal.cpp index 0c33405..3749e8e 100644 --- a/esp32_marauder/EvilPortal.cpp +++ b/esp32_marauder/EvilPortal.cpp @@ -1,4 +1,3 @@ -#include "HardwareSerial.h" #include "EvilPortal.h" #ifdef HAS_PSRAM @@ -118,10 +117,9 @@ void EvilPortal::setupServer() { this->password = inputMessage; this->password_received = true; } - request->send( - 200, "text/html", - ""); + 200, "text/html", + ""); }); Serial.println("web server up"); } From 17338427a1e3cf17daccec5f8c4c873d6f71e889 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Mon, 7 Jul 2025 17:10:55 -0400 Subject: [PATCH 3/3] Fix BLE spam crash --- esp32_marauder/WiFiScan.cpp | 3 --- esp32_marauder/WiFiScan.h | 2 +- esp32_marauder/configs.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 8c6c94a..b2f6106 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -3438,8 +3438,6 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) { display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); #endif - this->ble_initialized = true; - #ifdef HAS_FLIPPER_LED flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -3484,7 +3482,6 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) { display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); #endif - this->ble_initialized = true; #ifdef HAS_FLIPPER_LED flipper_led.attackLED(); diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index c468d06..f45e85c 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -11,7 +11,7 @@ #include #ifdef HAS_BT - #include + #include // 1.3.8 #endif #include diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 4b2d0e0..fdd80e0 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -28,7 +28,7 @@ //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION //// END BOARD TARGETS - #define MARAUDER_VERSION "v1.7.1" + #define MARAUDER_VERSION "v1.7.2" #define GRAPH_REFRESH 100