Skip to content

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

modify handle sdcard to display the shell

Geoe591fc0f383b
diff --git a/src/Controllers/SpiController.cpp b/src/Controllers/SpiController.cpp
index bc1b98b1..e2bd40f4 100644
--- a/src/Controllers/SpiController.cpp
+++ b/src/Controllers/SpiController.cpp
@@ -2,14 +2,16 @@
SpiController::SpiController(ITerminalView& terminalView, IInput& terminalInput,
SpiService& spiService, SdService& sdService, ArgTransformer& argTransformer,
- UserInputManager& userInputManager, BinaryAnalyzeManager& binaryAnalyzeManager)
+ UserInputManager& userInputManager, BinaryAnalyzeManager& binaryAnalyzeManager,
+ SdCardManager& sdCardManager)
: terminalView(terminalView),
terminalInput(terminalInput),
spiService(spiService),
sdService(sdService),
argTransformer(argTransformer),
userInputManager(userInputManager),
- binaryAnalyzeManager(binaryAnalyzeManager)
+ binaryAnalyzeManager(binaryAnalyzeManager),
+ sdCardManager(sdCardManager)
{}
/*
@@ -658,41 +660,28 @@ void SpiController::handleSlave() {
SD Card
*/
void SpiController::handleSdCard() {
-
terminalView.println("SD Card: Mounting...");
- delay(500); // let the user see this ^
+ delay(500);
+ // Configure
spiService.end();
bool success = sdService.configure(
- state.getSpiCLKPin(),
- state.getSpiMISOPin(),
- state.getSpiMOSIPin(),
- state.getSpiCSPin()
+ state.getSpiCLKPin(),
+ state.getSpiMISOPin(),
+ state.getSpiMOSIPin(),
+ state.getSpiCSPin()
);
if (!success) {
terminalView.println("SD Card: Mount failed. Check config and wiring and try again.\n");
- } else {
- terminalView.println("SD Card: Mounted successfully. Loading...\n");
-
- // Root content
- auto elements = sdService.listElements("/");
- if (elements.empty()) {
- terminalView.println("[Root is empty]");
- } else {
- terminalView.println("Root content:");
- for (const auto& item : elements) {
- terminalView.println(" - " + item);
- }
- }
-
- terminalView.println("");
- terminalView.println(" [INFO] SD card interface is not yet fully implemented.");
- terminalView.println(" You can use the USB Stick mode to mount the card");
- terminalView.println(" as a USB drive and access it from your computer.\n");
+ return;
}
+
+ // SD Shell
+ terminalView.println("SD Card: Mounted successfully. Loading...\n");
+ sdCardManager.runShell();
- // Close and reconfigure
+ // Reconfigure
sdService.end();
spiService.end();
ensureConfigured();
diff --git a/src/Controllers/SpiController.h b/src/Controllers/SpiController.h
index 9f3268a2..7a50019b 100644
--- a/src/Controllers/SpiController.h
+++ b/src/Controllers/SpiController.h
@@ -12,13 +12,14 @@
#include "Transformers/ArgTransformer.h"
#include "Managers/UserInputManager.h"
#include "Managers/BinaryAnalyzeManager.h"
+#include "Managers/SdCardManager.h"
#include "States/GlobalState.h"
#include "Data/FlashDatabase.h"
class SpiController {
public:
// Constructor
- SpiController(ITerminalView& terminalView, IInput& terminalInput, SpiService& spiService, SdService& sdService, ArgTransformer& argTransformer, UserInputManager& userInputManager, BinaryAnalyzeManager& binaryAnalyzeManager);
+ SpiController(ITerminalView& terminalView, IInput& terminalInput, SpiService& spiService, SdService& sdService, ArgTransformer& argTransformer, UserInputManager& userInputManager, BinaryAnalyzeManager& binaryAnalyzeManager, SdCardManager& sdCardManager);
// Entry point for handle raw user command
void handleCommand(const TerminalCommand& cmd);
@@ -37,6 +38,7 @@ private:
ArgTransformer& argTransformer;
UserInputManager& userInputManager;
BinaryAnalyzeManager& binaryAnalyzeManager;
+ SdCardManager& sdCardManager;
GlobalState& state = GlobalState::getInstance();
bool configured = false;
diff --git a/src/Providers/DependencyProvider.cpp b/src/Providers/DependencyProvider.cpp
index 153b330d..7b7a5344 100644
--- a/src/Providers/DependencyProvider.cpp
+++ b/src/Providers/DependencyProvider.cpp
@@ -31,6 +31,7 @@ DependencyProvider::DependencyProvider(ITerminalView& terminalView, IDeviceView&
commandHistoryManager(),
binaryAnalyzeManager(spiService, terminalView, terminalInput),
userInputManager(terminalView, terminalInput, argTransformer),
+ sdCardManager(sdService, terminalView, terminalInput, argTransformer),
horizontalSelector(deviceView, deviceInput),
terminalTypeConfigurator(horizontalSelector),
uartController(terminalView, terminalInput, deviceInput, uartService, sdService, hdUartService, argTransformer, userInputManager),
@@ -39,7 +40,7 @@ DependencyProvider::DependencyProvider(ITerminalView& terminalView, IDeviceView&
infraredController(terminalView, terminalInput, infraredService, argTransformer, userInputManager),
utilityController(terminalView, deviceView, terminalInput, pinService, userInputManager, argTransformer),
hdUartController(terminalView, terminalInput, deviceInput, hdUartService, uartService, argTransformer, userInputManager),
- spiController(terminalView, terminalInput, spiService, sdService, argTransformer, userInputManager, binaryAnalyzeManager),
+ spiController(terminalView, terminalInput, spiService, sdService, argTransformer, userInputManager, binaryAnalyzeManager, sdCardManager),
jtagController(terminalView, terminalInput, jtagService, userInputManager),
twoWireController(terminalView, terminalInput, userInputManager, twoWireService),
threeWireController(terminalView, terminalInput),
@@ -104,6 +105,7 @@ WebRequestTransformer& DependencyProvider::getWebRequestTransformer() {return we
CommandHistoryManager& DependencyProvider::getCommandHistoryManager() { return commandHistoryManager ;}
UserInputManager& DependencyProvider::getUserInputManager() { return userInputManager; }
BinaryAnalyzeManager& DependencyProvider::getBinaryAnalyzeManager() { return binaryAnalyzeManager; }
+SdCardManager& DependencyProvider::getSdCardManager() { return sdCardManager; }
// Selectors
HorizontalSelector& DependencyProvider::getHorizontalSelector() { return horizontalSelector ;}
diff --git a/src/Providers/DependencyProvider.h b/src/Providers/DependencyProvider.h
index 6321f1b5..42d8c90d 100644
--- a/src/Providers/DependencyProvider.h
+++ b/src/Providers/DependencyProvider.h
@@ -50,6 +50,7 @@ and injecting shared instances of core components
#include "Managers/CommandHistoryManager.h"
#include "Managers/BinaryAnalyzeManager.h"
#include "Managers/UserInputManager.h"
+#include "Managers/SdCardManager.h"
#include "Config/TerminalTypeConfigurator.h"
class DependencyProvider {
@@ -114,6 +115,7 @@ public:
CommandHistoryManager& getCommandHistoryManager();
UserInputManager& getUserInputManager();
BinaryAnalyzeManager& getBinaryAnalyzeManager();
+ SdCardManager& getSdCardManager();
// Selectors
HorizontalSelector& getHorizontalSelector();
@@ -178,6 +180,7 @@ private:
CommandHistoryManager commandHistoryManager;
UserInputManager userInputManager;
BinaryAnalyzeManager binaryAnalyzeManager;
+ SdCardManager sdCardManager;
// Selectors
HorizontalSelector horizontalSelector;