public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 04:05:55 +00:00
Code Issues Releases Wiki Activity

DiskCache: more strict checking for input filenames, getUrl() is no longer static

Browse Source
This commit is contained in:
Andrew Dolgov
2019-08-14 09:49:18 +03:00
parent 65450f8a2b
commit 3c075bfd21
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/diskcache.php
View File

@@ -3,7 +3,7 @@ class DiskCache {
private $dir;
public function __construct($dir) {
$this->dir = CACHE_DIR . "/" . basename($dir);
$this->dir = CACHE_DIR . "/" . clean_filename($dir);
}
public function getDir() {
@@ -39,7 +39,7 @@ class DiskCache {
}
public function getFullPath($filename) {
$filename = basename($filename);
$filename = clean_filename($filename);
return $this->dir . "/" . $filename;
}
@@ -72,8 +72,8 @@ class DiskCache {
return send_local_file($this->getFullPath($filename));
}
static public function getUrl($filename) {
return get_self_url_prefix() . "/public.php?op=cached_url&file=" . $filename;
public function getUrl($filename) {
return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
}
// check for locally cached (media) URLs and rewrite to local versions
@@ -103,7 +103,7 @@ class DiskCache {
if ($cache->getSize($cached_filename) > 0) {
$src = DiskCache::getUrl(sha1($src));
$src = $cache->getUrl(sha1($src));
if ($entry->hasAttribute('poster'))
$entry->setAttribute('poster', $src);