d4de7c0519
lib: Make Loader::registerNamespace() fluent
...
refs #5786
2015-08-17 13:29:15 +02:00
e8c0e97bb3
Add PHPDoc to the Dispatcher
...
refs #5786
2015-08-17 13:10:01 +02:00
f972a034e7
Fix license header in Dispatcher
...
refs #5786
2015-08-17 13:08:41 +02:00
392eee5a1f
Merge branch 'master' into feature/namespaced-controllers-5786
...
Conflicts:
library/Icinga/Application/Web.php
2015-08-17 12:59:44 +02:00
97245c5166
FilterEditor: Uppercase all words for non labelled filter columns
...
refs #9029
2015-08-14 15:36:54 +02:00
ca4789f114
FilterEditor: Fix automatic filter label creation
...
refs #9029
2015-08-13 17:20:40 +02:00
1e6c394693
Controller: Create the filter editor in setupFilterControl() ...
...
...instead of demanding a concrete controller to do so.
We still have to decide how to handle parameter preservation
properly.
refs #9029
2015-08-13 17:05:13 +02:00
63fb8dcafa
FilterEditor: Do not show an empty line at the bottom of the select
2015-08-13 15:59:00 +02:00
41b80efa0e
FilterEditor: Support queries implementing the FilterColumns interface
...
refs #9029
2015-08-13 15:58:04 +02:00
59e7731efb
RepositoryQuery: Implement interface FilterColumns
...
refs #9029
2015-08-13 14:21:39 +02:00
bcdb670f5c
Introduce interface Icinga\Data\FilterColumns
...
refs #9029
2015-08-13 14:21:11 +02:00
38622e96d5
Repository: Allow implementations to provide search columns
...
refs #9029
2015-08-13 14:20:21 +02:00
4b6849eea7
Repository: Introduce query column blacklists
...
We can no longer use $filterColumns to blacklist query columns so
there is now another set of column names required to achieve this.
refs #9029
2015-08-13 14:06:27 +02:00
2e7ff7dd6e
FilterEditor: Require an instance of Filterable for setQuery()
...
refs #9029
2015-08-13 11:35:45 +02:00
fc35f3e46b
FilterEditor: Apply the filter on the query internally
...
refs #9029
2015-08-13 11:33:25 +02:00
069fcc40ea
FilterEditor: Accept null for method setColumns()
...
refs #9029
2015-08-13 11:30:26 +02:00
9ad14fc644
FilterEditor: Accept null for method setSearchColumns()
...
refs #9029
2015-08-13 11:30:05 +02:00
a9ff6eebc0
Merge branch 'master' into bugfix/cookie-support-7383
2015-08-13 11:22:14 +02:00
813154f6ef
Cookie: Make it no static and use the request
...
refs #7383
2015-08-13 11:19:48 +02:00
2332b94f0b
Request: Add getResponse() to retrieve the Response
...
refs #7383
2015-08-13 11:19:08 +02:00
fa1e3a763d
Do not show the full layout on the login page
...
...
refs #9892
2015-08-13 08:12:30 +02:00
ad8f16c185
Cookie: Set the rigth license line header
...
refs #7383
2015-08-11 16:37:05 +02:00
cea3727c97
Merge conflicts
2015-08-11 16:35:14 +02:00
1495cf5d04
Merge branch 'bugfix/icingacli-no-request-object-9375'
...
fixes #9375
2015-08-11 09:20:59 +02:00
438f2650db
Conform to coding guidelines
...
Use exclusively getters and setters for accessing class variables. Add better documentation to INI parser and writer classes.
2015-08-10 15:15:40 +02:00
fe805c82ca
Support multi line values in INI files
2015-08-10 15:15:40 +02:00
aa4e3c5a22
Dashboard: Defer construction of the Url object to Dashlet::getUrl()
...
Before, the Url object was constructed in Dashlet::setUrl() and Dashlet::__construct8) which lead to an exception when parsing a module's configuration.php from our CLI.
refs #9375
2015-08-10 14:05:08 +02:00
1363ea4370
Menu: Defer construction of the Url object to Menu::getUrl()
...
Before, the Url object was constructed in Menu::setUrl() which lead to an exception when parsing a module's configuration.php from our CLI.
refs #9375
2015-08-10 14:05:00 +02:00
b0a75dd89b
lib: Fix PHPDoc in ConfigObject
2015-08-10 13:25:08 +02:00
282aaa6e5b
Load additional static files for modules, really
...
Since we're only processing the config script upon calling
Module::hasJs/Css() if no module.js or module.css exists,
we need to ensure that it's processed when calling
Module::getJS/CssFiles().
refs #9702
2015-08-10 10:00:02 +02:00
aa3cc9847d
Fix issue that bricked the dashboard when quotes in dashlets
...
Escape more special chars in IniWriter, support reading escaped readers in IniParser and add tests for all important escape cases.
2015-08-07 12:55:19 +02:00
308c8ccf79
Fix issue that caused exceptions when using sections with trailing or leading whitespaces
...
Trim all incoming section identifier to prevent ambiguities between parsd sections and input sections.
2015-08-07 09:26:50 +02:00
eebd8be746
Prevent configuration changes that would break PHP lib ini parser
2015-08-06 17:39:46 +02:00
9b373e9d10
Fix issue that caused IniWriter to fail on empty configs
2015-08-06 17:21:52 +02:00
c7cc9e66df
JavaScript: Load all available module javascript files
...
refs #9702
2015-08-06 15:15:02 +02:00
9cea83242c
StyleSheet: Load all available module stylesheets
...
refs #9702
2015-08-06 15:14:29 +02:00
712d545f48
Module: Allow to define additional Javascript files
...
refs #9702
2015-08-06 15:10:54 +02:00
51aa22d429
Module: Allow to define additional CSS/LESS files
...
refs #9702
2015-08-06 15:10:33 +02:00
59ef54314a
Extend the Web bootstrapper from the EmbeddedWeb bootstrapper
...
In a embedded web environment we may also need a request and response.
refs #9702
2015-08-06 15:08:41 +02:00
0695d5900c
Merge branch 'master' into feature/less-costly-count-queries-for-history-views-8615
2015-08-06 13:11:28 +02:00
528382098e
db: Respect group by for count queries, really
...
Missed that Johannes introduced DbQuery::getGroup().
refs #9828
2015-08-06 10:46:40 +02:00
7662545c2a
SimpleQuery: Provide a getter for the current iterator position
...
refs #8615
2015-08-06 09:39:23 +02:00
60675979bc
Merge branch 'bugfix/creating-dashlet-with-parentheses-9530'
...
fixes #9530
2015-08-05 18:22:29 +02:00
f8e2dc850c
Drop IniEditor and clean up IniWriter
...
Replace the ini editor code with a new parser implementation that manipulates a DOM. Do not support capabillities that are no longer needed, like nested configurations, section inheritance, section-less properties.
2015-08-05 18:10:17 +02:00
a0d5509f19
DbQuery: Drop attribute $maxCount
...
It's not used anywhere and completely useless the way it's implemented.
2015-08-05 10:54:14 +02:00
064e821383
lib: Fix wrong count for queries having a group by clause
...
fixes #9828
2015-08-04 16:25:34 +02:00
28e1b3119c
Remove unused "extends"-code
2015-08-04 15:14:10 +02:00
c3fe14a205
Modules/Manager: Fix that non-existent modules can be disabled
...
fixes #9374
2015-08-04 14:34:30 +02:00
7095ad5bc7
Improve ini editor and dashlet input validation
2015-08-04 13:23:30 +02:00
d88c628b6b
Escape section names before applying regex
...
refs #9530
2015-08-04 13:14:46 +02:00
d1917ad2b4
Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632
...
Conflicts:
modules/monitoring/application/views/scripts/service/history.phtml
2015-08-03 16:46:27 +02:00
688a08585b
Merge branch 'master' into bugfix/error-prone-generictts-9611
...
Conflicts:
modules/monitoring/application/views/scripts/show/components/downtime.phtml
2015-08-03 15:05:45 +02:00
9a0e47a3e1
SimpleQuery: Add method hasResult()
...
refs #9632
2015-08-03 14:49:33 +02:00
dbc2f98053
SimpleQuery: Initialize self::$iteratorPosition as late as possible
...
refs #9632
2015-08-03 14:09:55 +02:00
ea5db51213
Fix "Try to get an inexistent pane." when clicking on the "Search" tab
2015-08-03 13:01:11 +02:00
139baffdc6
lib: Make Dashboard::$tabs protected
...
The SearchDashboard has to override Dashboard::getTabs() in order to set up the correct tab.
2015-08-03 13:01:11 +02:00
177fafaa56
lib: Fix TicketHook's PHPDoc
...
refs #9611
2015-08-03 11:05:48 +02:00
451be1e97f
monitoring/hooks: Add TicketHook::createLinks()
...
Instead of calling preg_replace_callback w/o error handling in our view scripts, TicketHook::createLinks() will take care of that.
refs #9611
2015-07-31 15:31:41 +02:00
99c69cc461
SimpleQuery: Add support for peek aheads
...
refs #9661
2015-07-31 13:51:39 +02:00
fe41d312ca
RepositoryQuery: Do not bypass the query's own iterator
...
refs #9661
2015-07-31 13:12:41 +02:00
16e54d3987
DbQuery: Be less error-prone while calling array_search
2015-07-31 11:05:23 +02:00
6c105b867e
Form: Be less error-prone while calling array_search
2015-07-31 11:05:09 +02:00
5345831742
SessionNamespace: Be less error-prone while calling array_search
2015-07-31 11:04:51 +02:00
449a19c3a3
Session: Be less error-prone while calling array_search
2015-07-31 11:04:43 +02:00
24cb123f47
Tabs: Be less error-prone while calling array_search
2015-07-31 11:04:36 +02:00
316a4d8b82
Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609
2015-07-30 16:16:04 +02:00
a234852f32
Merge branch 'feature/basic-auth-9660'
...
resolves #9660
2015-07-30 15:05:07 +02:00
feed927fd2
Let external auth win over session auth and session auth over http auth
...
refs #9660
2015-07-30 14:50:05 +02:00
9060e8a034
lib: Only call Icinga::app()->getRequest() for getting the request outside of a controller
...
Saves a call to getFrontController().
refs #9660
2015-07-30 14:02:44 +02:00
55ad2dd65f
Don't fail if password contains a colon on basic auth
...
refs #9660
2015-07-30 13:59:47 +02:00
c594d6db33
Challenge client on invalid basic access auth credentials
...
refs #9660
2015-07-30 13:59:18 +02:00
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
81aad9d6a6
Rename Notifiation::getMessages() to popMessages()
...
Because the call to popMessages()--before getMessages()--automatically resets the notification messages on the instance, popMessages() is a much better name for the method.
refs #9660
2015-07-30 13:45:39 +02:00
d545e1f7d1
lib: Don't write the empty notifications array into the session
...
I combined this w/ introducing some constants for notification types and PHPDoc.
refs #9660
2015-07-30 13:42:59 +02:00
9aa1599a18
Form: Disable CSRF counter measure only on API requests
...
refs #9660
2015-07-30 12:04:22 +02:00
c23c7a5fa9
lib: Add Request::getIsApiRequest()
...
If the Accept header is set to application/json it's an API request.
refs #9660
2015-07-30 12:03:33 +02:00
3aae37aff3
Don't redirect on external auth
...
refs #9660
2015-07-30 12:02:42 +02:00
db505281ee
lib: Disable CSRF token on HTTP authenticated users and not XHR
...
refs #9660
2015-07-30 09:33:04 +02:00
36ff2d8914
lib: Set User::$isHttpUser in Auth
...
refs #9660
2015-07-30 09:32:24 +02:00
775f8cced6
lib: Introduce User::$isHttpUser
...
refs #9660
2015-07-30 09:31:58 +02:00
9f0e48a0a1
Don't send the X-Icinga-Module header more than once
...
fixes #9349
2015-07-30 09:28:05 +02:00
20aa17c831
Merge branch 'bugfix/selected-row-lost-after-autorefresh-8623'
...
fixes #8623
2015-07-29 17:30:45 +02:00
cf8c680482
lib: Add basic access authentication (WIP)
...
refs #9660
2015-07-29 17:22:55 +02:00
ce2a196c4a
lib/Web: Set up request before setting up the user
...
refs #9660
2015-07-29 17:22:10 +02:00
3e7cc299ec
Fix issue that caused the refresh button to remove side bar
...
Do not apply base target globally for all toolbar elements, but specifically for those that should remove side-bars.
refs #8623
refs #6436
2015-07-29 17:18:52 +02:00
ba906d2fca
FilterEditor: allow to set custom filter columns
2015-07-29 17:13:18 +02:00
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
fb7666e6bd
LdapUserGroupBackend: Adjust usage of LdapCapabilities::hasAdOid()
...
Usage search ftw..
2015-07-29 16:26:39 +02:00
c3a057dbdb
lib: Add AuthChain::setSkipExternalBackends() in favor of setIteratorMode()
...
There's only one mode.
refs #9660
2015-07-29 16:18:30 +02:00
3ca85f9daa
lib: Add Auth::getRequest()
...
Basic auth will require the request.
refs #9660
2015-07-29 15:56:45 +02:00
96e3111f58
lib: Reorder functions in Auth
...
refs #9660
2015-07-29 15:52:56 +02:00
e7c7486097
lib: Fix PHPDoc in User
...
refs #9660
2015-07-29 15:46:53 +02:00
37ef87b9ab
lib: Fix PHPDoc in ExternalBackend
...
refs #9660
2015-07-29 15:46:40 +02:00
1b5c5deace
lib: Rename remote user to external user
...
We renamed our backend. Code now reflects this.
refs #9660
2015-07-29 15:44:32 +02:00
432efcb089
lib: Handle Response::setRerenderLayout() correctly
...
The header is different if it's not a redirect.
refs #9660
2015-07-29 15:08:36 +02:00
3f7081296b
Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609
2015-07-29 15:02:20 +02:00
aaae7e03b4
lib: Introduce Response::setRerenderLayout()
...
Instead of handling response headers based on flags in our controllers, this should happen in the request for usage w/o controllers.
refs #9660
2015-07-29 14:39:45 +02:00
91720810cc
lib: Document Response::redirectAndExit()
...
refs #9660
2015-07-29 14:22:45 +02:00
a31c799043
lib: Introduce Response::getRequest()
...
refs #9660
2015-07-29 14:20:39 +02:00
ae4b7144cd
lib: Implement Auth::getAuthChain()
...
Saves one use statement for auth chain usages.
refs #9660
2015-07-29 14:14:19 +02:00
745e30259d
lib: Implement AuthChain::authenticate()
...
Right now the LoginController has all the authentication which is kind of a mess. Further, the upcoming basic access authentication has to reuse this code.
Thus AuthChain::authenticate() is introduced to handle both cases.
refs #9660
2015-07-29 14:11:54 +02:00
13edbf901d
UserBackend: Implement interface ConfigAwareFactory
...
refs #9609
2015-07-29 13:44:26 +02:00
83aafe8cda
Allow to discover LDAP connections in the wizard as well
...
...
2015-07-29 09:26:53 +02:00
4d44a0625c
lib: Move UserBackendInterface::authenticate() to new interface Authenticatable
...
refs #9660
2015-07-29 09:25:14 +02:00
2a4e614b5e
Fix code style in AuthChain
...
refs #9660
2015-07-28 19:55:26 +02:00
07849e0fea
lib: Rename Authentication/Manager to Authentication/Auth
...
refs #9660
2015-07-28 17:08:55 +02:00
d2467fee16
Merge branch 'feature/secure-modules-9644'
...
resolves #9644
2015-07-28 14:00:27 +02:00
47925d0fa0
lib: Make BaseTestCase abstract
...
Else phpunit tries to run the "test" though it shouldn't :)
2015-07-28 13:58:23 +02:00
fe73d6de83
Remove superfluous whitespaces in IcingaException
...
refs #9644
2015-07-28 13:46:32 +02:00
7cfc78558d
Merge branch 'master' into feature/secure-modules-9644
...
Conflicts:
library/Icinga/Exception/IcingaException.php
2015-07-28 13:42:02 +02:00
c8d065b3e0
Accept DbUserBackends with only one single user
...
fixes #9739
2015-07-28 12:41:08 +02:00
e231ef8061
SortBox: Fix some documenation and code style issues
2015-07-28 12:04:16 +02:00
f7b35b04f4
SortBox: Properly apply sort rules and show the user the default
...
refs #6644
2015-07-28 12:03:50 +02:00
d0dd4b09a0
Repository: It's "sort rules" in general, not "default sort rules"
2015-07-28 11:42:13 +02:00
05af310e4c
RepositoryQuery: Implement interface SortRules
...
refs #6644
2015-07-28 11:41:07 +02:00
cdc2182430
Introduce interface SortRules
...
refs #6644
2015-07-28 11:40:27 +02:00
b84650dd4b
Document variadic function IcingaException::__construct properly
...
refs #9644
2015-07-28 10:45:00 +02:00
a68c05da7f
lib: Require a message when throwing IcingaExceptions
...
refs #9644
2015-07-28 10:43:17 +02:00
78285b95a3
Make Controller::httpNotFound() variadic
...
refs #9644
2015-07-28 10:40:02 +02:00
2c8235d486
lib: Introduce IcingaException::create()
...
refs #9644
2015-07-27 16:25:41 +02:00
9cc7b45458
Merge branch 'master' into bugfix/separate-sort-controls-9421
2015-07-27 11:50:05 +02:00
4d9aa54814
SortBox: Utilize a separate form for each control
...
refs #9421
2015-07-27 11:43:47 +02:00
a14da1c558
Make sure to log inspection messages into message log too
...
refs #9641
2015-07-27 09:44:07 +02:00
86ad6c48ff
Form: Automatically remove query parameters only for GET forms
...
refs #9421
2015-07-27 08:52:33 +02:00
982e226db0
IcingaException: Add utility method to format exceptions as one-liner
2015-07-24 16:19:20 +02:00
c1a3d205bc
Show more details about unhandled exceptions in the CLI
...
fixes #9646
2015-07-24 15:58:32 +02:00
8358e9165c
Don't require the module permission for the default module
...
refs #9644
2015-07-24 15:11:21 +02:00
149a974a44
Fix coding style in Module.php
...
refs #9644
2015-07-24 15:06:25 +02:00
519d025de5
Allow to get permissions and restrictions from unloaded modules
...
refs #9644
2015-07-24 14:24:48 +02:00
444fdadf13
Allow to get unloaded modules via Manager::getModule()
...
refs #9644
2015-07-24 14:23:48 +02:00
ec1ddd82b3
Move Module::__construct to the top of the function list
...
refs #9664
2015-07-24 14:19:17 +02:00
56759e7f21
Merge branch 'master' into feature/ldap-auth-backend-discovery-9602
2015-07-24 10:52:14 +02:00
12856da971
Merge branch 'bugfix/filter-custom-variables-9692'
...
fixes #9692
2015-07-24 09:27:05 +02:00
f06be5c9bc
LdapConnection: Let self::bind() return $this
2015-07-23 17:34:09 +02:00
727a2d7141
Paginator: relax requirements to Paginatable
...
* we need no full query interface here
* introduced new interface "Paginatable"
fixes #9483
2015-07-23 13:48:49 +02:00
a34ad0227f
Don't load module menu entries if the authenticated user lacks the module permission
...
refs #9644
2015-07-23 12:59:30 +02:00
fd77c30838
Don't load module dashboards if the authenticated user lacks the module permission
...
refs #9644
2015-07-23 12:57:23 +02:00
e8e01257e6
Change interface of SearchDashboard to allow setting a user before calling ::search()
...
Because search dashlets are provided by modules, the authenticated user's module permissions have to be validated before loading search dashlets provided by modules.
refs #9644
2015-07-23 12:53:08 +02:00
b4f4ce4406
Require the module's permission for every module automatically
...
Module permissions are not required if authentication is disabled on the controller.
refs #9644
2015-07-23 12:51:10 +02:00
b000ae3a37
Do not require permissions if authentication is not required
...
refs #9644
2015-07-23 12:50:02 +02:00
5dcc307e87
Add namespace for module permissions to the module manager
...
refs #9644
2015-07-22 14:59:35 +02:00
aa567f8cd7
Introduce ModuleActionController::$requiresModulePermission
...
refs #9644
2015-07-22 14:56:02 +02:00
13d954a956
Fix rawurlencode call
2015-07-22 13:36:25 +02:00
52e352751e
Revert "ModuleActionController: fix forward/X-Icinga-Module"
...
This reverts commit bf82bd4ce1#9349
2015-07-22 13:34:44 +02:00
ab8e775188
Fix duplicate headers on forward() inside a controller
...
This avoids that the JS loader flattening arrays.
refs #9349
2015-07-22 13:34:44 +02:00
54a77b7253
Merge branch 'master' into feature/support-for-file-uploads-8758
2015-07-22 13:30:56 +02:00
a199d36207
Stylesheet: Disable extendend @import statements provided by LESS
...
fixes #9687
2015-07-22 12:45:10 +02:00
15cb24c6dc
Throw an exception in IdoQuery::getCustomvarColumnName() in case the custom variable has not been joined
...
Queries extending IdoQuery and using the method getCustomvarColumnName() must be notified in case the custom variable has not been joined.
refs #9692
2015-07-22 12:03:34 +02:00
bf82bd4ce1
ModuleActionController: fix forward/X-Icinga-Module
2015-07-22 10:53:42 +02:00
cecd94be50
Merge branch 'master' into feature/support-for-file-uploads-8758
2015-07-22 08:47:24 +02:00
Eric Lippmann
Johannes Meyer
Alexander Fuhr
Matthias Jentsch
Thomas Gelf
Markus Frosch