localhorst/reHDD
1
0
Fork 1
Code Issues 6 Pull Requests 2 Releases 10 Wiki Activity

Compare commits

base: localhorst:bugfix/ai-static-analysis
Branches Tags
localhorst:master localhorst:bugfix/ai-static-analysis localhorst:feature/failed-state localhorst:test/ipc-dummy
localhorst:1.2.0 localhorst:1.1.3 localhorst:1.1.2 localhorst:1.1.1 localhorst:b1.1.0 localhorst:b0.3.0 localhorst:b0.2.2 localhorst:b0.2.0 localhorst:b0.1.0 localhorst:1.0.0
..
compare: localhorst:feature/failed-state
Branches Tags
localhorst:bugfix/ai-static-analysis localhorst:feature/failed-state localhorst:master localhorst:test/ipc-dummy
localhorst:1.2.0 localhorst:1.1.3 localhorst:1.1.2 localhorst:1.1.1 localhorst:b1.1.0 localhorst:b0.3.0 localhorst:b0.2.2 localhorst:b0.2.0 localhorst:b0.1.0 localhorst:1.0.0

1 Commits
bugfix/ai- ... feature/fa

Author SHA1 Message Date
localhorst
298192111d new states 2025-12-07 18:36:32 +01:00
7 changed files with 72 additions and 96 deletions
Expand all files Collapse all files

2
include/drive.h
View File

@ -20,6 +20,8 @@ public:
SHRED_SELECTED, SHRED_SELECTED,
SHRED_ACTIVE, // shred iterations active SHRED_ACTIVE, // shred iterations active
CHECK_ACTIVE, // optional checking active CHECK_ACTIVE, // optional checking active
CHECK_SUCCESSFUL,
CHECK_FAILED,
DELETE_SELECTED, DELETE_SELECTED,
DELETE_ACTIVE, DELETE_ACTIVE,
FROZEN FROZEN

2
include/reHDD.h
View File

@ -31,7 +31,7 @@
#endif #endif
// Logic // Logic
#define DRYRUN // don't touch the drives // #define DRYRUN // don't touch the drives
#define FROZEN_ALERT // show alert if drive is frozen #define FROZEN_ALERT // show alert if drive is frozen
#define ZERO_CHECK // check drive after shred if all bytes are zero, show alert if this fails #define ZERO_CHECK // check drive after shred if all bytes are zero, show alert if this fails

31
src/drive.cpp
View File

@ -62,12 +62,8 @@ string Drive::sCapacityToText()
dSize /= 1000; dSize /= 1000;
u16UnitIndex++; u16UnitIndex++;
} }
if (u16UnitIndex >= 9)
{ sprintf(acBuffer, "%.*f %s", u16UnitIndex - 3, dSize, units[u16UnitIndex]);
u16UnitIndex = 8;
}
int precision = (u16UnitIndex >= 3) ? (u16UnitIndex - 3) : 0;
sprintf(acBuffer, "%.*f %s", precision, dSize, units[u16UnitIndex]);
return acBuffer; return acBuffer;
} }
@ -152,20 +148,12 @@ void Drive::setDriveSMARTData(string modelFamily,
void Drive::setTimestamp() void Drive::setTimestamp()
{ {
if (time(&this->u32Timestamp) == -1) time(&this->u32Timestamp);
{
// handle error
this->u32Timestamp = 0U;
}
} }
void Drive::setActionStartTimestamp() void Drive::setActionStartTimestamp()
{ {
if (time(&this->u32TimestampTaskStart) == -1) time(&this->u32TimestampTaskStart);
{
// handle error
this->u32TimestampTaskStart = 0U;
}
} }
time_t Drive::getActionStartTimestamp() time_t Drive::getActionStartTimestamp()
@ -176,11 +164,7 @@ time_t Drive::getActionStartTimestamp()
void Drive::calculateTaskDuration() void Drive::calculateTaskDuration()
{ {
time_t u32localtime; time_t u32localtime;
if (time(&u32localtime) == -1) time(&u32localtime);
{
// handle error
u32localtime = 0U;
}
this->u32TaskDuration = u32localtime - this->u32TimestampTaskStart; this->u32TaskDuration = u32localtime - this->u32TimestampTaskStart;
} }
@ -194,11 +178,6 @@ void Drive::checkFrozenDrive(void)
{ {
time_t u32localtime; time_t u32localtime;
time(&u32localtime); time(&u32localtime);
if (time(&u32localtime) == -1)
{
// handle error
u32localtime = 0U;
}
if ((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT * 60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0)) if ((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT * 60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0))
{ {

4
src/main.cpp
View File

@ -16,7 +16,7 @@ int main(void)
{ {
// cout << "refurbishingHddTool" << endl; // cout << "refurbishingHddTool" << endl;
reHDD app; reHDD *app = new reHDD();
app.app_logic(); app->app_logic();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

111
src/reHDD.cpp
View File

@ -43,15 +43,8 @@ void reHDD::app_logic(void)
ui = new TUI(); ui = new TUI();
ui->initTUI(); ui->initTUI();
if (pipe(fdNewDrivesInformPipe) == -1) pipe(fdNewDrivesInformPipe);
{ pipe(fdShredInformPipe);
Logger::logThis()->error("Unable to open pipe 'fdNewDrivesInformPipe'");
}
if (pipe(fdShredInformPipe) == -1)
{
Logger::logThis()->error("Unable to open pipe 'fdShredInformPipe'");
}
thread thDevices(ThreadScanDevices); // start thread that scans for drives thread thDevices(ThreadScanDevices); // start thread that scans for drives
thread thUserInput(ThreadUserInput); // start thread that reads user input thread thUserInput(ThreadUserInput); // start thread that reads user input
@ -101,7 +94,7 @@ Drive *reHDD::getSelectedDrive()
else else
{ {
Logger::logThis()->warning("selected drive not present"); Logger::logThis()->warning("selected drive not present");
return nullptr; return {};
} }
} }
@ -142,8 +135,6 @@ void reHDD::ThreadUserInput()
{ {
while (true) while (true)
{ {
Drive *tmpSelectedDrive = getSelectedDrive();
// cout << TUI::readUserInput() << endl; // cout << TUI::readUserInput() << endl;
switch (TUI::readUserInput()) switch (TUI::readUserInput())
{ {
@ -168,11 +159,11 @@ void reHDD::ThreadUserInput()
case TUI::UserInput::Delete: case TUI::UserInput::Delete:
// cout << "Delete" << endl; // cout << "Delete" << endl;
if (tmpSelectedDrive != nullptr) if (getSelectedDrive() != nullptr)
{ {
if (tmpSelectedDrive->state == Drive::NONE) if (getSelectedDrive()->state == Drive::NONE)
{ {
tmpSelectedDrive->state = Drive::DELETE_SELECTED; getSelectedDrive()->state = Drive::DELETE_SELECTED;
} }
} }
@ -180,13 +171,15 @@ void reHDD::ThreadUserInput()
break; break;
case TUI::UserInput::Shred: case TUI::UserInput::Shred:
// cout << "Shred" << endl; // cout << "Shred" << endl;
if (tmpSelectedDrive != nullptr)
if (getSelectedDrive() != nullptr)
{ {
if (tmpSelectedDrive->state == Drive::NONE) if (getSelectedDrive()->state == Drive::NONE)
{ {
tmpSelectedDrive->state = Drive::SHRED_SELECTED; getSelectedDrive()->state = Drive::SHRED_SELECTED;
} }
} }
ui->updateTUI(&listDrives, u8SelectedEntry); ui->updateTUI(&listDrives, u8SelectedEntry);
break; break;
case TUI::UserInput::ShredAll: case TUI::UserInput::ShredAll:
@ -231,14 +224,13 @@ void reHDD::ThreadShred(Drive *const pDrive)
void reHDD::ThreadDelete() void reHDD::ThreadDelete()
{ {
Drive *tmpSelectedDrive = getSelectedDrive(); if (getSelectedDrive() != nullptr)
if (tmpSelectedDrive != nullptr)
{ {
tmpSelectedDrive->setActionStartTimestamp(); // save timestamp at start of deleting getSelectedDrive()->setActionStartTimestamp(); // save timestamp at start of deleting
Delete::deleteDrive(tmpSelectedDrive); // blocking, no thread Delete::deleteDrive(getSelectedDrive()); // blocking, no thread
tmpSelectedDrive->state = Drive::TaskState::NONE; // delete finished getSelectedDrive()->state = Drive::TaskState::NONE; // delete finished
tmpSelectedDrive->bWasDeleted = true; getSelectedDrive()->bWasDeleted = true;
Logger::logThis()->info("Finished delete for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial()); Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
ui->updateTUI(&listDrives, u8SelectedEntry); ui->updateTUI(&listDrives, u8SelectedEntry);
} }
} }
@ -334,28 +326,28 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
if (devName.empty()) if (devName.empty())
continue; continue;
Drive tmpDrive("/dev/" + devName); Drive *tmpDrive = new Drive("/dev/" + devName);
tmpDrive.state = Drive::NONE; tmpDrive->state = Drive::NONE;
tmpDrive.bIsOffline = false; tmpDrive->bIsOffline = false;
// Set connection type // Set connection type
if (transport == "sata") if (transport == "sata")
tmpDrive.connectionType = Drive::SATA; tmpDrive->connectionType = Drive::SATA;
else if (transport == "usb") else if (transport == "usb")
tmpDrive.connectionType = Drive::USB; tmpDrive->connectionType = Drive::USB;
else if (transport == "nvme") else if (transport == "nvme")
tmpDrive.connectionType = Drive::NVME; tmpDrive->connectionType = Drive::NVME;
else else
tmpDrive.connectionType = Drive::UNKNOWN; tmpDrive->connectionType = Drive::UNKNOWN;
plistDrives->push_back(tmpDrive); plistDrives->push_back(*tmpDrive);
Logger::logThis()->info( Logger::logThis()->info(
"Drive found: " + tmpDrive.getPath() + "Drive found: " + tmpDrive->getPath() +
" (type: " + " (type: " +
(tmpDrive.connectionType == Drive::USB ? "USB" : tmpDrive.connectionType == Drive::SATA ? "SATA" (tmpDrive->connectionType == Drive::USB ? "USB" : tmpDrive->connectionType == Drive::SATA ? "SATA"
: tmpDrive.connectionType == Drive::NVME ? "NVME" : tmpDrive->connectionType == Drive::NVME ? "NVME"
: "UNKNOWN") + : "UNKNOWN") +
")"); ")");
} }
@ -384,6 +376,7 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath()); Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
#endif #endif
it = plistDrives->erase(it); it = plistDrives->erase(it);
it--;
} }
} }
} }
@ -426,7 +419,6 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
// cout << "blkid uuid:" << sUUID << endl; // cout << "blkid uuid:" << sUUID << endl;
} }
} }
free(cLine);
pclose(outputfileBlkid); pclose(outputfileBlkid);
// cout << "blkid uuid:" << sUUID << endl; // cout << "blkid uuid:" << sUUID << endl;
@ -437,6 +429,7 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath()); Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
#endif #endif
it = plistDrives->erase(it); it = plistDrives->erase(it);
it--;
} }
} }
} }
@ -458,6 +451,7 @@ void reHDD::filterInvalidDrives(list<Drive> *plistDrives)
Logger::logThis()->info("Drive reports zero capacity --> ignore this drive: " + it->getPath()); Logger::logThis()->info("Drive reports zero capacity --> ignore this drive: " + it->getPath());
#endif #endif
it = plistDrives->erase(it); it = plistDrives->erase(it);
it--;
} }
} }
} }
@ -625,21 +619,22 @@ void reHDD::handleArrowKey(TUI::UserInput userInput)
void reHDD::handleEnter() void reHDD::handleEnter()
{ {
Drive *tmpSelectedDrive = getSelectedDrive();
if (tmpSelectedDrive != nullptr) if (getSelectedDrive() != nullptr)
{ {
if (tmpSelectedDrive->state == Drive::TaskState::SHRED_SELECTED) if (getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
{ {
Logger::logThis()->info("Started shred/check for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial()); Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
tmpSelectedDrive->state = Drive::TaskState::SHRED_ACTIVE; getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
// task for drive is running --> don't show more task option // task for drive is running --> don't show more task options
thread(ThreadShred, tmpSelectedDrive).detach(); Drive *pTmpDrive = getSelectedDrive();
thread(ThreadShred, pTmpDrive).detach();
} }
if (tmpSelectedDrive->state == Drive::TaskState::DELETE_SELECTED) if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
{ {
Logger::logThis()->info("Started delete for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial()); Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
tmpSelectedDrive->state = Drive::TaskState::DELETE_ACTIVE; getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
// task for drive is running --> don't show more task options // task for drive is running --> don't show more task options
thread(ThreadDelete).detach(); thread(ThreadDelete).detach();
} }
@ -648,18 +643,17 @@ void reHDD::handleEnter()
void reHDD::handleESC() void reHDD::handleESC()
{ {
Drive *tmpSelectedDrive = getSelectedDrive(); if (getSelectedDrive() != nullptr)
if (tmpSelectedDrive != nullptr)
{ {
if (tmpSelectedDrive->state == Drive::TaskState::SHRED_SELECTED) if (getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
{ {
tmpSelectedDrive->state = Drive::TaskState::NONE; getSelectedDrive()->state = Drive::TaskState::NONE;
// task for drive is selected --> remove selection // task for drive is selected --> remove selection
} }
if (tmpSelectedDrive->state == Drive::TaskState::DELETE_SELECTED) if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
{ {
tmpSelectedDrive->state = Drive::TaskState::NONE; getSelectedDrive()->state = Drive::TaskState::NONE;
// task for drive is selected --> remove selection // task for drive is selected --> remove selection
} }
} }
@ -667,13 +661,12 @@ void reHDD::handleESC()
void reHDD::handleAbort() void reHDD::handleAbort()
{ {
Drive *tmpSelectedDrive = getSelectedDrive(); if (getSelectedDrive() != nullptr)
if (tmpSelectedDrive != nullptr)
{ {
if (tmpSelectedDrive->state == Drive::SHRED_ACTIVE || tmpSelectedDrive->state == Drive::DELETE_ACTIVE) if (getSelectedDrive()->state == Drive::SHRED_ACTIVE || getSelectedDrive()->state == Drive::DELETE_ACTIVE)
{ {
tmpSelectedDrive->state = Drive::NONE; getSelectedDrive()->state = Drive::NONE;
Logger::logThis()->info("Abort-Shred-Signal for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial()); Logger::logThis()->info("Abort-Shred-Signal for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
// task for drive is running --> remove selection // task for drive is running --> remove selection
} }
} }

15
src/shred.cpp
View File

@ -60,7 +60,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE); randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
if (randomSrcFileDiscr == -1) if (randomSrcFileDiscr == -1)
{ {
std::string errorMsg(strerror(errno)); std::string errorMsg(strerror(randomSrcFileDiscr));
Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror(randomsrc); perror(randomsrc);
cleanup(); cleanup();
@ -71,7 +71,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE); driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
if (driveFileDiscr == -1) if (driveFileDiscr == -1)
{ {
std::string errorMsg(strerror(errno)); std::string errorMsg(strerror(driveFileDiscr));
Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror(cpDrivePath); perror(cpDrivePath);
cleanup(); cleanup();
@ -82,7 +82,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey)); ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
if (readRet <= 0) if (readRet <= 0)
{ {
std::string errorMsg(strerror(errno)); std::string errorMsg(strerror(readRet));
Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror(randomsrc); perror(randomsrc);
cleanup(); cleanup();
@ -132,7 +132,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
if (iByteShredded <= 0) if (iByteShredded <= 0)
{ {
std::string errorMsg(strerror(errno)); std::string errorMsg(strerror(iByteShredded));
Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror("unable to write random data"); perror("unable to write random data");
cleanup(); cleanup();
@ -186,22 +186,23 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
drive->state = Drive::CHECK_ACTIVE; drive->state = Drive::CHECK_ACTIVE;
Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str()); Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd); drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
#ifdef LOG_LEVEL_HIGH
if (drive->u32DriveChecksumAfterShredding != 0) if (drive->u32DriveChecksumAfterShredding != 0)
{ {
drive->state = Drive::CHECK_FAILED;
Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
} }
else else
{ {
drive->state = Drive::CHECK_SUCCESSFUL;
Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
} }
#endif #endif
#endif
#endif #endif
cleanup(); cleanup();
if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE)) if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_SUCCESSFUL) || (drive->state == Drive::CHECK_FAILED))
{ {
drive->state = Drive::NONE; drive->state = Drive::NONE;
drive->setTaskPercentage(0.0); drive->setTaskPercentage(0.0);

3
src/tui.cpp
View File

@ -145,6 +145,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
case Drive::NONE: case Drive::NONE:
case Drive::SHRED_SELECTED: case Drive::SHRED_SELECTED:
case Drive::DELETE_SELECTED: case Drive::DELETE_SELECTED:
case Drive::CHECK_SUCCESSFUL:
if (it->bWasDeleted) if (it->bWasDeleted)
{ {
sState = "DELETED"; // mark drive as deleted previously sState = "DELETED"; // mark drive as deleted previously
@ -165,7 +166,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
} }
#ifdef ZERO_CHECK #ifdef ZERO_CHECK
if (bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U)) if (bSelectedEntry && it->bWasChecked && (it->state == Drive::CHECK_FAILED))
{ {
dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding); dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding);
wrefresh(dialog); wrefresh(dialog);