tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix style issues in recent security fixes

Browse Source
This commit is contained in:
Johannes Meyer 2022-03-08 15:20:16 +01:00
parent 88294549ba
commit 0d032989e6
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/forms/Config/Resource/SshResourceForm.php
View File

@ -52,8 +52,7 @@ class SshResourceForm extends Form
if ($this->getRequest()->getActionName() != 'editresource') { if ($this->getRequest()->getActionName() != 'editresource') {
$callbackValidator = new Zend_Validate_Callback(function ($value) { $callbackValidator = new Zend_Validate_Callback(function ($value) {
if ( if (substr(ltrim($value), 0, 7) === 'file://'
substr(ltrim($value), 0, 7) === 'file://'
|| openssl_pkey_get_private($value) === false || openssl_pkey_get_private($value) === false
) { ) {
return false; return false;

3
library/Icinga/Web/Controller/StaticController.php
View File

@ -49,8 +49,7 @@ class StaticController
$filePath = $assetRoot . DIRECTORY_SEPARATOR . $assetPath; $filePath = $assetRoot . DIRECTORY_SEPARATOR . $assetPath;
$dirPath = realpath(dirname($filePath)); // dirname, because the file may be a link $dirPath = realpath(dirname($filePath)); // dirname, because the file may be a link
if ( if ($dirPath === false
$dirPath === false
|| substr($dirPath, 0, strlen($assetRoot)) !== $assetRoot || substr($dirPath, 0, strlen($assetRoot)) !== $assetRoot
|| ! is_file($filePath) || ! is_file($filePath)
) { ) {

3
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -1194,8 +1194,7 @@ abstract class IdoQuery extends DbQuery
$this->customVars[strtolower($customvar)] = $alias; $this->customVars[strtolower($customvar)] = $alias;
if ($type === 'host') { if ($type === 'host') {
if ( if ($this instanceof ServicecommentQuery
$this instanceof ServicecommentQuery
|| $this instanceof ServicedowntimeQuery || $this instanceof ServicedowntimeQuery
|| $this instanceof ServicecommenthistoryQuery || $this instanceof ServicecommenthistoryQuery
|| $this instanceof ServicedowntimestarthistoryQuery || $this instanceof ServicedowntimestarthistoryQuery