A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol
C arduinobluetoothcan-busdebuggingeepromesp32flipperzerogpiohardware-hackingi2cjtagopenocdprotocolspwmradiorfidspisubghzuartwifi
more intuitive way to use wifi connect cmd while keeping the old way
Geoda64afe8d421
diff --git a/src/Controllers/UtilityController.cpp b/src/Controllers/UtilityController.cppindex d43e1ffa..117399b2 100644--- a/src/Controllers/UtilityController.cpp+++ b/src/Controllers/UtilityController.cpp@@ -418,16 +418,16 @@ void UtilityController::handleHelp() {terminalView.println("");terminalView.println(" 14. WIFI:");terminalView.println(" scan - List Wi-Fi networks");+ terminalView.println(" connect - Connect to a network");terminalView.println(" ping <host> - Ping a remote host");terminalView.println(" sniff - Monitor Wi-Fi packets");- terminalView.println(" connect <ssid> <pw> - Connect to a network");terminalView.println(" spoof ap <mac> - Spoof AP MAC");terminalView.println(" spoof sta <mac> - Spoof Station MAC");terminalView.println(" status - Show Wi-Fi status");terminalView.println(" disconnect - Disconnect from Wi-Fi");terminalView.println(" ap <ssid> <password> - Set access point");terminalView.println(" ssh <h> <u> <p> [p] - Open SSH session");- terminalView.println(" nc <h> <p> - Open netcat session");+ terminalView.println(" nc <host> <port> - Open netcat session");terminalView.println(" webui - Show the web UI IP");terminalView.println(" deauth <ssid> - Deauthenticate hosts on AP");terminalView.println(" reset - Reset interface");diff --git a/src/Controllers/WifiController.cpp b/src/Controllers/WifiController.cppindex eea6b568..b91661b1 100644--- a/src/Controllers/WifiController.cpp+++ b/src/Controllers/WifiController.cpp@@ -56,33 +56,40 @@ Connect*/void WifiController::handleConnect(const TerminalCommand &cmd){+ std::string ssid;+ std::string password;auto args = argTransformer.splitArgs(cmd.getSubcommand());- if (cmd.getSubcommand().empty())- {- terminalView.println("Usage: connect <ssid> <password>");- return;- }-- std::string full = cmd.getSubcommand() + " " + cmd.getArgs();-- // Find the last space to separate SSID and password- size_t pos = full.find_last_of(' ');- if (pos == std::string::npos || pos == full.size() - 1)- {- terminalView.println("Usage: connect <ssid> <password>");- return;+ // No args provided, we need to scan and select networks+ if (cmd.getSubcommand().empty()) {+ terminalView.println("Wifi: Scanning for available networks...");+ auto networks = wifiService.scanNetworks();+ int selectedIndex = userInputManager.readValidatedChoiceIndex("\nSelect Wi-Fi network", networks, 0);+ ssid = networks[selectedIndex];+ terminalView.println("Selected SSID: " + ssid);+ terminalView.print("Password: ");+ password = userInputManager.getLine();++ // Args provided+ } else {+ // Concatenate subcommand and args+ std::string full = cmd.getSubcommand() + " " + cmd.getArgs();++ // Find the last space to separate SSID and password+ size_t pos = full.find_last_of(' ');+ if (pos == std::string::npos || pos == full.size() - 1) {+ terminalView.println("Usage: connect <ssid> <password>");+ return;+ }+ ssid = full.substr(0, pos);+ password = full.substr(pos + 1);}- std::string ssid = full.substr(0, pos);- std::string password = full.substr(pos + 1);-terminalView.println("WiFi: Connecting to " + ssid + "...");wifiService.setModeApSta();wifiService.connect(ssid, password);- if (wifiService.isConnected())- {+ if (wifiService.isConnected()) {terminalView.println("");terminalView.println("WiFi: Connected to Wi-Fi!");terminalView.println(" Reset the device and choose WiFi Web,");@@ -104,10 +111,10 @@ void WifiController::handleConnect(const TerminalCommand &cmd)nvsService.saveString(state.getNvsSsidField(), ssid);nvsService.saveString(state.getNvsPasswordField(), password);nvsService.close();- }- else- {+ } else {terminalView.println("WiFi: Connection failed.");+ wifiService.reset();+ delay(100);}}@@ -608,7 +615,7 @@ void WifiController::handleHelp()terminalView.println(" scan");terminalView.println(" ping <host>");terminalView.println(" sniff");- terminalView.println(" connect <ssid> <password>");+ terminalView.println(" connect");terminalView.println(" spoof sta <mac>");terminalView.println(" spoof ap <mac>");terminalView.println(" status");diff --git a/src/Services/WifiService.cpp b/src/Services/WifiService.cppindex cd391262..8c6bdf3b 100644--- a/src/Services/WifiService.cpp+++ b/src/Services/WifiService.cpp@@ -117,23 +117,6 @@ int WifiService::ping(const std::string& host) {return success ? (end - start) : -1;}-std::vector<std::string> WifiService::scanNetworks() {- std::vector<std::string> results;-- int n = WiFi.scanNetworks(/*async=*/false, /*hidden=*/true);-- for (int i = 0; i < n; ++i) {- std::stringstream ss;- ss << " SSID: " << WiFi.SSID(i).c_str()- << " | RSSI: " << WiFi.RSSI(i)- << " dBm | Sec: "- << (WiFi.encryptionType(i) == WIFI_AUTH_OPEN ? "Open" : "Secured");- results.push_back(ss.str());- }-- return results;-}-void WifiService::reset() {disconnect();WiFi.mode(WIFI_STA);@@ -153,6 +136,18 @@ std::string WifiService::getLocalIp() const {return std::string(ip.c_str());}+std::vector<std::string> WifiService::scanNetworks() {+ std::vector<std::string> results;++ int n = WiFi.scanNetworks(/*async=*/false, /*hidden=*/true);++ for (int i = 0; i < n; ++i) {+ results.push_back(WiFi.SSID(i).c_str());+ }++ return results;+}+std::vector<WiFiNetwork> WifiService::scanDetailedNetworks() {std::vector<WiFiNetwork> networks;int n = WiFi.scanNetworks(/*async=*/false, /*hidden=*/true);