Skip to content

A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol

modify wifi and ethernet controller to use the abstract network controller

Geob99006f72866
diff --git a/src/Controllers/EthernetController.cpp b/src/Controllers/EthernetController.cpp
index 5be3ff3e..c28aead5 100644
--- a/src/Controllers/EthernetController.cpp
+++ b/src/Controllers/EthernetController.cpp
@@ -1,30 +1,17 @@
#include "Controllers/EthernetController.h"
-/*
-Constructor
-*/
-EthernetController::EthernetController(ITerminalView& terminalView,
- IInput& terminalInput,
- IInput& deviceInput,
- EthernetService& ethernetService,
- ArgTransformer& argTransformer,
- UserInputManager& userInputManager)
-: terminalView(terminalView)
-, terminalInput(terminalInput)
-, deviceInput(deviceInput)
-, ethernetService(ethernetService)
-, argTransformer(argTransformer)
-, userInputManager(userInputManager)
-{}
-
/*
Entry point for command
*/
void EthernetController::handleCommand(const TerminalCommand& cmd) {
const auto& root = cmd.getRoot();
- if (root == "config") handleConfig();
+ if (root == "config") handleConfig();
else if (root == "connect") handleConnect();
+ else if (root == "nc") handleNetcat(cmd);
+ else if (root == "nmap") handleNmap(cmd);
+ else if (root == "ping") handlePing(cmd);
+ else if (root == "ssh") handleSsh(cmd);
else if (root == "status") handleStatus();
else if (root == "reset") handleReset();
else handleHelp();
@@ -36,51 +23,38 @@ Connect using DHCP
void EthernetController::handleConnect() {
unsigned long timeoutMs = 5000;
- std::string macStr;
- std::array<uint8_t,6> mac = { 0xDE, 0xAD, 0xBE, 0xEF, 0x00, 0x42 };
-
- auto confirmation = userInputManager.readYesNo(
- "Connect to Ethernet using DHCP with default MAC?",
- true
- );
-
- // Ask for MAC if not confirmed
- if (!confirmation) {
- macStr = userInputManager.readValidatedHexString(
- "MAC (AA:BB:CC:DD:EE:FF)",
- 6,
- true
- );
-
- argTransformer.parseMac(macStr, mac);
- }
terminalView.println("Ethernet: DHCP…");
- if (!ethernetService.beginDHCP(mac, timeoutMs)) {
- terminalView.println("Ethernet: DHCP failed.");
+ if (!ethernetService.beginDHCP(timeoutMs)) {
+ if (!ethernetService.linkUp()) {
+ terminalView.println("Ethernet: No link (cable unplugged).");
+ } else {
+ terminalView.println("Ethernet: DHCP failed.");
+ }
return;
}
- terminalView.println("Ethernet: Connected via DHCP.");
- terminalView.println(" IP: " + ethernetService.getLocalIP());
- terminalView.println(" GW: " + ethernetService.getGatewayIp());
- terminalView.println(" MASK: " + ethernetService.getSubnetMask());
- terminalView.println(" DNS: " + ethernetService.getDns());
+ terminalView.println("\n=== Ethernet: Connected via DHCP ===");
+ terminalView.println(" IP : " + ethernetService.getLocalIP());
+ terminalView.println(" GATE : " + ethernetService.getGatewayIp());
+ terminalView.println(" MASK : " + ethernetService.getSubnetMask());
+ terminalView.println(" DNS : " + ethernetService.getDns());
+ terminalView.println("==============================\n");
}
/*
Config W5500
*/
void EthernetController::handleConfig() {
- terminalView.println("\nEthernet (W5500) Configuration:");
+ terminalView.println("Ethernet (W5500) Configuration:");
const auto& forbidden = state.getProtectedPins();
-
uint8_t defCS = state.getEthernetCsPin();
uint8_t defRST = state.getEthernetRstPin();
uint8_t defSCK = state.getEthernetSckPin();
uint8_t defMISO = state.getEthernetMisoPin();
uint8_t defMOSI = state.getEthernetMosiPin();
+ uint8_t defIRQ = state.getEthernetIrqPin();
uint32_t defHz = state.getEthernetFrequency();
// User input for configuration
@@ -88,6 +62,7 @@ void EthernetController::handleConfig() {
uint8_t sck = userInputManager.readValidatedPinNumber("W5500 SCK pin", defSCK, forbidden);
uint8_t miso = userInputManager.readValidatedPinNumber("W5500 MISO pin", defMISO, forbidden);
uint8_t mosi = userInputManager.readValidatedPinNumber("W5500 MOSI pin", defMOSI, forbidden);
+ uint8_t irq = userInputManager.readValidatedPinNumber("W5500 IRQ pin", defIRQ, forbidden);
// RST optional
bool useReset = userInputManager.readYesNo(
@@ -97,49 +72,90 @@ void EthernetController::handleConfig() {
uint8_t rst = 255;
if (useReset) {
- rst = userInputManager.readValidatedPinNumber("RST pin", (defRST == 255 ? 4 : defRST), forbidden);
+ rst = userInputManager.readValidatedPinNumber("W5500 RST pin", rst, forbidden);
}
// Frequency SPI
uint32_t hz = userInputManager.readValidatedUint32("SPI frequency (Hz)", defHz);
+ // MAC addr (optional)
+ std::string macStr;
+ std::array<uint8_t,6> mac = state.getEthernetMac();
+
+ auto confirmation = userInputManager.readYesNo(
+ "Use a custom MAC address?",
+ false
+ );
+
+ // Ask for MAC if confirmed
+ if (confirmation) {
+ macStr = userInputManager.readValidatedHexString(
+ "MAC (DE AD BE EF 00 42)",
+ 6,
+ false
+ );
+
+ argTransformer.parseMac(macStr, mac);
+ }
+
// Save
state.setEthernetCsPin(cs);
state.setEthernetSckPin(sck);
state.setEthernetMisoPin(miso);
state.setEthernetMosiPin(mosi);
state.setEthernetRstPin(useReset ? rst : 255);
+ state.setEthernetIrqPin(irq);
state.setEthernetFrequency(hz);
+ state.setEthernetMac(mac);
// Configure
- ethernetService.configure(
+ bool confirm = ethernetService.configure(
cs,
(useReset ? rst : -1),
sck,
miso,
mosi,
- hz
+ irq,
+ hz,
+ mac
);
+ if (!confirm) {
+ terminalView.println("Ethernet configuration failed. Check connections on W5500");
+ return;
+ }
+
terminalView.println("Ethernet configured.");
}
/*
W55000 Status
*/
-void EthernetController::handleStatus()
-{
- if (ethernetService.isConnected()) {
- terminalView.println("Ethernet: Connected");
- terminalView.println(" IP: " + ethernetService.getLocalIP());
+void EthernetController::handleStatus() {
+ const bool link = ethernetService.linkUp();
+ const bool connected = ethernetService.isConnected();
+
+ const std::string mac = ethernetService.getMac();
+ const std::string ip = ethernetService.getLocalIP();
+ const bool hasIp = (ip != "0.0.0.0");
+
+ terminalView.println("\n=== Ethernet Status ===");
+ terminalView.println(std::string(" Link : ") + (link ? "UP" : "DOWN"));
+ terminalView.println(std::string(" MAC : ") + mac);
+
+ if (connected) {
+ terminalView.println(std::string(" IP : ") + ip);
+ terminalView.println(std::string(" Mask : ") + ethernetService.getSubnetMask());
+ terminalView.println(std::string(" GW : ") + ethernetService.getGatewayIp());
+ terminalView.println(std::string(" DNS : ") + ethernetService.getDns());
+ } else if (link && !hasIp) {
+ terminalView.println(" IP : (waiting for DHCP)");
+ } else if (!link) {
+ terminalView.println(" IP : (no link)");
} else {
- terminalView.println("Ethernet: Not connected.");
+ terminalView.println(std::string(" IP : ") + ip);
}
- terminalView.println(" MAC: " + ethernetService.getMac());
-
- auto hw = ethernetService.hardwareStatusRaw();
- auto lk = ethernetService.linkStatusRaw();
- terminalView.println(" HW: " + std::to_string(hw) + " | LINK: " + std::to_string(lk) + (ethernetService.linkUp() ? " (UP)" : " (DOWN)"));
+ terminalView.println("========================\n");
}
/*
@@ -147,7 +163,7 @@ Reset
*/
void EthernetController::handleReset()
{
- // ethernetService.disconnect();
+ ethernetService.hardReset();
terminalView.println("Ethernet: Interface reset. Disconnected. [NYI].");
}
@@ -158,6 +174,10 @@ void EthernetController::handleHelp() {
terminalView.println("Ethernet commands:");
terminalView.println(" status");
terminalView.println(" connect");
+ terminalView.println(" ping <host>");
+ terminalView.println(" ssh <host> <user> <password> [port]");
+ terminalView.println(" nc <host> <port>");
+ terminalView.println(" nmap <host> [port]");
terminalView.println(" reset");
terminalView.println(" config");
}
@@ -177,6 +197,10 @@ void EthernetController::ensureConfigured() {
auto sck = state.getEthernetSckPin();
auto miso = state.getEthernetMisoPin();
auto mosi = state.getEthernetMosiPin();
+ auto rst = state.getEthernetRstPin();
+ auto irq = state.getEthernetIrqPin();
auto frequency = state.getEthernetFrequency();
- ethernetService.configure(cs, sck, miso, mosi, frequency);
+ auto mac = state.getEthernetMac();
+
+ ethernetService.configure(cs, rst, sck, miso, mosi, irq, frequency, mac);
}
diff --git a/src/Controllers/EthernetController.h b/src/Controllers/EthernetController.h
index af1584f0..a420ebeb 100644
--- a/src/Controllers/EthernetController.h
+++ b/src/Controllers/EthernetController.h
@@ -15,15 +15,11 @@
#include "Models/TerminalCommand.h"
#include "States/GlobalState.h"
#include "Managers/UserInputManager.h"
+#include "Abstracts/ANetworkController.h"
-class EthernetController {
+class EthernetController : public ANetworkController {
public:
- EthernetController(ITerminalView& terminalView,
- IInput& terminalInput,
- IInput& deviceInput,
- EthernetService& ethernetService,
- ArgTransformer& argTransformer,
- UserInputManager& userInputManager);
+ using ANetworkController::ANetworkController;
// Entry point for Ethernet command
void handleCommand(const TerminalCommand& cmd);
@@ -32,23 +28,22 @@ public:
void ensureConfigured();
private:
- // Handlers
+ // Configure the W5500
void handleConfig();
+
+ // Ethernet status
void handleStatus();
+
+ // Connect using DHCP
void handleConnect();
+
+ // Hard reset the W5500 (via RST)
void handleReset();
+
+ // Available commands
void handleHelp();
private:
- ITerminalView& terminalView;
- IInput& terminalInput;
- IInput& deviceInput;
-
- EthernetService& ethernetService;
- ArgTransformer& argTransformer;
- UserInputManager& userInputManager;
-
GlobalState& state = GlobalState::getInstance();
-
bool configured = false;
};
diff --git a/src/Controllers/WifiController.cpp b/src/Controllers/WifiController.cpp
index 005ba17a..65d98e46 100644
--- a/src/Controllers/WifiController.cpp
+++ b/src/Controllers/WifiController.cpp
@@ -1,34 +1,5 @@
#include "Controllers/WifiController.h"
-/*
-Constructor
-*/
-WifiController::WifiController(
- ITerminalView &terminalView,
- IInput &terminalInput,
- IInput &deviceInput,
- WifiService &wifiService,
- WifiOpenScannerService &wifiScannerService,
- SshService &sshService,
- NetcatService &netcatService,
- NmapService &nmapService,
- NvsService &nvsService,
- ArgTransformer &argTransformer,
- UserInputManager &userInputManager
-)
- : terminalView(terminalView),
- terminalInput(terminalInput),
- deviceInput(deviceInput),
- wifiService(wifiService),
- wifiScannerService(wifiScannerService),
- sshService(sshService),
- netcatService(netcatService),
- nmapService(nmapService),
- nvsService(nvsService),
- argTransformer(argTransformer),
- userInputManager(userInputManager)
-{}
-
/*
Entry point for command
*/
@@ -270,13 +241,13 @@ void WifiController::handleProbe()
}
// Stop any existing probe
- if (wifiScannerService.isOpenProbeRunning()) {
- wifiScannerService.stopOpenProbe();
+ if (wifiOpenScannerService.isOpenProbeRunning()) {
+ wifiOpenScannerService.stopOpenProbe();
}
- wifiScannerService.clearProbeLog();
+ wifiOpenScannerService.clearProbeLog();
// Start the open probe service
- if (!wifiScannerService.startOpenProbe()) {
+ if (!wifiOpenScannerService.startOpenProbe()) {
terminalView.println("WIFI: Failed to start probe.\n");
return;
}
@@ -284,9 +255,9 @@ void WifiController::handleProbe()
terminalView.println("WIFI: Probe for internet access... Press [ENTER] to stop.\n");
// Start the open probe task
- while (wifiScannerService.isOpenProbeRunning()) {
+ while (wifiOpenScannerService.isOpenProbeRunning()) {
// Display logs
- auto batch = wifiScannerService.fetchProbeLog();
+ auto batch = wifiOpenScannerService.fetchProbeLog();
for (auto& ln : batch) {
terminalView.println(ln.c_str());
}
@@ -294,7 +265,7 @@ void WifiController::handleProbe()
// Enter Press to stop
int ch = terminalInput.readChar();
if (ch == '\n' || ch == '\r') {
- wifiScannerService.stopOpenProbe();
+ wifiOpenScannerService.stopOpenProbe();
break;
}
@@ -302,31 +273,12 @@ void WifiController::handleProbe()
}
// Flush final logs
- for (auto& ln : wifiScannerService.fetchProbeLog()) {
+ for (auto& ln : wifiOpenScannerService.fetchProbeLog()) {
terminalView.println(ln.c_str());
}
terminalView.println("WIFI: Open-Wifi probe ended.\n");
}
-/*
-Ping
-*/
-void WifiController::handlePing(const TerminalCommand &cmd)
-{
- std::string host = cmd.getSubcommand();
-
- int responseTimeMs = wifiService.ping(host);
-
- if (responseTimeMs >= 0)
- {
- terminalView.println("WiFi: Ping on " + host + " successful (" + std::to_string(responseTimeMs) + " ms).");
- }
- else
- {
- terminalView.println("WiFi: Ping failed.");
- }
-}
-
/*
Sniff
*/
@@ -446,238 +398,6 @@ void WifiController::handleWebUi(const TerminalCommand &)
}
}
-/*
-SSH
-*/
-void WifiController::handleSsh(const TerminalCommand &cmd)
-{
- // Check connection
- if (!wifiService.isConnected())
- {
- terminalView.println("SSH: You must be connected to Wi-Fi. Use 'connect' first.");
- return;
- }
-
- // Check args
- auto args = argTransformer.splitArgs(cmd.getArgs());
- if (cmd.getSubcommand().empty() || args.size() < 2)
- {
- terminalView.println("Usage: ssh <host> <user> <password> [port]");
- return;
- }
-
- // Check port
- int port = 22;
- if (args.size() == 3)
- {
- if (argTransformer.isValidNumber(args[2]))
- {
- port = argTransformer.parseHexOrDec16(args[2]);
- }
- }
-
- std::string host = cmd.getSubcommand();
- std::string user = args[0];
- std::string pass = args[1];
-
- // Connect, start the ssh task
- terminalView.println("SSH: Connecting to " + host + " as " + user + " with port " + std::to_string(port) + "...");
- sshService.startTask(host, user, pass, false, port);
-
- // Wait 5sec for connection success
- unsigned long start = millis();
- while (!sshService.isConnected() && millis() - start < 5000)
- {
- delay(500);
- }
-
- // Can't connect
- if (!sshService.isConnected())
- {
- terminalView.println("\r\nSSH: Connection failed.");
- sshService.close();
- return;
- }
-
- // Connected, start the bridge loop
- terminalView.println("SSH: Connected. Shell started... Press [ANY ESP32 KEY] to stop.\n");
- while (true)
- {
- char terminalKey = terminalInput.readChar();
- if (terminalKey != KEY_NONE)
- sshService.writeChar(terminalKey);
-
- char deviceKey = deviceInput.readChar();
- if (deviceKey != KEY_NONE)
- break;
-
- std::string output = sshService.readOutputNonBlocking();
- if (!output.empty())
- terminalView.print(output);
-
- delay(10);
- }
-
- // Close SSH
- sshService.close();
- terminalView.println("\r\n\nSSH: Session closed.");
-}
-
-/*
-Netcat
-*/
-void WifiController::handleNetcat(const TerminalCommand &cmd)
-{
- // Check connection
- if (!wifiService.isConnected())
- {
- terminalView.println("Netcat: You must be connected to Wi-Fi. Use 'connect' first.");
- return;
- }
-
- // Check args
- auto args = argTransformer.splitArgs(cmd.getArgs());
- if (cmd.getSubcommand().empty() || args.size() < 1)
- {
- terminalView.println("Usage: nc <host> <port>");
- return;
- }
-
- std::string host = cmd.getSubcommand();
- std::string port_str = args[0];
-
- // Check port
- int port = 1;
- if (argTransformer.isValidNumber(port_str))
- {
- port = argTransformer.parseHexOrDec16(port_str);
- }
- else
- {
- terminalView.println("Netcat: Invalid port number. Use a valid integer.");
- return;
- }
-
- if (port < 1 || port > 65535)
- {
- terminalView.println("Netcat: Port must be between 1 and 65535.");
- return;
- }
-
- // Connect, start the netcat task
- terminalView.println("Netcat: Connecting to " + host + " with port " + port_str + "...");
- netcatService.startTask(host, 0, port, true);
-
- // Wait 5sec for connection success
- unsigned long start = millis();
- while (!netcatService.isConnected() && millis() - start < 5000)
- {
- delay(50);
- }
-
- // Can't connect
- if (!netcatService.isConnected())
- {
- terminalView.println("\r\nNetcat: Connection failed.");
- netcatService.close();
- return;
- }
-
- // Connected, start the bridge loop
- terminalView.println("Netcat: Connected. Shell started...\n");
- terminalView.println("Press [CTRL+C],[ESC] or [ANY ESP32 BUTTON] to stop.\n");
-
- while (true)
- {
- char deviceKey = deviceInput.readChar();
- if (deviceKey != KEY_NONE)
- break;
-
- char terminalKey = terminalInput.readChar();
- if (terminalKey == KEY_NONE){
- continue;
- }
-
- netcatService.writeChar(terminalKey);
- terminalView.print(std::string(1, terminalKey)); // local echo
- if (terminalKey == 0x1B || terminalKey == 0x03) break; // ESC or CTRL+C to exit
- if (terminalKey == '\r' || terminalKey == '\n')
- terminalView.println("");
-
- std::string output = netcatService.readOutputNonBlocking();
- if (!output.empty())
- terminalView.print(output);
-
- delay(10);
- }
-
- // Close Netcat
- netcatService.close();
- terminalView.println("\r\n\nNetcat: Session closed.");
-}
-
-/*
-Nmap
-*/
-void WifiController::handleNmap(const TerminalCommand &cmd)
-{
- // Check connection
- if (!wifiService.isConnected())
- {
- terminalView.println("Nmap: You must be connected to Wi-Fi. Use 'connect' first.");
- return;
- }
-
- auto args = argTransformer.splitArgs(cmd.getArgs());
-
- // Parse args
- // Parse hosts first
- auto hosts_arg = cmd.getSubcommand();
- if(!nmapService.parseHosts(hosts_arg)) {
- terminalView.println("Nmap: Invalid host.");
- return;
- }
-
- // Check the first char of args is '-'
- if (!args.empty() && (args[0].empty() || args[0][0] != '-')) {
- terminalView.println("Nmap: Options must start with '-' (ex: -p 22)");
- return;
- }
-
- nmapService.setArgTransformer(argTransformer);
- auto tokens = argTransformer.splitArgs(cmd.getArgs());
- auto options = NmapService::parseNmapArgs(tokens);
-
- if (options.hasTrash){
- // TODO handle this better
- //terminalView.println("Nmap: Invalid options.");
- }
-
- if (options.hasPort) {
- // Parse ports
- if (!nmapService.parsePorts(options.ports)) {
- terminalView.println("Nmap: invalid -p value. Use 80,22,443 or 1000-2000.");
- return;
- }
- nmapService.setLayer4(options.tcp);
- } else {
- // Set the most popular ports
- nmapService.setDefaultPorts(options.tcp);
- terminalView.println("Nmap: Using top 100 common ports (may take a few seconds)");
- }
-
- nmapService.startTask(options.verbosity);
-
- while(!nmapService.isReady()){
- delay(100);
- }
-
- terminalView.println(nmapService.getReport());
- nmapService.clean();
-
- terminalView.println("\r\n\nNmap: Scan finished.");
-}
-
/*
Config
*/
diff --git a/src/Controllers/WifiController.h b/src/Controllers/WifiController.h
index 78529fb4..9fd043ba 100644
--- a/src/Controllers/WifiController.h
+++ b/src/Controllers/WifiController.h
@@ -12,24 +12,12 @@
#include <Managers/UserInputManager.h>
#include <Models/TerminalCommand.h>
#include <States/GlobalState.h>
+#include <Abstracts/ANetworkController.h>
#include <Preferences.h>
-class WifiController {
+class WifiController : public ANetworkController {
public:
- // Constructor
- WifiController(
- ITerminalView& terminalView,
- IInput& terminalInput,
- IInput& deviceInput,
- WifiService& wifiService,
- WifiOpenScannerService& wifiScannerService,
- SshService& sshService,
- NetcatService& netcatService,
- NmapService& nmapService,
- NvsService& nvsService,
- ArgTransformer& argTransformer,
- UserInputManager& userInputManager
- );
+ using ANetworkController::ANetworkController;
// Entry point for Wi-Fi command
void handleCommand(const TerminalCommand& cmd);
@@ -38,17 +26,6 @@ public:
void ensureConfigured();
private:
- ITerminalView& terminalView;
- IInput& terminalInput;
- IInput& deviceInput;
- WifiService& wifiService;
- WifiOpenScannerService& wifiScannerService;
- NvsService& nvsService;
- SshService& sshService;
- NetcatService& netcatService;
- NmapService& nmapService;
- ArgTransformer& argTransformer;
- UserInputManager& userInputManager;
GlobalState& state = GlobalState::getInstance();
bool configured = false;
Preferences preferences;
@@ -68,9 +45,6 @@ private:
// Perform Wi-Fi network scan
void handleScan(const TerminalCommand& cmd);
- // Ping a target over Wi-Fi
- void handlePing(const TerminalCommand& cmd);
-
// Start probing open networks for net access
void handleProbe();
@@ -83,15 +57,6 @@ private:
// Spoof Mac addr
void handleSpoof(const TerminalCommand& cmd);
- // Connect to SSH host
- void handleSsh(const TerminalCommand& cmd);
-
- // Connect using netcat
- void handleNetcat(const TerminalCommand& cmd);
-
- // Scan using nmap
- void handleNmap(const TerminalCommand& cmd);
-
// Deauthentication attack
void handleDeauth(const TerminalCommand& cmd);
@@ -103,6 +68,4 @@ private:
// Show help for Wi-Fi commands
void handleHelp();
-
-
};
diff --git a/src/Providers/DependencyProvider.cpp b/src/Providers/DependencyProvider.cpp
index f54235d5..b288dd58 100644
--- a/src/Providers/DependencyProvider.cpp
+++ b/src/Providers/DependencyProvider.cpp
@@ -76,9 +76,9 @@ DependencyProvider::DependencyProvider(ITerminalView &terminalView, IDeviceView
ledController(terminalView, terminalInput, ledService, argTransformer, userInputManager),
bluetoothController(terminalView, terminalInput, bluetoothService, argTransformer),
i2sController(terminalView, terminalInput, i2sService, argTransformer, userInputManager),
- wifiController(terminalView, terminalInput, deviceInput, wifiService, wifiScannerService, sshService, netcatService, nmapService, nvsService, argTransformer, userInputManager),
+ wifiController(terminalView, terminalInput, deviceInput, wifiService, wifiScannerService, ethernetService, sshService, netcatService, nmapService, nvsService, argTransformer, userInputManager),
canController(terminalView, terminalInput, userInputManager, canService, argTransformer),
- ethernetController(terminalView, terminalInput, deviceInput, ethernetService, argTransformer, userInputManager)
+ ethernetController(terminalView, terminalInput, deviceInput, wifiService, wifiScannerService, ethernetService, sshService, netcatService, nmapService, nvsService, argTransformer, userInputManager)
{
}