Merge pull request #397 from justcallmekoko/develop

Develop
justcallmekoko · Nov 21, 2023 · e1a6fe8 · e1a6fe8
2 parents 7a79860 + 6ec9952
commit e1a6fe8
Show file tree

Hide file tree

Showing 12 changed files with 92,516 additions and 92,596 deletions.
diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
@@ -497,6 +497,7 @@ void CommandLine::runCommand(String input) {
           if (html_sw != -1) {
             String target_html_name = cmd_args.get(html_sw + 1);
             evil_portal_obj.target_html_name = target_html_name;
+            evil_portal_obj.using_serial_html = false;
             Serial.println("Set html file as " + evil_portal_obj.target_html_name);
           }
           //else {
@@ -513,8 +514,12 @@ void CommandLine::runCommand(String input) {
         else if (et_command == "sethtml") {
           String target_html_name = cmd_args.get(cmd_sw + 2);
           evil_portal_obj.target_html_name = target_html_name;
+          evil_portal_obj.using_serial_html = false;
           Serial.println("Set html file as " + evil_portal_obj.target_html_name);
         }
+        else if (et_command == "sethtmlstr") {
+          evil_portal_obj.setHtmlFromSerial();
+        }
         else if (et_command == "setap") {
 
         }

diff --git a/esp32_marauder/EvilPortal.cpp b/esp32_marauder/EvilPortal.cpp
@@ -62,7 +62,20 @@ void EvilPortal::setupServer() {
   Serial.println("web server up");
 }
 
+void EvilPortal::setHtmlFromSerial() {
+  Serial.println("Setting HTML from serial...");
+  const char *htmlStr = Serial.readString().c_str();
+  strncpy(index_html, htmlStr, strlen(htmlStr));
+  this->has_html = true;
+  this->using_serial_html = true;
+  Serial.println("html set");
+}
+
 bool EvilPortal::setHtml() {
+  if (this->using_serial_html) {
+    Serial.println("html previously set");
+    return true;
+  }
   Serial.println("Setting HTML...");
   #ifndef WRITE_PACKETS_SERIAL
     File html_file = sd_obj.getFile("/" + this->target_html_name);

diff --git a/esp32_marauder/EvilPortal.h b/esp32_marauder/EvilPortal.h
@@ -101,11 +101,14 @@ class EvilPortal {
 
     String target_html_name = "index.html";
 
+    bool using_serial_html;
+
     String get_user_name();
     String get_password();
     void addLog(String log, int len);
     bool begin(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_points);
     void main(uint8_t scan_mode);
+    void setHtmlFromSerial();
 
 };
 

diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
@@ -189,7 +189,8 @@ class WiFiScan
     #endif
 
     //String connected_network = "";
-    const String alfa = "1234567890qwertyuiopasdfghjkklzxcvbnm QWERTYUIOPASDFGHJKLZXCVBNM_";
+    //const String alfa = "1234567890qwertyuiopasdfghjkklzxcvbnm QWERTYUIOPASDFGHJKLZXCVBNM_";
+    const String alfa = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789-=[];',./`\\_+{}:\"<>?~|!@#$%^&*()";
 
     const char* rick_roll[8] = {
       "01 Never gonna give you up",

diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
@@ -22,7 +22,7 @@
   //#define XIAO_ESP32_S3
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v0.13.4"
+  #define MARAUDER_VERSION "v0.13.5"
 
  //// BOARD FEATURES
   #ifdef MARAUDER_M5STICKC

diff --git a/mechanical/Marauder-Mini/Marauder-Mini-Assembly.f3z b/mechanical/Marauder-Mini/Marauder-Mini-Assembly.f3z
diff --git a/mechanical/Marauder-Mini/Marauder-Mini-Assembly.step b/mechanical/Marauder-Mini/Marauder-Mini-Assembly.step
diff --git a/mechanical/Marauder-Mini/Marauder-Mini_Bottom.stl b/mechanical/Marauder-Mini/Marauder-Mini_Bottom.stl
diff --git a/mechanical/Marauder-Mini/Marauder-Mini_Top.stl b/mechanical/Marauder-Mini/Marauder-Mini_Top.stl
diff --git a/mechanical/Marauder-Mini/Marauder-Mini_Top_cutout.stl b/mechanical/Marauder-Mini/Marauder-Mini_Top_cutout.stl
diff --git a/mechanical/Marauder-Mini/MarauderMini-Bottom v8.stl b/mechanical/Marauder-Mini/MarauderMini-Bottom v8.stl
diff --git a/mechanical/Marauder-Mini/MarauderMini-Top v4.stl b/mechanical/Marauder-Mini/MarauderMini-Top v4.stl