Skip to content

Commit

Permalink
Merge pull request justcallmekoko#395 from justcallmekoko/evil-portal
Browse files Browse the repository at this point in the history
Evil portal
  • Loading branch information
justcallmekoko authored Nov 18, 2023
2 parents a46ba89 + d6500ff commit 5d1f37e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
5 changes: 5 additions & 0 deletions esp32_marauder/CommandLine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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") {

}
Expand Down
13 changes: 13 additions & 0 deletions esp32_marauder/EvilPortal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions esp32_marauder/EvilPortal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

};

Expand Down

0 comments on commit 5d1f37e

Please sign in to comment.