Skip to content

Fix path traversal in lyrics filename when storing lyrics in song dir #658

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
Open

Fix path traversal in lyrics filename when storing lyrics in song dir #658

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
22 changes: 20 additions & 2 deletions src/screens/lyrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@
***************************************************************************/

#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/range/algorithm_ext/erase.hpp>
#include <cassert>
#include <cerrno>
#include <cstring>
#include <fstream>
#include <thread>
#include <vector>

#include "curses/scrollpad.h"
#include "screens/browser.h"
Expand Down Expand Up @@ -59,15 +62,30 @@ std::string removeExtension(std::string filename)
return filename;
}

// Strip "." and ".." path components and any leading separators so a song URI
// cannot escape the directory it is joined into.
std::string stripPathTraversal(std::string path)
{
std::vector<std::string> parts;
boost::split(parts, path, boost::is_any_of("/"));
std::vector<std::string> kept;
for (auto &part : parts)
{
if (part == ".." || part == "." || part.empty())
continue;
kept.push_back(std::move(part));
}
return boost::join(kept, "/");
}

std::string lyricsFilename(const MPD::Song &s)
{
std::string filename;
if (Config.store_lyrics_in_song_dir && !s.isStream())
{
if (s.isFromDatabase())
filename = Config.mpd_music_dir + "/";
filename += removeExtension(s.getURI());
removeExtension(filename);
filename += stripPathTraversal(removeExtension(s.getURI()));
}
else
{
Expand Down