Commit Graph

526 Commits

Author SHA1 Message Date
Alexander Fuhr c3fe14a205 Modules/Manager: Fix that non-existent modules can be disabled
fixes #9374
2015-08-04 14:34:30 +02:00
Johannes Meyer 316a4d8b82 Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609 2015-07-30 16:16:04 +02:00
Eric Lippmann 42d698a6b3 lib: Add Web::getResponse()
Use this method for retrieving the response object outside a controller.

refs #9660
2015-07-30 13:47:54 +02:00
Eric Lippmann ce2a196c4a lib/Web: Set up request before setting up the user
refs #9660
2015-07-29 17:22:10 +02:00
Eric Lippmann db48a944e3 lib: Introduce Web::getRequest()
Basic auth will need the request before we set up the front controller.

refs #9660
2015-07-29 16:27:48 +02:00
Johannes Meyer 13edbf901d UserBackend: Implement interface ConfigAwareFactory
refs #9609
2015-07-29 13:44:26 +02:00
Eric Lippmann 07849e0fea lib: Rename Authentication/Manager to Authentication/Auth
refs #9660
2015-07-28 17:08:55 +02:00
Eric Lippmann 7cfc78558d Merge branch 'master' into feature/secure-modules-9644
Conflicts:
	library/Icinga/Exception/IcingaException.php
2015-07-28 13:42:02 +02:00
Johannes Meyer 982e226db0 IcingaException: Add utility method to format exceptions as one-liner 2015-07-24 16:19:20 +02:00
Eric Lippmann 149a974a44 Fix coding style in Module.php
refs #9644
2015-07-24 15:06:25 +02:00
Eric Lippmann 519d025de5 Allow to get permissions and restrictions from unloaded modules
refs #9644
2015-07-24 14:24:48 +02:00
Eric Lippmann 444fdadf13 Allow to get unloaded modules via Manager::getModule()
refs #9644
2015-07-24 14:23:48 +02:00
Eric Lippmann ec1ddd82b3 Move Module::__construct to the top of the function list
refs #9664
2015-07-24 14:19:17 +02:00
Eric Lippmann 5dcc307e87 Add namespace for module permissions to the module manager
refs #9644
2015-07-22 14:59:35 +02:00
Paul Richards aac5d49eed IIS: use 'config' folder within icingaweb root instead of '/etc/icingaweb2' on Windows
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Make use of Platform::isWindows()
Call ::setupAutoloader() before that

fixes #8916
2015-06-12 14:46:00 +02:00
Paul Richards edd8f5738f Windows: Fix webrouter on IIS
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Remove unneeded whitespace

fixes #8914
2015-06-12 14:05:40 +02:00
Alexander A. Klimov 7ea6eeb20d Revert "Don't use /etc/icingaweb2 as config path on Windows"
This reverts commit 48870bb7e2.
2015-06-12 13:29:36 +02:00
Alexander A. Klimov 48870bb7e2 Don't use /etc/icingaweb2 as config path on Windows
fixes #8916
2015-06-12 11:57:44 +02:00
Alexander A. Klimov 1e0219f697 Revert "IIS: use 'config' folder within icingaweb root on windows"
This reverts commit 4607a85cf5.
2015-06-12 10:38:11 +02:00
Paul Richards 4607a85cf5 IIS: use 'config' folder within icingaweb root on windows
fixes #8916
2015-06-11 18:10:37 +02:00
Alexander A. Klimov 1bd18c5adb Merge branch 'feature/Show-Icinga-Web-2-s-version-in-the-frontend-9247'
resolves #9247
2015-06-08 12:40:14 +02:00
Alexander A. Klimov 6a914dc25b Merge branch 'bugfix/Show-all-shell-commands-required-to-get-ready-in-the-setup-wizard-8705'
fixes #8705
2015-06-05 18:40:07 +02:00
Alexander A. Klimov 76e748c483 Don't throw any exception
refs #8705
2015-06-05 17:12:32 +02:00
Alexander A. Klimov cbc731034a Don't throw any exception
refs #9247
2015-06-05 10:23:17 +02:00
Alexander A. Klimov 602f0cf755 Move Version to Icinga\Application\
refs #9247
2015-06-05 10:18:24 +02:00
Alexander A. Klimov b842a39650 Implement ::getLinuxDistro()
refs #8705
2015-05-26 18:23:26 +02:00
Johannes Meyer ec556edc65 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-26 09:28:35 +02:00
Eric Lippmann 53ca68903a Merge branch 'bugfix/time-formatting-6778'
fixes #6778
2015-05-22 11:34:43 +02:00
Johannes Meyer 265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +02:00
Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Marius Hein 0002c0be26 Provide default config name for Module::getConfig() 2015-05-21 14:40:52 +02:00
Eric Lippmann ba258524a8 Don't setup the DateTimeFactory when bootstrapping Icinga Web 2
DateTimeFactory will be removed soon.

refs #6778
2015-05-19 11:23:50 +02:00
Johannes Meyer 0a387573f3 Logger: Fix substitution of exception messages 2015-05-13 10:46:34 +02:00
Johannes Meyer f1f1710f47 Config: Add method getConfigObject to access the internal ConfigObject 2015-05-06 08:07:42 +02:00
Johannes Meyer 5cc7f26728 ConfigObject: Extend ArrayDatasource
This makes it possible to use a ini file as repository!!!1
One thing is missing: Section names are currently ignored and should be
mapped to a virtual column.

refs #8826
2015-05-05 15:21:34 +02:00
Johannes Meyer d09ea2845d Merge branch 'master' into feature/user-and-group-management-8826 2015-04-30 15:20:40 +02:00
Alexander A. Klimov 5ba539b7c1 SyslogWriter: replace \n w/ 4 spaces in multiline log messages 2015-04-24 10:28:45 +02:00
Alexander A. Klimov a429617a95 Revert "Log each line of a multiline log message separatly"
This reverts commit 39042ab306.
2015-04-24 10:17:35 +02:00
Alexander A. Klimov 39042ab306 Log each line of a multiline log message separatly
resolves #9000
2015-04-23 17:44:00 +02:00
Alexander A. Klimov 1daecbbca0 Don't use `false === ...' when `! ...' is enough 2015-04-22 17:04:31 +02:00
Alexander A. Klimov 9393d11c0b Display an error message when enabled modules cannot be read because /etc/icingaweb2 is not readable
resolves #9141
2015-04-22 16:44:00 +02:00
Johannes Meyer 7960e911a6 UserGroupBackend: Add support for custom backends to fetch user groups
refs #8826
refs #9122
2015-04-22 09:52:08 +02:00
Johannes Meyer 847c02ed8e UserBackend: Add support for custom authentication backends
refs #8826
refs #8877
2015-04-22 09:28:42 +02:00
Johannes Meyer 33628cbf04 Icinga\Application\Modules\Module: Add missing documentation 2015-04-22 09:06:26 +02:00
Johannes Meyer 8dba5752dc ModuleManager: Improve error messages when en-/disabling modules 2015-04-20 10:09:33 +02:00
Johannes Meyer 36fed03764 Do not log that the logging configuration is invalid on every request
Instead, log those messages *everytime* a subsequent message is being
logged.

refs #8957
2015-04-13 17:11:42 +02:00
Johannes Meyer 67ad575cf5 Set the configured logging level even if the configured logging type is invalid
refs #8957
2015-04-13 17:09:49 +02:00
Alexander Klimov 967a2e82dc Use (only) "@return $this" in fluent interfaces' documentation 2015-04-07 14:24:11 +02:00
Johannes Meyer b0b95ab387 Fix that Icinga\Application\Logger::writesTo* is not functional 2015-04-07 10:31:57 +02:00
Thomas Gelf 63f87da53d Session: reworked to avoid duplicate notifications
* clear session on initialization, store once on shutdown
* less static method calls
* fixes erraneous cli checks
2015-03-13 14:10:27 +01:00
Eric Lippmann c1d5231619 Add priority param to Module::provideSearchUrl()
refs #8668
2015-03-12 17:55:29 +01:00
Eric Lippmann 29d5fd351b Merge branch 'bugfix/logout-external-8626'
fixes #8626
2015-03-12 16:47:49 +01:00
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Eric Lippmann 0806ab3ec9 Remove strict equality for $auth->isAuthenticated() 2015-03-11 22:26:03 +01:00
Eric Lippmann 64ad54ebd6 Optimize imports in Web.php 2015-03-11 22:08:28 +01:00
Eric Lippmann a835cad31f Remove a nonsense TODO from Web.php
TODOs for replacing Zend classes are unnecessary.
2015-03-11 22:06:23 +01:00
Eric Lippmann c54648244e Remove newlines from Web.php 2015-03-11 22:05:23 +01:00
Eric Lippmann c47164601a Don't alias Zend_Controller_Action_HelperBroker in Web.php 2015-03-11 22:03:49 +01:00
Eric Lippmann dfa7e20b74 Don't use Icinga\Authentication\Manager twice 2015-03-11 22:01:41 +01:00
Eric Lippmann 9e81370551 Removed unused use ... in Web.php 2015-03-11 22:00:09 +01:00
Eric Lippmann 32ca28bc46 Use @return $this for documenting fluent interfaces 2015-03-11 21:58:41 +01:00
Eric Lippmann ac2522af20 Merge branch 'master' into bugfix/logout-external-8626 2015-03-11 21:55:52 +01:00
Eric Lippmann 7fe4b3d7ab Fix PHPDoc of Web::detectLocale() 2015-03-11 21:55:04 +01:00
Eric Lippmann 29d4ad69b9 Remove // @codeCoverageIgnoreEnd
This is obsolete.
2015-03-11 21:50:41 +01:00
Eric Lippmann d102a61e22 Fix Undefined index: HTTP_ACCEPT_LANGUAGE
fixes #8370
2015-03-11 20:50:05 +01:00
Johannes Meyer 4badbc660b Merge branch 'master' into feature/conditional-requirements-8508 2015-03-09 08:51:03 +01:00
Louis Sautier 083c1a9e6b Fix some spelling errors in comments and messages
fixes #8633

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-03-08 15:32:22 +01:00
Johannes Meyer f45f00b022 Run a module's configuration script only in case it has been registered
fixes #8601
2015-03-06 13:25:04 +01:00
Johannes Meyer 6e61980dd2 Fix operator precedence when detecting the default locale
fixes #8370
2015-03-04 08:28:30 +01:00
Johannes Meyer 85e6fce867 Rename Platform::zendClassExists() to Platform::classExists() 2015-02-25 13:33:42 +01:00
Johannes Meyer a5514392db Adjust dashboard, output-format and module tabs 2015-02-23 17:03:11 +01:00
Johannes Meyer ca0914644c Use "icingaweb2" instead of "icingaweb" as default syslog prefix 2015-02-12 14:01:59 +01:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header"
This reverts commit 338d067aba.
2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Alexander Klimov a6cea24934 Platform::zendClassExists(): don't fail if a Zend class file doesn't exist 2015-02-03 12:22:23 +01:00
Johannes Meyer f5a651664c Create the enabledModules directory when necessary only as well
refs #8219
2015-01-30 16:16:12 +01:00
Johannes Meyer 9426a5bd23 Use File::create() in Config::saveIni() to create missing nested directories
refs #8219
2015-01-30 15:43:02 +01:00
Johannes Meyer 63305fdf9a Add Icinga\Application\Config::saveIni()
Simplifies saving INI files. Icinga\File\Ini\IniWriter does already require an
instance of Icinga\Application\Config so it's obvious to give "Config" the
task to initialize the writer.. We do also have a central place to handle
creating missing ancestor directories now.

refs #8219
2015-01-30 09:32:08 +01:00
Johannes Meyer 47b27fcfe4 setup: Look for the authentication.ini instead of the config.ini
The config.ini does not include any settings mandatory to operate
Icinga Web 2, but the authentication.ini does.

refs #8134
2015-01-27 13:34:59 +01:00
Eric Lippmann 7bd42b476f bootstrap: Load setup module in case the setup token exists
The web setup may write the config.ini even if it errors. Thus our bootstrap
has to load the setup module whenever the setup.token exists.
Another approach would to write the config.ini in our web setup at the very end.
2015-01-23 15:27:52 +01:00
Eric Lippmann ac503031a7 Config: Fix PHPDoc for fromIni 2015-01-19 11:43:39 +01:00
Eric Lippmann 87adbacb3b Config: Fix coding style 2015-01-19 11:43:39 +01:00
Eric Lippmann 599cb620d8 Config: Don't throw NotReadableError if the file does not exist 2015-01-19 11:43:39 +01:00
Eric Lippmann b983f1901b modules: Fix that the forms namespace is not registered when the module does not have any library file 2015-01-14 13:24:31 +01:00
Eric Lippmann 58cfb67983 Load setup module when necessary when bootstrapping the CLI
fixes #8146
2014-12-30 09:27:37 +01:00
Eric Lippmann 839523a73f Web: Load setup module if necessary 2014-12-29 14:31:34 +01:00
Eric Lippmann 611d01788f Add setup related utility functions to ApplicationBootstrap.php 2014-12-29 14:29:31 +01:00
Eric Lippmann 7d36a59c67 Use '@return $this' instead of '@return self' for document fluent interfaces in ApplicationBootstrap.php 2014-12-29 14:01:19 +01:00
Eric Lippmann fdd06697b3 Web: Use our own dispatcher
refs #5786
2014-12-18 17:12:11 +01:00
Eric Lippmann 8ec0740005 Merge branch 'master' into feature/packages-4075 2014-12-18 14:02:17 +01:00
Johannes Meyer bca28a5ae2 Display inline pie-charts also in views exported to PDF
fixes #6463
2014-12-15 13:55:20 +01:00
Eric Lippmann 68e460b5d1 Remove unused use in EmbeddedWeb 2014-12-10 09:32:02 +01:00
Eric Lippmann 888fa90fe2 Fix typo in PHPDoc in EmbeddedWeb 2014-12-10 09:31:37 +01:00
Eric Lippmann 2b5fe7baf4 Set default config dir to '/etc/icingaweb2' 2014-12-10 09:30:12 +01:00
Eric Lippmann 916868a051 Revert "Add support for "core" modules and make the setup module such a module"
This reverts commit 8af13f564b.

The setup module must only be loaded when necessary not always.
2014-12-09 16:28:05 +01:00
Eric Lippmann 7d00f68660 Revert "Load core modules also when bootstrapping the CLI"
This reverts commit f12473d34b.

The CLI must not load core modules, i.e. setup.
2014-12-09 16:27:04 +01:00
Johannes Meyer 196b6a4875 Ensure that Zend is loaded when showing status information in the CLI
fixes #7869
2014-12-09 15:38:13 +01:00
Thomas Gelf 09e59ba44a Modules\Module: determine correct config dir 2014-12-03 10:43:27 +01:00