shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle both old and new T3k thumbnail urs.

Browse Source
This commit is contained in:
Robin E.R. Davies
2026-06-01 15:21:33 -04:00
parent 2f10bfcba2
commit 618e403331
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WebServerConfig.cpp
+7 -1
View File
@@ -97,7 +97,9 @@ static bool IsSafeThumbnailPath(const fs::path path)
if (!HtmlHelper::IsSafeFileName(path)) { if (!HtmlHelper::IsSafeFileName(path)) {
return false; return false;
} }
if (!(path.string().starts_with("/var/pipedal/tone3000_thumbnails/"))) if ((!path.string().starts_with("/var/pipedal/tone3000_thumbnails/")) &&
(!path.string().starts_with("/var/pipedal/audio_uploads/tone3000_thumbnails/"))
)
{ {
return false; return false;
} }
@@ -620,9 +622,13 @@ public:
std::string id = request_uri.query("id"); std::string id = request_uri.query("id");
fs::path path = GetTone3000ThumbnailFile(this->model->Tone3000ThumbnailDirectory(), id); fs::path path = GetTone3000ThumbnailFile(this->model->Tone3000ThumbnailDirectory(), id);
if (!fs::exists(path)) if (!fs::exists(path))
{
path = GetTone3000ThumbnailFile(this->model->OldTone3000ThumbnailDirectory(),id);
if (!fs::exists(path))
{ {
throw PiPedalException("File not found."); throw PiPedalException("File not found.");
} }
}
auto mimeType = GetMimeType(path); auto mimeType = GetMimeType(path);
if (mimeType.empty()) if (mimeType.empty())
{ {