Skip to content

Fix path traversal in browser delete via MPD path #661

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
acts-1631 wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −1
Open

Fix path traversal in browser delete via MPD path #661

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
40 changes: 39 additions & 1 deletion src/screens/browser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,10 +609,48 @@ void Browser::fetchSupportedExtensions()

namespace {

// Collapse "." and ".." path segments so an MPD-supplied path cannot escape
// mpd_music_dir via traversal. Relative paths cannot escape above their root
// via ".."; absolute paths keep their leading slash.
std::string normalizePath(const std::string &path)
{
bool absolute = !path.empty() && path[0] == '/';
std::vector<std::string> kept;
size_t start = 0;
while (start <= path.length())
{
size_t end = path.find('/', start);
if (end == std::string::npos)
end = path.length();
std::string seg = path.substr(start, end - start);
if (!seg.empty() && seg != ".")
{
if (seg == "..")
{
if (!kept.empty())
kept.pop_back();
}
else
kept.push_back(seg);
}
start = end + 1;
}
std::string result;
for (size_t i = 0; i < kept.size(); ++i)
{
if (i)
result += "/";
result += kept[i];
}
if (absolute)
result = "/" + result;
return result;
}

std::string realPath(bool local_browser, std::string path)
{
if (!local_browser)
path = Config.mpd_music_dir + path;
path = Config.mpd_music_dir + normalizePath(path);
return path;
}

Expand Down