tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Static content: Fix check whether an image exists

This commit is contained in:
Eric Lippmann 2015-08-28 13:14:33 +02:00
parent e7e1b1a98e
commit e5e64ab654
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/StaticController.php
View File

@ -59,13 +59,14 @@ class StaticController extends Controller
*/ */
public function imgAction() public function imgAction()
{ {
// TODO(el): I think this action only retrieves images from modules
$module = $this->_getParam('module_name'); $module = $this->_getParam('module_name');
$file = $this->_getParam('file'); $file = $this->_getParam('file');
$basedir = Icinga::app()->getModuleManager()->getModule($module)->getBaseDir(); $basedir = Icinga::app()->getModuleManager()->getModule($module)->getBaseDir();
$filePath = realpath($basedir . '/public/img/' . $file); $filePath = realpath($basedir . '/public/img/' . $file);
if (! $filePath || strpos($filePath, $basedir) !== 0) { if ($filePath === false) {
$this->httpNotFound('%s does not exist', $filePath); $this->httpNotFound('%s does not exist', $filePath);
} }
if (preg_match('/\.([a-z]+)$/i', $file, $m)) { if (preg_match('/\.([a-z]+)$/i', $file, $m)) {