kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Safety measure in eraseBookFilesFromComputer()

Browse Source 
My experience is that `kiwix::Download::getPath()` may return an empty
string (at least for a fresh download object and probably before Aria2
actually starts downloading and creates the target file). Passing such
an empty string into `eraseBookFilesFromComputer()` might have
disastrous consequences. Now that function should be safer.
This commit is contained in:
Veloman Yunkan 2024-03-27 18:35:38 +04:00
parent ef6d7661de
commit a1a298af58
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/contentmanager.cpp
View File

@ -566,6 +566,14 @@ void ContentManager::downloadBook(const QString &id)
downloadStarted(book, downloadId);
}
static const char MSG_FOR_PREVENTED_RMSTAR_OPERATION[] = R"(
BUG: Errare humanum est.
BUG: Kiwix developers are human, but we try to ensure that our mistakes
BUG: don't cause harm to our users.
BUG: If we didn't detect this situation we could have erased a lot of files
BUG: on your computer.
)";
void ContentManager::eraseBookFilesFromComputer(const std::string& bookPath, bool moveToTrash)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
@ -573,6 +581,12 @@ void ContentManager::eraseBookFilesFromComputer(const std::string& bookPath, boo
#endif
const std::string dirPath = kiwix::removeLastPathElement(bookPath);
const std::string fileGlob = kiwix::getLastPathElement(bookPath) + "*";
if ( fileGlob == "*" ) {
std::cerr << MSG_FOR_PREVENTED_RMSTAR_OPERATION << std::endl;
return;
}
QDir dir(QString::fromStdString(dirPath), QString::fromStdString(fileGlob));
for(const QString& file: dir.entryList()) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)