Skip to content

fix: TOCTOU and improve error handling in evidence deletion #263

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

Open
jkennedyvz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: TOCTOU and improve error handling in evidence deletion #263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/forms/getinfo/getinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,32 @@ void GetInfo::deleteButtonClicked() {

if (reply == QMessageBox::Yes) {
Q_EMIT setActionButtonsEnabled(false);
bool shouldClose = true;

model::Evidence evi = evidenceEditor->encodeEvidence();
if (!QFile::remove(evi.path)) {
bool fileDeleted = QFile::remove(evi.path);
bool dbDeleted = db->deleteEvidence(evidenceID);

if (!fileDeleted && !dbDeleted) {
QMessageBox::warning(this, tr("Could not delete"),
tr("Unable to delete evidence file.\n"
tr("Unable to delete evidence file and database entry.\n"
"You can try deleting the file directly. File Location:\n%1")
.arg(evi.path));
shouldClose = false;
}

db->deleteEvidence(evidenceID);
else if (!fileDeleted) {
QMessageBox::warning(this, tr("Could not delete file"),
tr("Unable to delete evidence file (database entry removed).\n"
"You can try deleting the file directly. File Location:\n%1")
.arg(evi.path));
}
else if (!dbDeleted) {
QMessageBox::warning(this, tr("Could not delete database entry"),
tr("Unable to delete database entry (file removed).\n"
"The database may be corrupted. Error: %1")
.arg(db->errorString()));
}

Q_EMIT setActionButtonsEnabled(true);
if (shouldClose) {
if (fileDeleted && dbDeleted) {
close();
}
}
Expand Down