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

Merge branch 'master' into bugfix/Improve-tooltip-descriptions-8110

Browse Source
This commit is contained in:
Eric Lippmann 2015-02-02 16:37:03 +01:00
commit 942d55c0d4
47 changed files with 704 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
application/controllers/ConfigController.php
View File

@ -1,41 +1,70 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
use Icinga\Web\Controller\ActionController;
use Icinga\Web\Notification;
use Icinga\Application\Modules\Module;
use Icinga\Web\Widget;
use Icinga\Application\Icinga;
use Icinga\Application\Config;
use Icinga\Forms\Config\GeneralConfigForm;
use Icinga\Forms\Config\AuthenticationBackendReorderForm;
use Icinga\Application\Icinga;
use Icinga\Application\Modules\Module;
use Icinga\Data\ResourceFactory;
use Icinga\Forms\Config\AuthenticationBackendConfigForm;
use Icinga\Forms\Config\AuthenticationBackendReorderForm;
use Icinga\Forms\Config\GeneralConfigForm;
use Icinga\Forms\Config\ResourceConfigForm;
use Icinga\Forms\ConfirmRemovalForm;
use Icinga\Data\ResourceFactory;
use Icinga\Security\SecurityException;
use Icinga\Web\Controller\ActionController;
use Icinga\Web\Notification;
use Icinga\Web\Widget;
/**
* Application wide controller for application preferences
* Application and module configuration
*/
class ConfigController extends ActionController
{
/**
* The first allowed config action according to the user's permissions
*
* @type string
*/
protected $firstAllowedAction;
/**
* Initialize tabs and validate the user's permissions
*
* @throws SecurityException If the user does not have any configuration permission
*/
public function init()
{
$this->view->tabs = Widget::create('tabs')->add('index', array(
'title' => $this->translate('Application'),
'url' => 'config'
))->add('authentication', array(
'title' => $this->translate('Authentication'),
'url' => 'config/authentication'
))->add('resources', array(
'title' => $this->translate('Resources'),
'url' => 'config/resource'
))->add('roles', array(
'title' => $this->translate('Roles'),
'url' => 'roles'
));
$tabs = $this->getTabs();
$auth = $this->Auth();
$allowedActions = array();
if ($auth->hasPermission('system/config/application')) {
$tabs->add('application', array(
'title' => $this->translate('Application'),
'url' => 'config/application'
));
$allowedActions[] = 'application';
}
if ($auth->hasPermission('system/config/authentication')) {
$tabs->add('authentication', array(
'title' => $this->translate('Authentication'),
'url' => 'config/authentication'
));
$allowedActions[] = 'authentication';
}
if ($auth->hasPermission('system/config/resources')) {
$tabs->add('resource', array(
'title' => $this->translate('Resources'),
'url' => 'config/resource'
));
$allowedActions[] = 'resource';
}
if ($auth->hasPermission('system/config/roles')) {
$tabs->add('roles', array(
'title' => $this->translate('Roles'),
'url' => 'roles'
));
$allowedActions[] = 'roles';
}
$this->firstAllowedAction = array_shift($allowedActions);
}
public function devtoolsAction()
@ -44,16 +73,35 @@ class ConfigController extends ActionController
}
/**
* Index action, entry point for configuration
* Forward or redirect to the first allowed configuration action
*/
public function indexAction()
{
if ($this->firstAllowedAction === null) {
throw new SecurityException('No permission for configuration');
}
$action = $this->getTabs()->get($this->firstAllowedAction);
if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {
$this->forward($this->firstAllowedAction);
} else {
$this->redirectNow($action->getUrl());
}
}
/**
* Application configuration
*
* @throws SecurityException If the user lacks the permission for configuring the application
*/
public function applicationAction()
{
$this->assertPermission('system/config/application');
$form = new GeneralConfigForm();
$form->setIniConfig(Config::app());
$form->handleRequest();
$this->view->form = $form;
$this->view->tabs->activate('index');
$this->view->tabs->activate('application');
}
/**
@ -61,16 +109,19 @@ class ConfigController extends ActionController
*/
public function modulesAction()
{
$this->view->tabs = Widget::create('tabs')->add('modules', array(
'title' => $this->translate('Modules'),
'url' => 'config/modules'
));
$this->view->tabs->activate('modules');
// Overwrite tabs created in init
// @TODO(el): This seems not natural to me. Module configuration should have its own controller.
$this->view->tabs = Widget::create('tabs')
->add('modules', array(
'title' => $this->translate('Modules'),
'url' => 'config/modules'
))
->activate('modules');
$this->view->modules = Icinga::app()->getModuleManager()->select()
->from('modules')
->order('enabled', 'desc')
->order('name')->paginate();
->order('name')
->paginate();
}
public function moduleAction()
@ -79,8 +130,12 @@ class ConfigController extends ActionController
$app = Icinga::app();
$manager = $app->getModuleManager();
if ($manager->hasInstalled($name)) {
$this->view->moduleData = Icinga::app()->getModuleManager()->select()
->from('modules')->where('name', $name)->fetchRow();
$this->view->moduleData = Icinga::app()
->getModuleManager()
->select()
->from('modules')
->where('name', $name)
->fetchRow();
$module = new Module($app, $name, $manager->getModuleDir($name));
$this->view->module = $module;
} else {
@ -94,6 +149,7 @@ class ConfigController extends ActionController
*/
public function moduleenableAction()
{
$this->assertPermission('system/config/modules');
$module = $this->getParam('name');
$manager = Icinga::app()->getModuleManager();
try {
@ -114,6 +170,7 @@ class ConfigController extends ActionController
*/
public function moduledisableAction()
{
$this->assertPermission('system/config/modules');
$module = $this->getParam('name');
$manager = Icinga::app()->getModuleManager();
try {
@ -133,6 +190,7 @@ class ConfigController extends ActionController
*/
public function authenticationAction()
{
$this->assertPermission('system/config/authentication');
$form = new AuthenticationBackendReorderForm();
$form->setIniConfig(Config::app('authentication'));
$form->handleRequest();
@ -147,6 +205,7 @@ class ConfigController extends ActionController
*/
public function createauthenticationbackendAction()
{
$this->assertPermission('system/config/authentication');
$form = new AuthenticationBackendConfigForm();
$form->setIniConfig(Config::app('authentication'));
$form->setResourceConfig(ResourceFactory::getResourceConfigs());
@ -163,6 +222,7 @@ class ConfigController extends ActionController
*/
public function editauthenticationbackendAction()
{
$this->assertPermission('system/config/authentication');
$form = new AuthenticationBackendConfigForm();
$form->setIniConfig(Config::app('authentication'));
$form->setResourceConfig(ResourceFactory::getResourceConfigs());
@ -179,6 +239,7 @@ class ConfigController extends ActionController
*/
public function removeauthenticationbackendAction()
{
$this->assertPermission('system/config/authentication');
$form = new ConfirmRemovalForm(array(
'onSuccess' => function ($form) {
$configForm = new AuthenticationBackendConfigForm();
@ -215,8 +276,9 @@ class ConfigController extends ActionController
*/
public function resourceAction()
{
$this->assertPermission('system/config/resources');
$this->view->resources = Config::app('resources', true)->keys();
$this->view->tabs->activate('resources');
$this->view->tabs->activate('resource');
}
/**
@ -224,6 +286,7 @@ class ConfigController extends ActionController
*/
public function createresourceAction()
{
$this->assertPermission('system/config/resources');
$form = new ResourceConfigForm();
$form->setIniConfig(Config::app('resources'));
$form->setRedirectUrl('config/resource');
@ -238,6 +301,7 @@ class ConfigController extends ActionController
*/
public function editresourceAction()
{
$this->assertPermission('system/config/resources');
$form = new ResourceConfigForm();
$form->setIniConfig(Config::app('resources'));
$form->setRedirectUrl('config/resource');
@ -252,6 +316,7 @@ class ConfigController extends ActionController
*/
public function removeresourceAction()
{
$this->assertPermission('system/config/resources');
$form = new ConfirmRemovalForm(array(
'onSuccess' => function ($form) {
$configForm = new ResourceConfigForm();

45
application/controllers/DashboardController.php
View File

@ -2,14 +2,13 @@
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
use Icinga\Application\Logger;
use \Exception;
use Icinga\Exception\ProgrammingError;
use Icinga\Forms\ConfirmRemovalForm;
use Icinga\Forms\Dashboard\DashletForm;
use Icinga\Web\Form;
use Icinga\Web\Notification;
use Icinga\Web\Controller\ActionController;
use Icinga\Web\Request;
use Icinga\Web\Url;
use Icinga\Web\Widget\Dashboard;
use Icinga\Web\Widget\Tabextension\DashboardSettings;
@ -25,11 +24,11 @@ class DashboardController extends ActionController
* @var Dashboard;
*/
private $dashboard;
public function init()
{
$this->dashboard = new Dashboard();
$this->dashboard->setUser($this->getRequest()->getUser());
$this->dashboard->setUser($this->Auth()->getUser());
$this->dashboard->load();
}
@ -56,11 +55,12 @@ class DashboardController extends ActionController
$dashlet = new Dashboard\Dashlet($form->getValue('dashlet'), $form->getValue('url'), $pane);
$dashlet->setUserWidget();
$pane->addDashlet($dashlet);
$dashboardConfig = $dashboard->getConfig();
try {
$dashboard->write();
} catch (\Zend_Config_Exception $e) {
$dashboardConfig->saveIni();
} catch (Exception $e) {
$action->view->error = $e;
$action->view->config = $dashboard->createWriter();
$action->view->config = $dashboardConfig;
$action->render('error');
return false;
}
@ -117,11 +117,12 @@ class DashboardController extends ActionController
$oldPane = $dashboard->getPane($form->getValue('org_pane'));
$oldPane->removeDashlet($dashlet->getTitle());
}
$dashboardConfig = $dashboard->getConfig();
try {
$dashboard->write();
} catch (\Zend_Config_Exception $e) {
$dashboardConfig->saveIni();
} catch (Exception $e) {
$action->view->error = $e;
$action->view->config = $dashboard->createWriter();
$action->view->config = $dashboardConfig;
$action->render('error');
return false;
}
@ -158,15 +159,16 @@ class DashboardController extends ActionController
$dashlet = $this->_request->getParam('dashlet');
$action = $this;
$form->setOnSuccess(function (Form $form) use ($dashboard, $dashlet, $pane, $action) {
$pane = $dashboard->getPane($pane);
$pane->removeDashlet($dashlet);
$dashboardConfig = $dashboard->getConfig();
try {
$pane = $dashboard->getPane($pane);
$pane->removeDashlet($dashlet);
$dashboard->write();
$dashboardConfig->saveIni();
Notification::success(t('Dashlet has been removed from') . ' ' . $pane->getTitle());
return true;
} catch (\Zend_Config_Exception $e) {
} catch (Exception $e) {
$action->view->error = $e;
$action->view->config = $dashboard->createWriter();
$action->view->config = $dashboardConfig;
$action->render('error');
return false;
} catch (ProgrammingError $e) {
@ -196,15 +198,16 @@ class DashboardController extends ActionController
$pane = $this->_request->getParam('pane');
$action = $this;
$form->setOnSuccess(function (Form $form) use ($dashboard, $pane, $action) {
$pane = $dashboard->getPane($pane);
$dashboard->removePane($pane->getTitle());
$dashboardConfig = $dashboard->getConfig();
try {
$pane = $dashboard->getPane($pane);
$dashboard->removePane($pane->getTitle());
$dashboard->write();
$dashboardConfig->saveIni();
Notification::success(t('Dashboard has been removed') . ': ' . $pane->getTitle());
return true;
} catch (\Zend_Config_Exception $e) {
} catch (Exception $e) {
$action->view->error = $e;
$action->view->config = $dashboard->createWriter();
$action->view->config = $dashboardConfig;
$action->render('error');
return false;
} catch (ProgrammingError $e) {
@ -241,7 +244,7 @@ class DashboardController extends ActionController
$this->view->title = $this->dashboard->getActivePane()->getTitle() . ' :: Dashboard';
if ($this->hasParam('remove')) {
$this->dashboard->getActivePane()->removeDashlet($this->getParam('remove'));
$this->dashboard->write();
$this->dashboard->getConfig()->saveIni();
$this->redirectNow(URL::fromRequest()->remove('remove'));
}
$this->view->tabs->add(

16
application/controllers/ErrorController.php
View File

@ -1,12 +1,9 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
// namespace Icinga\Application\Controllers;
use Icinga\Application\Logger;
use Icinga\Web\Controller\ActionController;
use Icinga\Application\Icinga;
use Icinga\Application\Logger;
use Icinga\Security\SecurityException;
use Icinga\Web\Controller\ActionController;
/**
* Application wide controller for displaying exceptions
@ -44,6 +41,13 @@ class ErrorController extends ActionController
}
break;
case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_OTHER:
if ($exception instanceof SecurityException) {
$this->getResponse()->setHttpResponseCode(403);
$this->view->message = $exception->getMessage();
break;
}
// Move to default
default:
$title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
$this->getResponse()->setHttpResponseCode(500);

58
application/controllers/RolesController.php
View File

@ -1,6 +1,4 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
use Icinga\Application\Config;
use Icinga\Forms\ConfirmRemovalForm;
@ -9,31 +7,57 @@ use Icinga\Web\Controller\ActionController;
use Icinga\Web\Notification;
use Icinga\Web\Widget;
/**
* Roles configuration
*/
class RolesController extends ActionController
{
/**
* Initialize tabs and validate the user's permissions
*
* @throws \Icinga\Security\SecurityException If the user lacks permissions for configuring roles
*/
public function init()
{
$this->view->tabs = Widget::create('tabs')->add('index', array(
'title' => $this->translate('Application'),
'url' => 'config'
))->add('authentication', array(
'title' => $this->translate('Authentication'),
'url' => 'config/authentication'
))->add('resources', array(
'title' => $this->translate('Resources'),
'url' => 'config/resource'
))->add('roles', array(
$this->assertPermission('system/config/roles');
$tabs = $this->getTabs();
$auth = $this->Auth();
if ($auth->hasPermission('system/config/application')) {
$tabs->add('application', array(
'title' => $this->translate('Application'),
'url' => 'config'
));
}
if ($auth->hasPermission('system/config/authentication')) {
$tabs->add('authentication', array(
'title' => $this->translate('Authentication'),
'url' => 'config/authentication'
));
}
if ($auth->hasPermission('system/config/resources')) {
$tabs->add('resource', array(
'title' => $this->translate('Resources'),
'url' => 'config/resource'
));
}
$tabs->add('roles', array(
'title' => $this->translate('Roles'),
'url' => 'roles'
));
}
/**
* List roles
*/
public function indexAction()
{
$this->view->tabs->activate('roles');
$this->view->roles = Config::app('roles', true);
}
/**
* Create a new role
*/
public function newAction()
{
$role = new RoleForm(array(
@ -61,6 +85,11 @@ class RolesController extends ActionController
$this->view->form = $role;
}
/**
* Update a role
*
* @throws Zend_Controller_Action_Exception If the required parameter 'role' is missing or the role does not exist
*/
public function updateAction()
{
$name = $this->_request->getParam('role');
@ -105,6 +134,11 @@ class RolesController extends ActionController
$this->view->form = $role;
}
/**
* Remove a role
*
* @throws Zend_Controller_Action_Exception If the required parameter 'role' is missing or the role does not exist
*/
public function removeAction()
{
$name = $this->_request->getParam('role');

12
application/forms/ConfigForm.php
View File

@ -8,7 +8,6 @@ use Exception;
use Zend_Form_Decorator_Abstract;
use Icinga\Web\Form;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
/**
* Form base-class providing standard functionality for configuration forms
@ -44,21 +43,14 @@ class ConfigForm extends Form
*/
public function save()
{
$writer = new IniWriter(
array(
'config' => $this->config,
'filename' => $this->config->getConfigFile()
)
);
try {
$writer->write();
$this->config->saveIni();
} catch (Exception $e) {
$this->addDecorator('ViewScript', array(
'viewModule' => 'default',
'viewScript' => 'showConfiguration.phtml',
'errorMessage' => $e->getMessage(),
'configString' => $writer->render(),
'configString' => $this->config,
'filePath' => $this->config->getConfigFile(),
'placement' => Zend_Form_Decorator_Abstract::PREPEND
));

10
application/forms/Security/RoleForm.php
View File

@ -21,7 +21,15 @@ class RoleForm extends ConfigForm
*
* @type array
*/
protected $providedPermissions = array('*' => '*');
protected $providedPermissions = array(
'*' => '*',
'system/config/*' => 'system/config/*',
'system/config/application' => 'system/config/application',
'system/config/authentication' => 'system/config/authentication',
'system/config/modules' => 'system/config/modules',
'system/config/resources' => 'system/config/resources',
'system/config/roles' => 'system/config/roles'
);
/**
* Provided restrictions by currently loaded modules

0
application/views/scripts/config/index.phtml → application/views/scripts/config/application.phtml
View File

14
application/views/scripts/dashboard/error.phtml
View File

@ -1,13 +1,13 @@
<div class="content">
<h1><?= t('Could not persist dashboard'); ?></h1>
<h1><?= $this->translate('Could not persist dashboard'); ?></h1>
<p>
<?= t('Please copy the following dashboard snippet to '); ?>
<strong><?= $this->config->getFilename(); ?>;</strong>.
<?= $this->translate('Please copy the following dashboard snippet to '); ?>
<strong><?= $this->config->getConfigFile(); ?>;</strong>.
<br>
<?= t('Make sure that the webserver can write to this file.'); ?>
<?= $this->translate('Make sure that the webserver can write to this file.'); ?>
</p>
<pre><?= (string) $this->config->render(); ?></pre>
<pre><?= $this->config; ?></pre>
<hr>
<h2><?= t('Error details') ?></h2>
<h2><?= $this->translate('Error details'); ?></h2>
<p><?= $this->error->getMessage(); ?></p>
</div>
</div>

5
application/views/scripts/error/error.phtml
View File

@ -1,8 +1,9 @@
<?php if ($this->title): ?>
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
<?php if ($this->title): ?>
<h1><?= $this->escape($title) ?></h1>
</div>
<?php endif ?>
</div>
<div class="content">
<?php if ($this->message): ?>
<p><strong><?= nl2br($this->escape($message)) ?></strong></p>

1
application/views/scripts/roles/new.phtml
View File

@ -1,4 +1,5 @@
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
<h1><?= $this->translate('New Role') ?></h1>
</div>
<div class="content">

1
application/views/scripts/roles/remove.phtml
View File

@ -1,4 +1,5 @@
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
<h1><?= sprintf($this->translate('Remove Role %s'), $name) ?></h1>
</div>
<div class="content">

1
application/views/scripts/roles/update.phtml
View File

@ -1,4 +1,5 @@
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
<h1><?= sprintf($this->translate('Update Role %s'), $name) ?></h1>
</div>
<div class="content">

38
icingaweb2.spec
View File

@ -5,7 +5,7 @@ Version: 2.0.0
Release: %{revision}%{?dist}
Summary: Icinga Web 2
Group: Applications/System
License: GPL
License: GPLv2+ and MIT and BSD
URL: https://icinga.org
Source0: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
BuildArch: noarch
@ -29,7 +29,6 @@ Packager: Icinga Team <info@icinga.org>
%endif
%endif
%if 0%{?suse_version}
%define wwwconfigdir %{_sysconfdir}/apache2/conf.d
%define wwwuser wwwrun
@ -43,15 +42,17 @@ Requires: apache2-mod_php5
%endif
%endif
Requires(pre): shadow-utils
Requires: %{name}-common = %{version}-%{release}
Requires: php-Icinga = %{version}-%{release}
Requires: %{name}-vendor-dompdf
Requires: %{name}-vendor-HTMLPurifier
Requires: %{name}-vendor-JShrink
Requires: %{name}-vendor-lessphp
Requires: %{name}-vendor-Parsedown
Requires: %{zend}
%{?fedora:Requires(pre): shadow-utils}
%{?rhel:Requires(pre): shadow-utils}
%{?suse_version:Requires(pre): pwdutils}
Requires: %{name}-common = %{version}-%{release}
Requires: php-Icinga = %{version}-%{release}
Requires: %{name}-vendor-dompdf
Requires: %{name}-vendor-HTMLPurifier
Requires: %{name}-vendor-JShrink
Requires: %{name}-vendor-lessphp
Requires: %{name}-vendor-Parsedown
Requires: %{zend}
%description
@ -68,8 +69,11 @@ Icinga Web 2
%package common
Summary: Common files for Icinga Web 2 and the Icinga CLI
Group: Applications/System
Summary: Common files for Icinga Web 2 and the Icinga CLI
Group: Applications/System
%{?fedora:Requires(pre): shadow-utils}
%{?rhel:Requires(pre): shadow-utils}
%{?suse_version:Requires(pre): pwdutils}
%description common
Common files for Icinga Web 2 and the Icinga CLI
@ -82,7 +86,7 @@ Requires: %{php} >= 5.3.0
Requires: %{php}-gd %{php}-intl
%{?fedora:Requires: php-pecl-imagick}
%{?rhel:Requires: php-pecl-imagick}
%{?suse_version:Requires: %{php}-gettext %{php}-openssl php5-imagick}
%{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix}
%description -n php-Icinga
Icinga Web 2 PHP library
@ -106,6 +110,7 @@ Version: 0.6.1
Release: 1%{?dist}
Summary: Icinga Web 2 vendor library dompdf
Group: Development/Libraries
License: LGPLv2.1
Requires: %{php} >= 5.3.0
%description vendor-dompdf
@ -117,6 +122,7 @@ Version: 4.6.0
Release: 1%{?dist}
Summary: Icinga Web 2 vendor library HTMLPurifier
Group: Development/Libraries
License: LGPLv2.1
Requires: %{php} >= 5.3.0
%description vendor-HTMLPurifier
@ -128,6 +134,7 @@ Version: 1.0.1
Release: 1%{?dist}
Summary: Icinga Web 2 vendor library JShrink
Group: Development/Libraries
License: BSD
Requires: %{php} >= 5.3.0
%description vendor-JShrink
@ -139,6 +146,7 @@ Version: 0.4.0
Release: 1%{?dist}
Summary: Icinga Web 2 vendor library lessphp
Group: Development/Libraries
License: MIT
Requires: %{php} >= 5.3.0
%description vendor-lessphp
@ -150,6 +158,7 @@ Version: 1.0.0
Release: 1%{?dist}
Summary: Icinga Web 2 vendor library Parsedown
Group: Development/Libraries
License: MIT
Requires: %{php} >= 5.3.0
%description vendor-Parsedown
@ -161,6 +170,7 @@ Version: 1.12.9
Release: 1%{?dist}
Summary: Icinga Web 2 vendor library Zend Framework
Group: Development/Libraries
License: BSD
Requires: %{php} >= 5.3.0
%description vendor-Zend

56
library/Icinga/Application/Config.php
View File

@ -6,8 +6,11 @@ namespace Icinga\Application;
use Iterator;
use Countable;
use LogicException;
use UnexpectedValueException;
use Icinga\Util\File;
use Icinga\Data\ConfigObject;
use Icinga\File\Ini\IniWriter;
use Icinga\Exception\NotReadableError;
/**
@ -299,6 +302,49 @@ class Config implements Countable, Iterator
return $emptyConfig;
}
/**
* Save configuration to the given INI file
*
* @param string|null $filePath The path to the INI file or null in case this config's path should be used
* @param int $fileMode The file mode to store the file with
*
* @throws LogicException In case this config has no path and none is passed in either
* @throws NotWritableError In case the INI file cannot be written
*
* @todo create basepath and throw NotWritableError in case its not possible
*/
public function saveIni($filePath = null, $fileMode = 0660)
{
if ($filePath === null && $this->configFile) {
$filePath = $this->configFile;
} elseif ($filePath === null) {
throw new LogicException('You need to pass $filePath or set a path using Config::setConfigFile()');
}
if (! file_exists($filePath)) {
File::create($filePath, $fileMode);
}
$this->getIniWriter($filePath, $fileMode)->write();
}
/**
* Return a IniWriter for this config
*
* @param string|null $filePath
* @param int $fileMode
*
* @return IniWriter
*/
protected function getIniWriter($filePath = null, $fileMode = null)
{
return new IniWriter(array(
'config' => $this,
'filename' => $filePath,
'filemode' => $fileMode
));
}
/**
* Prepend configuration base dir to the given relative path
*
@ -354,4 +400,14 @@ class Config implements Countable, Iterator
return $moduleConfigs[$configname];
}
/**
* Return this config rendered as a INI structured string
*
* @return string
*/
public function __toString()
{
return $this->getIniWriter()->render();
}
}

46
library/Icinga/Application/Modules/Manager.php
View File

@ -103,25 +103,22 @@ class Manager
*/
private function detectEnabledModules()
{
$canonical = $this->enableDir;
if ($canonical === false || ! file_exists($canonical)) {
// TODO: I guess the check for false has something to do with a
// call to realpath no longer present
if (! file_exists($this->enableDir)) {
return;
}
if (!is_dir($this->enableDir)) {
if (! is_dir($this->enableDir)) {
throw new NotReadableError(
'Cannot read enabled modules. Module directory "%s" is not a directory',
$this->enableDir
);
}
if (!is_readable($this->enableDir)) {
if (! is_readable($this->enableDir)) {
throw new NotReadableError(
'Cannot read enabled modules. Module directory "%s" is not readable',
$this->enableDir
);
}
if (($dh = opendir($canonical)) !== false) {
if (($dh = opendir($this->enableDir)) !== false) {
$this->enabledDirs = array();
while (($file = readdir($dh)) !== false) {
@ -129,7 +126,7 @@ class Manager
continue;
}
$link = $this->enableDir . '/' . $file;
$link = $this->enableDir . DIRECTORY_SEPARATOR . $file;
if (! is_link($link)) {
Logger::warning(
'Found invalid module in enabledModule directory "%s": "%s" is not a symlink',
@ -140,7 +137,7 @@ class Manager
}
$dir = realpath($link);
if (!file_exists($dir) || !is_dir($dir)) {
if (! file_exists($dir) || !is_dir($dir)) {
Logger::warning(
'Found invalid module in enabledModule directory "%s": "%s" points to non existing path "%s"',
$this->enableDir,
@ -208,7 +205,7 @@ class Manager
*/
public function enableModule($name)
{
if (!$this->hasInstalled($name)) {
if (! $this->hasInstalled($name)) {
throw new ConfigurationError(
'Cannot enable module "%s". Module is not installed.',
$name
@ -217,11 +214,16 @@ class Manager
clearstatcache(true);
$target = $this->installedBaseDirs[$name];
$link = $this->enableDir . '/' . $name;
$link = $this->enableDir . DIRECTORY_SEPARATOR . $name;
if (! is_dir($this->enableDir)) {
throw new NotFoundError('Cannot enable module "%s". Path "%s" not found.', $name, $this->enableDir);
} elseif (!is_writable($this->enableDir)) {
if (! is_dir($this->enableDir) && !@mkdir($this->enableDir, 02770, true)) {
$error = error_get_last();
throw new SystemPermissionException(
'Failed to create enabledModule directory "%s" (%s)',
$this->enableDir,
$error['message']
);
} elseif (! is_writable($this->enableDir)) {
throw new SystemPermissionException(
'Cannot enable module "%s". Insufficient system permissions for enabling modules.',
$name
@ -232,7 +234,7 @@ class Manager
return $this;
}
if (!@symlink($target, $link)) {
if (! @symlink($target, $link)) {
$error = error_get_last();
if (strstr($error["message"], "File exists") === false) {
throw new SystemPermissionException(
@ -246,9 +248,7 @@ class Manager
}
$this->enabledDirs[$name] = $link;
$this->loadModule($name);
return $this;
}
@ -264,22 +264,22 @@ class Manager
*/
public function disableModule($name)
{
if (!$this->hasEnabled($name)) {
if (! $this->hasEnabled($name)) {
return $this;
}
if (!is_writable($this->enableDir)) {
if (! is_writable($this->enableDir)) {
throw new SystemPermissionException(
'Could not disable module. Module path is not writable.'
);
}
$link = $this->enableDir . '/' . $name;
if (!file_exists($link)) {
$link = $this->enableDir . DIRECTORY_SEPARATOR . $name;
if (! file_exists($link)) {
throw new ConfigurationError(
'Could not disable module. The module %s was not found.',
$name
);
}
if (!is_link($link)) {
if (! is_link($link)) {
throw new ConfigurationError(
'Could not disable module. The module "%s" is not a symlink. '
. 'It looks like you have installed this module manually and moved it to your module folder. '
@ -290,7 +290,7 @@ class Manager
}
if (file_exists($link) && is_link($link)) {
if (!@unlink($link)) {
if (! @unlink($link)) {
$error = error_get_last();
throw new SystemPermissionException(
'Could not disable module "%s" due to file system errors. '

2
library/Icinga/Data/SimpleQuery.php
View File

@ -320,7 +320,7 @@ class SimpleQuery implements QueryInterface, Queryable
// Detect parameters from request
$request = Icinga::app()->getFrontController()->getRequest();
if ($itemsPerPage === null) {
$itemsPerPage = $request->getParam('limit', 20);
$itemsPerPage = $request->getParam('limit', 25);
}
if ($pageNumber === null) {
$pageNumber = $request->getParam('page', 0);

12
library/Icinga/Security/SecurityException.php Normal file
View File

@ -0,0 +1,12 @@
<?php
namespace Icinga\Security;
use Icinga\Exception\IcingaException;
/**
* Exception thrown when a caller does not have the permissions required to access a resource
*/
class SecurityException extends IcingaException
{
}

6
library/Icinga/User.php
View File

@ -428,11 +428,9 @@ class User
if ($wildcard !== false) {
if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
return true;
} else {
if ($permission === $permitted) {
return true;
}
}
} elseif ($permission === $permitted) {
return true;
}
}
return false;

39
library/Icinga/User/Preferences/Store/IniStore.php
View File

@ -7,10 +7,8 @@ namespace Icinga\User\Preferences\Store;
use Icinga\Application\Config;
use Icinga\Exception\NotReadableError;
use Icinga\Exception\NotWritableError;
use Icinga\File\Ini\IniWriter;
use Icinga\User\Preferences;
use Icinga\User\Preferences\PreferencesStore;
use Icinga\Util\File;
/**
* Load and save user preferences from and to INI files
@ -31,13 +29,6 @@ class IniStore extends PreferencesStore
*/
protected $preferences = array();
/**
* Writer which stores the preferences
*
* @var IniWriter
*/
protected $writer;
/**
* Initialize the store
*/
@ -98,35 +89,7 @@ class IniStore extends PreferencesStore
*/
public function write()
{
if ($this->writer === null) {
if (! file_exists($this->preferencesFile)) {
if (! is_writable($this->getStoreConfig()->location)) {
throw new NotWritableError(
'Path to the preferences INI files %s is not writable',
$this->getStoreConfig()->location
);
}
File::create($this->preferencesFile, 0664);
}
if (! is_writable($this->preferencesFile)) {
throw new NotWritableError(
'Preferences INI file %s for user %s is not writable',
$this->preferencesFile,
$this->getUser()->getUsername()
);
}
$this->writer = new IniWriter(
array(
'config' => Config::fromArray($this->preferences),
'filename' => $this->preferencesFile
)
);
}
$this->writer->write();
Config::fromArray($this->preferences)->saveIni($this->preferencesFile);
}
/**

72
library/Icinga/Util/File.php
View File

@ -23,6 +23,13 @@ class File extends SplFileObject
*/
protected $openMode;
/**
* The access mode to use when creating directories
*
* @var int
*/
public static $dirMode = 1528; // 2770
/**
* @see SplFileObject::__construct()
*/
@ -37,21 +44,74 @@ class File extends SplFileObject
}
/**
* Create a file with an access mode
* Create a file using the given access mode and return a instance of File open for writing
*
* @param string $path The path to the file
* @param int $accessMode The access mode to set
* @param bool $recursive Whether missing nested directories of the given path should be created
*
* @return File
*
* @throws RuntimeException In case the file cannot be created or the access mode cannot be set
* @throws NotWritableError In case the path's (existing) parent is not writable
*/
public static function create($path, $accessMode)
public static function create($path, $accessMode, $recursive = true)
{
if (!@touch($path)) {
throw new RuntimeException('Cannot create file "' . $path . '" with acces mode "' . $accessMode . '"');
$dirPath = dirname($path);
if ($recursive && !is_dir($dirPath)) {
static::createDirectories($dirPath);
} elseif (! is_writable($dirPath)) {
throw new NotWritableError(sprintf('Path "%s" is not writable', $dirPath));
}
if (!@chmod($path, $accessMode)) {
throw new RuntimeException('Cannot set access mode "' . $accessMode . '" on file "' . $path . '"');
$file = new static($path, 'x');
if (! @chmod($path, $accessMode)) {
$error = error_get_last();
throw new RuntimeException(sprintf(
'Cannot set access mode "%s" on file "%s" (%s)',
decoct($accessMode),
$path,
$error['message']
));
}
return $file;
}
/**
* Create missing directories
*
* @param string $path
*
* @throws RuntimeException In case a directory cannot be created or the access mode cannot be set
*/
protected static function createDirectories($path)
{
$part = strpos($path, DIRECTORY_SEPARATOR) === 0 ? DIRECTORY_SEPARATOR : '';
foreach (explode(DIRECTORY_SEPARATOR, ltrim($path, DIRECTORY_SEPARATOR)) as $dir) {
$part .= $dir . DIRECTORY_SEPARATOR;
if (! is_dir($part)) {
if (! @mkdir($part, static::$dirMode)) {
$error = error_get_last();
throw new RuntimeException(sprintf(
'Failed to create missing directory "%s" (%s)',
$part,
$error['message']
));
}
if (! @chmod($part, static::$dirMode)) {
$error = error_get_last();
throw new RuntimeException(sprintf(
'Failed to set access mode "%s" for directory "%s" (%s)',
decoct(static::$dirMode),
$part,
$error['message']
));
}
}
}
}

37
library/Icinga/Web/Controller/ActionController.php
View File

@ -1,23 +1,22 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Web\Controller;
use Exception;
use Icinga\Authentication\Manager;
use Icinga\Application\Benchmark;
use Icinga\Application\Config;
use Icinga\Authentication\Manager;
use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError;
use Icinga\File\Pdf;
use Icinga\Security\SecurityException;
use Icinga\Util\Translator;
use Icinga\Web\Notification;
use Icinga\Web\Session;
use Icinga\Web\Url;
use Icinga\Web\UrlParams;
use Icinga\Web\Widget\Tabs;
use Icinga\Web\Window;
use Icinga\Web\Url;
use Icinga\Web\Notification;
use Icinga\File\Pdf;
use Icinga\Exception\ProgrammingError;
use Icinga\Web\Session;
use Icinga\Web\UrlParams;
use Zend_Controller_Action;
use Zend_Controller_Action_HelperBroker as ActionHelperBroker;
use Zend_Controller_Request_Abstract as Request;
@ -50,7 +49,7 @@ class ActionController extends Zend_Controller_Action
/**
* Authentication manager
*
* @type \Icinga\Authentication\Manager|null
* @type Manager|null
*/
private $auth;
@ -106,7 +105,6 @@ class ActionController extends Zend_Controller_Action
{
}
/**
* Get the authentication manager
*
@ -133,19 +131,16 @@ class ActionController extends Zend_Controller_Action
}
/**
* Throw an exception if user lacks the given permission
* Assert that the current user has the given permission
*
* @param string $name Permission name
* @throws Exception
* @param string $permission Name of the permission
*
* @throws SecurityException If the current user lacks the given permission
*/
public function assertPermission($name)
public function assertPermission($permission)
{
if (! $this->Auth()->hasPermission($name)) {
// TODO: Shall this be an Auth Exception? Or a 404?
throw new IcingaException(
'Auth error, no permission for "%s"',
$name
);
if (! $this->Auth()->hasPermission($permission)) {
throw new SecurityException('No permission for %s', $permission);
}
}

50
library/Icinga/Web/Form.php
View File

@ -1,6 +1,4 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Web;
@ -9,6 +7,8 @@ use Zend_Config;
use Zend_Form;
use Zend_View_Interface;
use Icinga\Application\Icinga;
use Icinga\Authentication\Manager;
use Icinga\Security\SecurityException;
use Icinga\Util\Translator;
use Icinga\Web\Form\Decorator\NoScriptApply;
use Icinga\Web\Form\Element\CsrfCounterMeasure;
@ -109,6 +109,13 @@ class Form extends Zend_Form
*/
protected $validatePartial = false;
/**
* Authentication manager
*
* @type Manager|null
*/
private $auth;
/**
* Default element decorators
*
@ -869,4 +876,43 @@ class Form extends Zend_Form
$this->create();
return parent::render($view);
}
/**
* Get the authentication manager
*
* @return Manager
*/
public function Auth()
{
if ($this->auth === null) {
$this->auth = Manager::getInstance();
}
return $this->auth;
}
/**
* Whether the current user has the given permission
*
* @param string $permission Name of the permission
*
* @return bool
*/
public function hasPermission($permission)
{
return $this->Auth()->hasPermission($permission);
}
/**
* Assert that the current user has the given permission
*
* @param string $permission Name of the permission
*
* @throws SecurityException If the current user lacks the given permission
*/
public function assertPermission($permission)
{
if (! $this->Auth()->hasPermission($permission)) {
throw new SecurityException('No permission for %s', $permission);
}
}
}

46
library/Icinga/Web/Widget/Dashboard.php
View File

@ -6,12 +6,9 @@ namespace Icinga\Web\Widget;
use Icinga\Application\Icinga;
use Icinga\Application\Config;
use Icinga\Data\ConfigObject;
use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotReadableError;
use Icinga\Exception\ProgrammingError;
use Icinga\Exception\SystemPermissionException;
use Icinga\File\Ini\IniWriter;
use Icinga\User;
use Icinga\Web\Widget\Dashboard\Pane;
use Icinga\Web\Widget\Dashboard\Dashlet as DashboardDashlet;
@ -86,13 +83,12 @@ class Dashboard extends AbstractWidget
}
/**
* Create a writer object
* Create and return a Config object for this dashboard
*
* @return IniWriter
* @return Config
*/
public function createWriter()
public function getConfig()
{
$configFile = $this->getConfigFile();
$output = array();
foreach ($this->panes as $pane) {
if ($pane->isUserWidget() === true) {
@ -105,17 +101,7 @@ class Dashboard extends AbstractWidget
}
}
$co = new ConfigObject($output);
$config = new Config($co);
return new IniWriter(array('config' => $config, 'filename' => $configFile));
}
/**
* Write user specific dashboards to disk
*/
public function write()
{
$this->createWriter()->write();
return Config::fromArray($output)->setConfigFile($this->getConfigFile());
}
/**
@ -438,28 +424,8 @@ class Dashboard extends AbstractWidget
public function getConfigFile()
{
if ($this->user === null) {
return '';
throw new ProgrammingError('Can\'t load dashboards. User is not set');
}
$baseDir = '/var/lib/icingaweb';
if (! file_exists($baseDir)) {
throw new NotReadableError('Could not read: ' . $baseDir);
}
$userDir = $baseDir . '/' . $this->user->getUsername();
if (! file_exists($userDir)) {
$success = @mkdir($userDir);
if (!$success) {
throw new SystemPermissionException('Could not create: ' . $userDir);
}
}
if (! file_exists($userDir)) {
throw new NotReadableError('Could not read: ' . $userDir);
}
return $userDir . '/dashboard.ini';
return Config::resolvePath('dashboards/' . $this->user->getUsername() . '/dashboard.ini');
}
}

10
library/Icinga/Web/Widget/Tab.php
View File

@ -138,6 +138,16 @@ class Tab extends AbstractWidget
$this->url = $url;
}
/**
* Get the tab's target URL
*
* @return Url
*/
public function getUrl()
{
return $this->url;
}
/**
* Set the parameters to be set for this tabs Url
*

4
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -375,7 +375,7 @@ class Monitoring_AlertsummaryController extends Controller
$query->order('notification_start_time', 'asc');
$records = $query->getQuery()->fetchAll();
$records = $query->getQuery()->fetchAll();
$interval = $this->getInterval();
$period = $this->createPeriod($interval);
@ -582,7 +582,7 @@ class Monitoring_AlertsummaryController extends Controller
} elseif ($interval === '1w') {
return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1D'), 7);
} elseif ($interval === '1m') {
return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1D'), 30);
return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1D'), 31);
} elseif ($interval === '1y') {
return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1M'), 12);
}

1
modules/monitoring/application/controllers/ProcessController.php
View File

@ -92,6 +92,7 @@ class Monitoring_ProcessController extends Controller
*/
public function disableNotificationsAction()
{
$this->assertPermission('monitoring/command/feature/instance');
$this->view->title = $this->translate('Disable Notifications');
$programStatus = $this->backend
->select()

48
modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
View File

@ -59,12 +59,16 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
public function createElements(array $formData = array())
{
if ((bool) $this->status->notifications_enabled) {
$notificationDescription = sprintf(
'<a title="%s" href="%s" data-base-target="_next">%s</a>',
$this->translate('Disable notifications for a specific time on a program-wide basis'),
$this->getView()->href('monitoring/process/disable-notifications'),
$this->translate('Disable temporarily')
);
if ($this->hasPermission('monitoring/command/feature/instance')) {
$notificationDescription = sprintf(
'<a title="%s" href="%s" data-base-target="_next">%s</a>',
$this->translate('Disable notifications for a specific time on a program-wide basis'),
$this->getView()->href('monitoring/process/disable-notifications'),
$this->translate('Disable temporarily')
);
} else {
$notificationDescription = null;
}
} elseif ($this->status->disable_notif_expire_time) {
$notificationDescription = sprintf(
$this->translate('Notifications will be re-enabled in <strong>%s</strong>'),
@ -73,13 +77,15 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
} else {
$notificationDescription = null;
}
$toggleDisabled = $this->hasPermission('monitoring/command/feature/instance') ? null : '';
$this->addElements(array(
array(
'checkbox',
ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
array(
'label' => $this->translate('Active Host Checks Being Executed'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -87,7 +93,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
array(
'label' => $this->translate('Active Service Checks Being Executed'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -95,7 +102,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
array(
'label' => $this->translate('Event Handlers Enabled'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -103,7 +111,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
array(
'label' => $this->translate('Flap Detection Enabled'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -122,7 +131,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
),
'Label',
array('HtmlTag', array('tag' => 'div'))
)
),
'disabled' => $toggleDisabled
)
),
array(
@ -130,7 +140,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
array(
'label' => $this->translate('Obsessing Over Hosts'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -138,7 +149,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
array(
'label' => $this->translate('Obsessing Over Services'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -146,7 +158,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
array(
'label' => $this->translate('Passive Host Checks Being Accepted'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -154,7 +167,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
array(
'label' => $this->translate('Passive Service Checks Being Accepted'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -162,7 +176,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
array(
'label' => $this->translate('Performance Data Being Processed'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
)
));
@ -191,6 +206,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
*/
public function onSuccess()
{
$this->assertPermission('monitoring/command/feature/instance');
foreach ($this->getValues() as $feature => $enabled) {
$toggleFeature = new ToggleInstanceFeatureCommand();
$toggleFeature

20
modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
View File

@ -28,13 +28,15 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
*/
public function createElements(array $formData = array())
{
$toggleDisabled = $this->hasPermission('monitoring/command/feature/instance') ? null : '';
$this->addElements(array(
array(
'checkbox',
ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
array(
'label' => $this->translate('Active Checks'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -42,7 +44,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
array(
'label' => $this->translate('Passive Checks'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -50,7 +53,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
ToggleObjectFeatureCommand::FEATURE_OBSESSING,
array(
'label' => $this->translate('Obsessing'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -58,7 +62,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
array(
'label' => $this->translate('Notifications'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -66,7 +71,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
array(
'label' => $this->translate('Event Handler'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
),
array(
@ -74,7 +80,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
array(
'label' => $this->translate('Flap Detection'),
'autosubmit' => true
'autosubmit' => true,
'disabled' => $toggleDisabled
)
)
));
@ -107,6 +114,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
*/
public function onSuccess()
{
$this->assertPermission('monitoring/command/feature/object');
foreach ($this->objects as $object) {
/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
foreach ($this->getValues() as $feature => $enabled) {

5
modules/monitoring/application/views/scripts/config/createbackend.phtml
View File

@ -1,2 +1,5 @@
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Add New Backend'); ?></h4>
<?= $form; ?>
<?= $form; ?>

7
modules/monitoring/application/views/scripts/config/createinstance.phtml
View File

@ -1,2 +1,5 @@
<h4><?= $this->translate('Add New Instance'); ?></h4>
<?= $form; ?>
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Add New Instance') ?></h4>
<?= $form; ?>

7
modules/monitoring/application/views/scripts/config/editbackend.phtml
View File

@ -1,2 +1,5 @@
<h4><?= $this->translate('Edit Existing Backend'); ?></h4>
<?= $form; ?>
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Edit Existing Backend') ?></h4>
<?= $form; ?>

5
modules/monitoring/application/views/scripts/config/editinstance.phtml
View File

@ -1,2 +1,5 @@
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Edit Existing Instance'); ?></h4>
<?= $form; ?>
<?= $form; ?>

7
modules/monitoring/application/views/scripts/config/removebackend.phtml
View File

@ -1,2 +1,5 @@
<h4><?= $this->translate('Remove Existing Backend'); ?></h4>
<?= $form; ?>
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Remove Existing Backend') ?></h4>
<?= $form; ?>

5
modules/monitoring/application/views/scripts/config/removeinstance.phtml
View File

@ -1,4 +1,7 @@
<div class="controls">
<?= $tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Remove Existing Instance'); ?></h4>
<p><?= $this->translate('Are you sure you want to remove this instance?'); ?></p>
<p><?= $this->translate('If you have still any environments or views referring to this instance, you won\'t be able to send commands anymore after deletion.'); ?></p>
<?= $form; ?>
<?= $form; ?>

4
modules/monitoring/application/views/scripts/list/hostgroups.phtml
View File

@ -28,7 +28,7 @@
</thead>
<tbody>
<?php foreach ($hostgroups as $h): ?>
<tr href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>">
<tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)) ?>">
<?php if ($h->services_critical_last_state_change_unhandled): ?>
<td class="state change critical unhandled">
<strong><?= $this->translate('CRITICAL'); ?></strong>
@ -84,7 +84,7 @@
</a>
</td>
<td class="total">
<?= $h->services_total; ?>
<?= $this->qlink($h->services_total, 'monitoring/list/services', array('hostgroup' => $h->hostgroup)) ?>
</td>
<td class="state">
<?php if ($h->services_ok): ?>

43
modules/monitoring/configuration.php
View File

@ -47,8 +47,8 @@ $this->providePermission(
$this->translate('Allow processing host and service check results')
);
$this->providePermission(
'monitoring/command/feature/program',
$this->translate('Allow processing commands for toggling features on a program-wide basis')
'monitoring/command/feature/instance',
$this->translate('Allow processing commands for toggling features on an instance-wide basis')
);
$this->providePermission(
'monitoring/command/feature/object',
@ -87,29 +87,36 @@ $this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/serv
* Problems Section
*/
$section = $this->menuSection($this->translate('Problems'), array(
'renderer' => 'ProblemMenuItemRenderer',
'icon' => 'block',
'priority' => 20
'renderer' => 'ProblemMenuItemRenderer',
'icon' => 'block',
'priority' => 20
));
$section->add($this->translate('Unhandled Hosts'), array(
'renderer' => 'UnhandledHostMenuItemRenderer',
'url' => 'monitoring/list/hosts?host_problem=1&host_handled=0',
'priority' => 40
'renderer' => 'UnhandledHostMenuItemRenderer',
'url' => 'monitoring/list/hosts?host_problem=1&host_handled=0',
'priority' => 30
));
$section->add($this->translate('Unhandled Services'), array(
'renderer' => 'UnhandledServiceMenuItemRenderer',
'url' => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity',
'priority' => 40
'renderer' => 'UnhandledServiceMenuItemRenderer',
'url' => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity',
'priority' => 40
));
$section->add($this->translate('Host Problems'), array(
'url' => 'monitoring/list/hosts?host_problem=1&sort=host_severity',
'priority' => 50
'url' => 'monitoring/list/hosts?host_problem=1&sort=host_severity',
'priority' => 50
));
$section->add($this->translate('Service Problems'), array(
'url' => 'monitoring/list/services?service_problem=1&sort=service_severity&dir=desc',
'priority' => 50
'url' => 'monitoring/list/services?service_problem=1&sort=service_severity&dir=desc',
'priority' => 60
));
$section->add($this->translate('Service Grid'), array(
'url' => 'monitoring/list/servicegrid?service_problem=1',
'priority' => 70
));
$section->add($this->translate('Current Downtimes'), array(
'url' => 'monitoring/list/downtimes?downtime_is_in_effect=1',
'priority' => 80
));
$section->add($this->translate('Current Downtimes'))->setUrl('monitoring/list/downtimes?downtime_is_in_effect=1');
/*
* Overview Section
@ -130,10 +137,6 @@ $section->add($this->translate('Services'), array(
'url' => 'monitoring/list/services',
'priority' => 50
));
$section->add($this->translate('Service Grid'), array(
'url' => 'monitoring/list/servicegrid?service_problem=1',
'priority' => 51
));
$section->add($this->translate('Servicegroups'), array(
'url' => 'monitoring/list/servicegroups',
'priority' => 60

52
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

@ -518,31 +518,35 @@ class StatusQuery extends IdoQuery
protected function joinServiceproblemsummary()
{
$sub = new Zend_Db_Expr('(SELECT'
. ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 0 ELSE 1 END) AS unhandled_services_count,'
. ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END) AS handled_services_count,'
. ' s.host_object_id FROM icinga_servicestatus ss'
. ' JOIN icinga_services s'
. ' ON s.service_object_id = ss.service_object_id'
. ' AND ss.current_state > 0'
. ' JOIN icinga_hoststatus hs'
. ' ON hs.host_object_id = s.host_object_id'
. ' GROUP BY s.host_object_id)');
$select = <<<'SQL'
SELECT
SUM(
CASE WHEN(ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
THEN 0
ELSE 1
END
) AS unhandled_services_count,
SUM(
CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0) ) > 0
THEN 1
ELSE 0
END
) AS handled_services_count,
s.host_object_id
FROM
icinga_servicestatus ss
JOIN icinga_objects o ON o.object_id = ss.service_object_id
JOIN icinga_services s ON s.service_object_id = o.object_id
JOIN icinga_hoststatus hs ON hs.host_object_id = s.host_object_id
WHERE
o.is_active = 1
AND o.objecttype_id = 2
AND ss.current_state > 0
GROUP BY
s.host_object_id
SQL;
$this->select->joinLeft(
array('sps' => $sub),
'sps.host_object_id = hs.host_object_id',
array()
);
return;
$this->select->joinleft(
array ('sps' => new \Zend_Db_Expr(
'(SELECT COUNT(s.service_object_id) as unhandled_service_count, s.host_object_id as host_object_id '.
'FROM icinga_services s INNER JOIN icinga_servicestatus ss ON ss.current_state != 0 AND '.
'ss.problem_has_been_acknowledged = 0 AND ss.scheduled_downtime_depth = 0 AND '.
'ss.service_object_id = s.service_object_id '.
'GROUP BY s.host_object_id'.
')')),
array('sps' => new Zend_Db_Expr('(' . $select . ')')),
'sps.host_object_id = hs.host_object_id',
array()
);

17
modules/monitoring/library/Monitoring/BackendStep.php
View File

@ -7,7 +7,6 @@ namespace Icinga\Module\Monitoring;
use Exception;
use Icinga\Module\Setup\Step;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
class BackendStep extends Step
{
@ -38,11 +37,9 @@ class BackendStep extends Step
);
try {
$writer = new IniWriter(array(
'config' => Config::fromArray($config),
'filename' => Config::resolvePath('modules/monitoring/backends.ini')
));
$writer->write();
Config::fromArray($config)
->setConfigFile(Config::resolvePath('modules/monitoring/backends.ini'))
->saveIni();
} catch (Exception $e) {
$this->backendIniError = $e;
return false;
@ -61,13 +58,7 @@ class BackendStep extends Step
try {
$config = Config::app('resources', true);
$config->setSection($resourceName, $resourceConfig);
$writer = new IniWriter(array(
'config' => $config,
'filename' => Config::resolvePath('resources.ini'),
'filemode' => 0660
));
$writer->write();
$config->saveIni();
} catch (Exception $e) {
$this->resourcesIniError = $e;
return false;

9
modules/monitoring/library/Monitoring/InstanceStep.php
View File

@ -7,7 +7,6 @@ namespace Icinga\Module\Monitoring;
use Exception;
use Icinga\Module\Setup\Step;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
class InstanceStep extends Step
{
@ -27,11 +26,9 @@ class InstanceStep extends Step
unset($instanceConfig['name']);
try {
$writer = new IniWriter(array(
'config' => Config::fromArray(array($instanceName => $instanceConfig)),
'filename' => Config::resolvePath('modules/monitoring/instances.ini')
));
$writer->write();
Config::fromArray(array($instanceName => $instanceConfig))
->setConfigFile(Config::resolvePath('modules/monitoring/instances.ini'))
->saveIni();
} catch (Exception $e) {
$this->error = $e;
return false;

23
modules/monitoring/library/Monitoring/MonitoringWizard.php
View File

@ -4,14 +4,13 @@
namespace Icinga\Module\Monitoring;
use Icinga\Application\Icinga;
use Icinga\Application\Platform;
use Icinga\Web\Form;
use Icinga\Web\Wizard;
use Icinga\Web\Request;
use Icinga\Module\Setup\Setup;
use Icinga\Module\Setup\SetupWizard;
use Icinga\Module\Setup\Requirements;
use Icinga\Module\Setup\Utils\MakeDirStep;
use Icinga\Module\Setup\Forms\SummaryPage;
use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
@ -108,8 +107,6 @@ class MonitoringWizard extends Wizard implements SetupWizard
$pageData = $this->getPageData();
$setup = new Setup();
$setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
$setup->addStep(
new BackendStep(array(
'backendConfig' => $pageData['setup_monitoring_backend'],
@ -139,6 +136,22 @@ class MonitoringWizard extends Wizard implements SetupWizard
*/
public function getRequirements()
{
return new Requirements();
$requirements = new Requirements();
$requirements->addOptional(
'existing_php_mod_sockets',
mt('monitoring', 'PHP Module: Sockets'),
mt(
'monitoring',
'In case it\'s desired that a TCP connection is being used by Icinga Web 2 to'
. ' access a Livestatus interface, the Sockets module for PHP is required.'
),
Platform::extensionLoaded('sockets'),
Platform::extensionLoaded('sockets') ? mt('monitoring', 'The PHP Module sockets is available.') : (
mt('monitoring', 'The PHP Module sockets is not available.')
)
);
return $requirements;
}
}

9
modules/monitoring/library/Monitoring/SecurityStep.php
View File

@ -7,7 +7,6 @@ namespace Icinga\Module\Monitoring;
use Exception;
use Icinga\Module\Setup\Step;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
class SecurityStep extends Step
{
@ -26,11 +25,9 @@ class SecurityStep extends Step
$config['security'] = $this->data['securityConfig'];
try {
$writer = new IniWriter(array(
'config' => Config::fromArray($config),
'filename' => Config::resolvePath('modules/monitoring/config.ini')
));
$writer->write();
Config::fromArray($config)
->setConfigFile(Config::resolvePath('modules/monitoring/config.ini'))
->saveIni();
} catch (Exception $e) {
$this->error = $e;
return false;

17
modules/setup/library/Setup/Steps/AuthenticationStep.php
View File

@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
use Exception;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
use Icinga\Data\ConfigObject;
use Icinga\Data\ResourceFactory;
use Icinga\Authentication\Backend\DbUserBackend;
@ -50,11 +49,9 @@ class AuthenticationStep extends Step
}
try {
$writer = new IniWriter(array(
'config' => Config::fromArray($config),
'filename' => Config::resolvePath('authentication.ini')
));
$writer->write();
Config::fromArray($config)
->setConfigFile(Config::resolvePath('authentication.ini'))
->saveIni();
} catch (Exception $e) {
$this->authIniError = $e;
return false;
@ -73,11 +70,9 @@ class AuthenticationStep extends Step
);
try {
$writer = new IniWriter(array(
'config' => Config::fromArray($config),
'filename' => Config::resolvePath('permissions.ini')
));
$writer->write();
Config::fromArray($config)
->setConfigFile(Config::resolvePath('permissions.ini'))
->saveIni();
} catch (Exception $e) {
$this->permIniError = $e;
return false;

9
modules/setup/library/Setup/Steps/GeneralConfigStep.php
View File

@ -7,7 +7,6 @@ namespace Icinga\Module\Setup\Steps;
use Exception;
use Icinga\Application\Logger;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
use Icinga\Module\Setup\Step;
class GeneralConfigStep extends Step
@ -35,11 +34,9 @@ class GeneralConfigStep extends Step
}
try {
$writer = new IniWriter(array(
'config' => Config::fromArray($config),
'filename' => Config::resolvePath('config.ini')
));
$writer->write();
Config::fromArray($config)
->setConfigFile(Config::resolvePath('config.ini'))
->saveIni();
} catch (Exception $e) {
$this->error = $e;
return false;

10
modules/setup/library/Setup/Steps/ResourceStep.php
View File

@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
use Exception;
use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
use Icinga\Module\Setup\Step;
class ResourceStep extends Step
@ -38,12 +37,9 @@ class ResourceStep extends Step
}
try {
$writer = new IniWriter(array(
'config' => Config::fromArray($resourceConfig),
'filename' => Config::resolvePath('resources.ini'),
'filemode' => 0660
));
$writer->write();
Config::fromArray($resourceConfig)
->setConfigFile(Config::resolvePath('resources.ini'))
->saveIni();
} catch (Exception $e) {
$this->error = $e;
return false;

4
modules/setup/library/Setup/Utils/MakeDirStep.php
View File

@ -16,12 +16,12 @@ class MakeDirStep extends Step
/**
* @param array $paths
* @param int $dirmode Directory mode in octal notation
* @param int $dirmode
*/
public function __construct($paths, $dirmode)
{
$this->paths = $paths;
$this->dirmode = octdec((string) $dirmode);
$this->dirmode = $dirmode;
$this->errors = array();
}

12
modules/setup/library/Setup/WebWizard.php
View File

@ -334,18 +334,6 @@ class WebWizard extends Wizard implements SetupWizard
);
}
$configDir = Icinga::app()->getConfigDir();
$setup->addStep(
new MakeDirStep(
array(
$configDir . DIRECTORY_SEPARATOR . 'modules',
$configDir . DIRECTORY_SEPARATOR . 'preferences',
$configDir . DIRECTORY_SEPARATOR . 'enabledModules'
),
2770
)
);
foreach ($this->getWizards() as $wizard) {
if ($wizard->isComplete()) {
$setup->addSteps($wizard->getSetup()->getSteps());

122
public/js/icinga/loader.js
View File

@ -24,8 +24,6 @@
this.failureNotice = null;
this.exception = null;
/**
* Pending requests
*/
@ -109,7 +107,8 @@
url : url,
data : data,
headers: headers,
context: self
context: self,
failure: false
});
req.$target = $target;
@ -313,15 +312,12 @@
onResponse: function (data, textStatus, req) {
var self = this;
if (this.failureNotice !== null) {
this.failureNotice.remove();
if (! this.failureNotice.hasClass('fading-out')) {
this.failureNotice.remove();
}
this.failureNotice = null;
}
if (this.exception !== null) {
this.exception.remove();
this.exception = null;
}
// Remove 'impact' class if there was such
if (req.$target.hasClass('impact')) {
req.$target.removeClass('impact');
@ -346,42 +342,11 @@
var rendered = false;
var classes;
if (! req.autorefresh) {
// TODO: Hook for response/url?
var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
var $matches = $.merge($('[href="' + url + '"]'), $forms);
$matches.each(function (idx, el) {
if ($(el).closest('#menu').length) {
if (req.$target[0].id === 'col1') {
self.icinga.behaviors.navigation.resetActive();
}
} else if ($(el).closest('table.action').length) {
$(el).closest('table.action').find('.active').removeClass('active');
}
});
$matches.each(function (idx, el) {
var $el = $(el);
if ($el.closest('#menu').length) {
if ($el.is('form')) {
$('input', $el).addClass('active');
} else {
if (req.$target[0].id === 'col1') {
self.icinga.behaviors.navigation.setActive($el);
}
}
// Interrupt .each, only on menu item shall be active
return false;
} else if ($(el).closest('table.action').length) {
$el.addClass('active');
}
});
} else {
if (req.autorefresh) {
// TODO: next container url
active = $('[href].active', req.$target).attr('href');
}
var target = req.getResponseHeader('X-Icinga-Container');
var newBody = false;
var oldNotifications = false;
@ -555,10 +520,43 @@
* Regardless of whether a request succeeded of failed, clean up
*/
onComplete: function (req, textStatus) {
if (! req.autorefresh) {
// TODO: Hook for response/url?
var url = req.url;
var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
var $matches = $.merge($('[href="' + url + '"]'), $forms);
$matches.each(function (idx, el) {
if ($(el).closest('#menu').length) {
if (req.$target[0].id === 'col1') {
self.icinga.behaviors.navigation.resetActive();
}
} else if ($(el).closest('table.action').length) {
$(el).closest('table.action').find('.active').removeClass('active');
}
});
$matches.each(function (idx, el) {
var $el = $(el);
if ($el.closest('#menu').length) {
if ($el.is('form')) {
$('input', $el).addClass('active');
} else {
if (req.$target[0].id === 'col1') {
self.icinga.behaviors.navigation.setActive($el);
}
}
// Interrupt .each, only on menu item shall be active
return false;
} else if ($(el).closest('table.action').length) {
$el.addClass('active');
}
});
}
// Update history when necessary. Don't do so for requests triggered
// by history or autorefresh events
if (! req.historyTriggered && ! req.autorefresh) {
if (req.$target.hasClass('container')) {
if (req.$target.hasClass('container') && req.failure === false) {
// We only want to care about top-level containers
if (req.$target.parent().closest('.container').length === 0) {
this.icinga.history.pushCurrentState();
@ -594,18 +592,18 @@
onFailure: function (req, textStatus, errorThrown) {
var url = req.url;
if (req.status === 500) {
if (this.exception === null) {
req.$target.addClass('impact');
req.failure = true;
this.exception = this.createNotice(
'error',
$('h1', $(req.responseText)).first().html(),
true
);
this.icinga.ui.fixControls();
}
} else if (req.status > 0) {
/*
* Test if a manual actions comes in and autorefresh is active: Stop refreshing
*/
if (! req.historyTriggered && ! req.autorefresh && req.$target.data('icingaRefresh') > 0
&& req.$target.data('icingaUrl') !== url) {
req.$target.data('icingaRefresh', 0);
req.$target.data('icingaUrl', url);
}
if (req.status > 0) {
this.icinga.logger.error(
req.status,
errorThrown + ':',
@ -617,9 +615,6 @@
req.action,
req.autorefresh
);
// Header example:
// Icinga.debug(req.getResponseHeader('X-Icinga-Redirect'));
} else {
if (errorThrown === 'abort') {
this.icinga.logger.debug(
@ -660,7 +655,13 @@
var $notice = $(
'<li class="' + c + '">' + message + '</li>'
).appendTo($('#notifications'));
this.icinga.ui.fixControls();
if (!persist) {
this.icinga.ui.fadeNotificationsAway();
}
return $notice;
},
@ -721,11 +722,12 @@
// $container.html(content);
} else {
if ($container.closest('.dashboard').length &&
! $('h1', $content).length
if ($container.closest('.dashboard').length
) {
var title = $('h1', $container).first().detach();
$('h1', $content).first().detach();
if (! $('h1', $content).length) {
var title = $('h1', $container).first().detach();
$('h1', $content).first().detach();
}
$container.html(title).append(content);
} else if (action === 'replace') {
$container.html(content);