Skip to content

Add more extensions to the potentially dangerous downloads list #249

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
TomGoodIdea wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add more extensions to the potentially dangerous downloads list #249

Show file tree
Hide file tree
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
16 changes: 13 additions & 3 deletions src/core/utils/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,22 @@ bool EndsWithCaseInsens(const std::string& what, const std::string& with)
bool IsPotentiallyDangerousDownload(const std::string& filename)
{
return
EndsWithCaseInsens(filename, ".exe") ||
EndsWithCaseInsens(filename, ".7z") ||
EndsWithCaseInsens(filename, ".bat") ||
EndsWithCaseInsens(filename, ".cmd") ||
EndsWithCaseInsens(filename, ".com") ||
EndsWithCaseInsens(filename, ".exe") ||
EndsWithCaseInsens(filename, ".js") ||
EndsWithCaseInsens(filename, ".jse") ||
EndsWithCaseInsens(filename, ".hta") ||
EndsWithCaseInsens(filename, ".lnk") ||
EndsWithCaseInsens(filename, ".pif") ||
EndsWithCaseInsens(filename, ".rar") ||
EndsWithCaseInsens(filename, ".reg") ||
EndsWithCaseInsens(filename, ".scr") ||
EndsWithCaseInsens(filename, ".vbe") ||
EndsWithCaseInsens(filename, ".vbs") ||
EndsWithCaseInsens(filename, ".cmd") ||
EndsWithCaseInsens(filename, ".scr");
EndsWithCaseInsens(filename, ".zip");
}

int64_t ExtractTimestamp(Snowflake sf)
Expand Down
13 changes: 1 addition & 12 deletions src/windows/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,18 +1638,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_IMAGESAVED:
{
LPCTSTR file = (LPCTSTR) lParam;
size_t sl = _tcslen(file);
bool isExe = false;

if (sl > 4 && (
_tcscmp(file + sl - 4, TEXT(".exe")) == 0 ||
_tcscmp(file + sl - 4, TEXT(".scr")) == 0 ||
_tcscmp(file + sl - 4, TEXT(".lnk")) == 0 ||
_tcscmp(file + sl - 4, TEXT(".zip")) == 0 ||
_tcscmp(file + sl - 4, TEXT(".rar")) == 0 ||
_tcscmp(file + sl - 4, TEXT(".7z")) == 0)) {
isExe = true;
}
bool isExe = IsPotentiallyDangerousDownload(MakeStringFromTString(file));

TCHAR buff[4096];
WAsnprintf(
Expand Down
Loading