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

Merge pull request #3440 from Icinga/feature/secure-detailviewextensionhook-gethtmlforobject-3393 

Secure DetailviewExtensionHook::getHtmlForObject()
This commit is contained in:
Eric Lippmann 2018-05-07 04:19:32 -04:00 committed by GitHub
parent 60295f3407 2da7ef0eb2
commit e74b1fc5eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -3,6 +3,7 @@
namespace Icinga\Module\Monitoring\Web\Controller;
use Exception;
use Icinga\Module\Monitoring\Controller;
use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
@ -84,9 +85,16 @@ abstract class MonitoredObjectController extends Controller
$this->view->extensionsHtml = array();
foreach (Hook::all('Monitoring\DetailviewExtension') as $hook) {
/** @var DetailviewExtensionHook $hook */
try {
$html = $hook->setView($this->view)->getHtmlForObject($this->object);
} catch (Exception $e) {
$html = $this->view->escape($e->getMessage());
}
$this->view->extensionsHtml[] =
'<div class="icinga-module module-' . $this->view->escape($hook->getModule()->getName()) . '">'
. $hook->setView($this->view)->getHtmlForObject($this->object)
. $html
. '</div>';
}
}