Johannes Meyer
0788041c43
Navigation: Accept item configuration for method addItem()
...
And check an item's permission.
refs #5600
2015-09-02 12:57:14 +02:00
Russell Kubik
056ab0c96c
Fix that DbUserBackend::inspect() reports 0 users when only one exists
...
refs #9739
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 23:08:24 +02:00
Eric Lippmann
d2a4b880b1
Revert "Accept DbUserBackends with only one single user"
...
This reverts commit c8d065b3e0
.
There's a PR on GitHub open that was contributed earlier than this fix. Thus giving credit to the PR's author.
refs #9739
2015-09-01 23:05:34 +02:00
Emil Vikström
e3ea0e5949
Use yellow for warning logs in ANSI CLI
...
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 22:55:42 +02:00
Eric Lippmann
935691233b
vendor: Upgrade Zend to version 1.12.15
...
refs #10044
2015-09-01 22:53:57 +02:00
Johannes Meyer
c154f96d44
Navigation: Add method createItem()
...
refs #5600
2015-09-01 16:02:44 +02:00
Eric Lippmann
4adaf5a2d0
vendor: Upgrade Parsedown to version 1.5.0
...
refs #10044
2015-09-01 14:25:18 +02:00
Eric Lippmann
63734b923a
vendor: Upgrade JShrink to version 1.1.0
...
refs #10044
2015-09-01 13:00:00 +02:00
Eric Lippmann
d4669c7832
vendor: Upgrade HTMLPurifier to version 4.7.0
...
refs #10044
2015-09-01 12:57:57 +02:00
Eric Lippmann
6556059afd
vendor: Uprade php-font-lib to version 0.4
...
refs #10044
2015-09-01 12:55:34 +02:00
Eric Lippmann
52b0c8c258
lib: Add navigation classes (WIP)
...
- Lacks custom renderer functionality
- Lacks navigation item priorities
- Lacks permission handling
refs #5600
2015-09-01 12:48:45 +02:00
Eric Lippmann
e78f833232
Merge branch 'bugfix/language-negotiation-safari-7818'
...
fixes #7818
2015-08-31 16:46:32 +02:00
Eric Lippmann
4a5d2784fb
Normalize languages for negotiation to lowercase
...
refs #7818
2015-08-31 16:45:14 +02:00
Eric Lippmann
4fb6856caf
Fix exception when navigating to the preferences after namespacing all controllers
2015-08-31 10:19:30 +02:00
Eric Lippmann
38ef8c7f11
lib: Fix PHPDoc of Translator::splitLocaleCode()
2015-08-31 09:08:31 +02:00
Eric Lippmann
e7e1b1a98e
Dispatcher: Default to the default module if no module has been given in the request
...
This is most likely the case when custom routes have been added to the router w/o the module parameter being set.
refs #5786
2015-08-28 13:13:20 +02:00
Eric Lippmann
c0eb0cbe6a
modules: Tell the dispatcher that the static controller is to be found in the default module
...
refs #5786
2015-08-28 13:13:07 +02:00
Eric Lippmann
bcc02f50ec
lib: Optimize imports in webrouter
2015-08-28 09:42:49 +02:00
Eric Lippmann
9cf56410e9
lib: Fix PHPDoc of Form::populate()
2015-08-27 15:52:13 +02:00
Eric Lippmann
4070f6c75b
Merge branch 'master' into feature/namespaced-controllers-5786
2015-08-27 15:05:44 +02:00
Johannes Meyer
f90f7b1528
User: Consider the shortest wildcard permission more important
...
I hope we do not need a fourth attempt to get this right...
fixes #10016
2015-08-27 14:24:04 +02:00
Eric Lippmann
c5d0094e8e
lib: Add AlreadyExistsException
2015-08-27 13:56:24 +02:00
Eric Lippmann
ba09b02f5c
lib: Fix PHPDoc of Version::get()
2015-08-27 13:06:49 +02:00
Eric Lippmann
df66d0b0f5
lib: Add PHPDoc to Version
2015-08-27 13:06:31 +02:00
Eric Lippmann
28009eb563
Rename controller namespace to Controllers
...
refs #5786
2015-08-27 13:03:45 +02:00
Eric Lippmann
eb30ecd776
Revert "Fix failing search dashboard test"
...
This reverts commit 7c0dbe0077f56aef5f2a744761b47a0715dd591a.
Fixed by using t() in the SearchDashboard already.
2015-08-27 12:58:56 +02:00
Eric Lippmann
176177d874
Fix failing search dashboard test
2015-08-27 12:58:56 +02:00
Eric Lippmann
c294283636
Merge branch 'bugfix/service-grid-grouping-postgres-9333'
...
Conflicts:
modules/monitoring/application/controllers/ListController.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Johannes Meyer
8cc1970a9f
SearchDashboard: Use t() instead of the view helper
...
Since it's library code we do not need to use the module-aware
translation helper.
2015-08-25 16:51:50 +02:00
Eric Lippmann
e27d2e998b
monitoring: Fix grouping and ordering of the service when using display names
...
refs #9538
refs #9333
2015-08-25 16:13:34 +02:00
Eric Lippmann
c8790fad93
Merge branch 'bugfix/service-grid-display_name-9538' into bugfix/service-grid-grouping-postgres-9333
...
Conflicts:
library/Icinga/Data/PivotTable.php
modules/monitoring/application/controllers/ListController.php
2015-08-25 15:51:20 +02:00
Eric Lippmann
403f7016ca
lib: Allow to set axis header columns in the pivot table
...
PivotTable::toArray() now returns the pivot data and the pivot header.
refs #9538
2015-08-25 14:46:23 +02:00
Eric Lippmann
96fb3b5d4b
Merge branch 'master' into feature/api-9606
2015-08-25 09:25:59 +02:00
Eric Lippmann
ec390d7a8b
lib: Add Controller::httpBadRequest() for responding w/ HTTP 400 immideately
...
refs #9606
2015-08-24 15:59:59 +02:00
Eric Lippmann
8329f5de22
lib: Add HttpBadRequestException
...
refs #9606
2015-08-24 15:59:05 +02:00
Eric Lippmann
a20eef50e1
Set up the user backend factory before setting up the user
...
refs #9606
2015-08-24 15:37:55 +02:00
Johannes Meyer
93f7bfeeb9
Allow to dis-/enable stacktraces in a user's preferences
...
refs #9113
2015-08-24 14:47:37 +02:00
Johannes Meyer
0c47aececc
Allow to disable stack traces globally
...
refs #9113
2015-08-24 14:44:54 +02:00
Johannes Meyer
7c86f19aee
SearchDashboard: Utilize createDashlet() and set a progress label
...
refs #8848
2015-08-24 12:36:59 +02:00
Johannes Meyer
320a4080ec
Dashlet: Add support for CSS animated progress labels
...
refs #8848
2015-08-24 12:36:35 +02:00
Johannes Meyer
db4c81a093
Pane: Add method createDashlet()
...
refs #8848
2015-08-24 12:35:38 +02:00
Eric Lippmann
ceaba90872
css: Load mixins.less
2015-08-21 16:45:05 +02:00
Matthias Jentsch
675a130787
Fix active configuration/application menu highlighting
...
Fix a bug that caused the application config to not be set to active when navigating through history.
refs #9761
2015-08-21 16:04:04 +02:00
Johannes Meyer
d31b60102e
Form: Fix that form titles are missing
...
The description may not be set at the time
loadDefaultDecorators() is called.
2015-08-21 14:20:09 +02:00
Matthias Jentsch
2d9d3a0788
Detect exact names during autocompletion
...
Do not recognize substrings of strings as the full string in searchMatch.
fixes #9633
2015-08-21 13:48:11 +02:00
Johannes Meyer
9ca278d7b2
Merge branch 'master' into feature/activity-indicators-for-form-submits-8369
2015-08-21 13:37:54 +02:00
Johannes Meyer
fbca28c024
Form: Only add a form header if a description is set
...
refs #8369
2015-08-21 13:34:17 +02:00
Johannes Meyer
747f6dcf77
Form: Show the form autosubmit warning in the header tag...
...
...and use a unique id for the progress element.
refs #8369
2015-08-21 11:40:38 +02:00
Eric Lippmann
85ef98f72d
lib: Add PHPDoc to Request::hasCookieSupport()
2015-08-21 11:27:03 +02:00
Johannes Meyer
b9d64b40a4
forms.less: Fix help icon layout
2015-08-21 10:36:08 +02:00
Johannes Meyer
7244906515
Wizard: Use a constant for the name and id of the progress element
...
refs #8369
2015-08-21 10:16:23 +02:00
Johannes Meyer
07b17cc701
Wizard: Add Spinner decorator to the first (and only) submit button
...
refs #8369
2015-08-21 09:52:57 +02:00
Matthias Jentsch
44271471e3
Allow declarative definitions of badge renderers and improve interface
...
Allow the data backend, columns and generated tooltips to be defined in the configuration instead of providing subclasses for every new configuration. Provide an abstract BadgeMenuItemRenderer that allows creating Badges with less boilerplate.
fixes #9694
2015-08-20 18:16:33 +02:00
Eric Lippmann
5da139943c
lib: Fix type hint for $menuItems in Module
2015-08-20 16:59:02 +02:00
Eric Lippmann
9aa62c9898
lib: Fix type hint for $tabs in Module
2015-08-20 16:58:24 +02:00
Johannes Meyer
46cd47b73c
Form: Automatically set data-progress-element...
...
..for forms with form based autosubmit warnings.
refs #8369
2015-08-20 16:54:20 +02:00
Eric Lippmann
800173b19f
lib: Fix type hint for $router in Module
2015-08-20 16:47:17 +02:00
Eric Lippmann
5d8f091209
lib: Don't alias Zend classes in Module
2015-08-20 16:46:31 +02:00
Eric Lippmann
f24449b225
modules: Register controller namesoace in Module::registerWebIntegration()
...
Else we get an exception when loading modules on the CLI because Zend classes are not autoloaded.
refs #5786
2015-08-20 16:24:12 +02:00
Johannes Meyer
32f8c0770c
Wizard: Use a single spinner for all submit buttons
...
refs #8369
2015-08-20 16:13:56 +02:00
Johannes Meyer
20f144bd4b
Spinner: Accept option `id'
...
refs #8369
2015-08-20 16:13:30 +02:00
Eric Lippmann
c5f444efe8
lib: Don't alias Zend classes in the ActionController
2015-08-20 16:10:39 +02:00
Eric Lippmann
6ca02a519b
lib: Fix type hint of Controller::getResponse()
2015-08-20 16:07:24 +02:00
Eric Lippmann
1c5a784022
lib: Move Request::sendJson() to Response::sendJson()
...
refs #9606
2015-08-20 16:05:45 +02:00
Eric Lippmann
870b73ae09
lib: Rename Request::getIsApiRequest() to ::isApiRequest()
...
There's no setter involved.
refs #9606
2015-08-20 16:02:25 +02:00
Eric Lippmann
62f0281a62
lib: Fix type hint of Controller::getRequest()
2015-08-20 16:00:24 +02:00
Eric Lippmann
1130e453f6
lib: Fix typos in the Form's PHPDoc
2015-08-20 15:57:52 +02:00
Eric Lippmann
f9f813e50b
lib: Fix PHPDoc of Form::populate()
2015-08-20 15:56:45 +02:00
Eric Lippmann
0ce4e12db8
lib: Fix type hints for Form::getElements()
2015-08-20 15:55:18 +02:00
Eric Lippmann
dd23bd9397
Form: Respond w/ JSON-encoded messages if API requests fail
...
refs #9606
2015-08-20 15:48:42 +02:00
Johannes Meyer
a77dc3665c
Form: Show a spinner for ongoing form submits
...
This will only be shown if there's no progress label set.
refs #8369
2015-08-20 15:05:02 +02:00
Johannes Meyer
275b57cb69
Form: Allow to set a progress label
...
refs #8369
2015-08-20 15:04:15 +02:00
Johannes Meyer
690d60672c
Introduce form element decorator Spinner
...
refs #8369
2015-08-20 14:34:43 +02:00
Eric Lippmann
71ff4512c3
lib/form: Bypass sent and submit handling if the form is an API target
...
refs #9606
2015-08-20 13:11:36 +02:00
Eric Lippmann
e07cdd21ac
lib: Add Request::sendJson()
...
refs #9606
2015-08-20 13:11:36 +02:00
Matthias Jentsch
9e40f5f2c7
Remove option to skip certificate validation to prevent insecure configurations
...
Skipping certificate validation will allow MITM on every single request and not give any real security over just running unencrypted queries. On top of that, there is no way to configure this behavior from within PHP except of setting environment variables, which is really hacky and has side effects on other requests.
fixes #9607
2015-08-19 16:20:33 +02:00
Johannes Meyer
63e639caf0
Handle module identification directly in the ActionController
...
Fixes some issues with more complex customisations in a
module's controller.
Obsoletes: 93f8297344
2015-08-19 13:39:46 +02:00
Johannes Meyer
036da072c5
Revert "ActionController: Give modules a chance to dynamically require auth"
...
This reverts commit 93f8297344
.
2015-08-19 13:39:46 +02:00
Eric Lippmann
7abc5778ea
Fix PHPDoc in the String helper
2015-08-19 12:50:05 +02:00
Eric Lippmann
1492218962
Fix SortBox not usable w/o SortRules
...
The SortBox assumes the first avaiable sort column as default column if the given Sortable does not implement the SortRules interface.
When changing the direction of the default sort column, the sort box did not pass the column to Sortable::sort(). Thus the Sortable did not know by which column to sort.
Now the SortBox passes the sort column even if the direction of the default column is changed.
refs #9333
2015-08-18 14:18:48 +02:00
Eric Lippmann
f2f1e12b8e
Let PivotTable implement Sortable
...
refs #9333
2015-08-18 14:17:07 +02:00
Eric Lippmann
d1f9c5ff0d
Don't call setUseSubqueryCount() in the PivotTable
...
The query implementation handles this automatically.
refs #9333
2015-08-18 13:42:06 +02:00
Eric Lippmann
d0f2887367
Fix PHPDoc indents in the PivotTable
...
refs #9333
2015-08-18 13:35:50 +02:00
Eric Lippmann
0a7a8d377e
Remove unnecessary import in the PivotTable
...
refs #9333
2015-08-18 13:34:14 +02:00
Eric Lippmann
3c812e6d2b
Register module controller namespace
...
refs #5786
2015-08-18 13:02:54 +02:00
Eric Lippmann
d267686ef4
Fix PHPDoc in Web to read class loader instead of auto loader
...
refs #5786
2015-08-18 12:51:46 +02:00
Eric Lippmann
cb8fb93ab0
Fix PHPDoc in ApplicationBootstrap to read class loader instead of auto loader
...
refs #5786
2015-08-18 12:50:46 +02:00
Johannes Meyer
93f8297344
ActionController: Give modules a chance to dynamically require auth
2015-08-18 11:28:02 +02:00
Eric Lippmann
e31dce97a9
Fix dispatching namespaced module controllers
...
refs #5786
2015-08-18 11:11:28 +02:00
Eric Lippmann
fae2e0979a
Fix class loading to not rely on the longest namespace match
...
refs #5786
2015-08-18 10:50:29 +02:00
Eric Lippmann
234dc951d2
Remove the is_dir check from the ClassLoader
...
refs #5786
2015-08-18 09:32:00 +02:00
Eric Lippmann
ac99e54f17
Fix PHPDoc in ClassLoader
...
refs #5786
2015-08-18 09:27:34 +02:00
Eric Lippmann
a382a563d5
Move Loader::__destruct to the bottom of the method list
...
refs #5786
2015-08-18 09:10:23 +02:00
Eric Lippmann
13fc7e16f2
Rename Loader to ClassLoader
...
refs #5786
2015-08-18 09:06:58 +02:00
Johannes Meyer
e5f249270a
Merge branch 'master' into feature/provide-a-complete-list-of-filter-columns-9029
2015-08-17 15:41:40 +02:00
Eric Lippmann
b6fdbf055e
Remove unnecessary pass by refenrece in the loader
...
refs #5786
2015-08-17 14:35:35 +02:00
Eric Lippmann
7563a7a0ba
Rename Loader::unRegister() to Loader::register()
2015-08-17 14:34:39 +02:00
Johannes Meyer
f7b0e6956d
FilterEditor: Only apply the filter if a query is set
...
refs #9029
2015-08-17 13:43:48 +02:00
Eric Lippmann
7252f3237a
Introduce a constant for the controller namespace
...
refs #5786
2015-08-17 13:43:34 +02:00
Eric Lippmann
06e879f078
Throw an expcetion in our Dispatcher if the controller is not an instance of Zend_Controller_Action_Interface
...
refs #5786
2015-08-17 13:38:16 +02:00
Eric Lippmann
e26a7fd4d1
Use Zend_Cotroller_Dispatcher_Standard::getActionMethod() in the Dispatcher
...
refs #5786
2015-08-17 13:34:47 +02:00
Eric Lippmann
1e1d4531c6
Register the controller namespace
...
refs #5786
2015-08-17 13:31:26 +02:00
Eric Lippmann
965fee1e9e
Fix 'void' method result used in the Dispatcher
...
refs #5786
2015-08-17 13:31:05 +02:00
Eric Lippmann
8b32edd6e9
Default to Zend's dispatcher if the controller name is empty
...
refs #5786
2015-08-17 13:29:47 +02:00
Eric Lippmann
d4de7c0519
lib: Make Loader::registerNamespace() fluent
...
refs #5786
2015-08-17 13:29:15 +02:00
Eric Lippmann
e8c0e97bb3
Add PHPDoc to the Dispatcher
...
refs #5786
2015-08-17 13:10:01 +02:00
Eric Lippmann
f972a034e7
Fix license header in Dispatcher
...
refs #5786
2015-08-17 13:08:41 +02:00
Eric Lippmann
392eee5a1f
Merge branch 'master' into feature/namespaced-controllers-5786
...
Conflicts:
library/Icinga/Application/Web.php
2015-08-17 12:59:44 +02:00
Johannes Meyer
97245c5166
FilterEditor: Uppercase all words for non labelled filter columns
...
refs #9029
2015-08-14 15:36:54 +02:00
Johannes Meyer
ca4789f114
FilterEditor: Fix automatic filter label creation
...
refs #9029
2015-08-13 17:20:40 +02:00
Johannes Meyer
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
Johannes Meyer
63fb8dcafa
FilterEditor: Do not show an empty line at the bottom of the select
2015-08-13 15:59:00 +02:00
Johannes Meyer
41b80efa0e
FilterEditor: Support queries implementing the FilterColumns interface
...
refs #9029
2015-08-13 15:58:04 +02:00
Johannes Meyer
59e7731efb
RepositoryQuery: Implement interface FilterColumns
...
refs #9029
2015-08-13 14:21:39 +02:00
Johannes Meyer
bcdb670f5c
Introduce interface Icinga\Data\FilterColumns
...
refs #9029
2015-08-13 14:21:11 +02:00
Johannes Meyer
38622e96d5
Repository: Allow implementations to provide search columns
...
refs #9029
2015-08-13 14:20:21 +02:00
Johannes Meyer
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
Johannes Meyer
2e7ff7dd6e
FilterEditor: Require an instance of Filterable for setQuery()
...
refs #9029
2015-08-13 11:35:45 +02:00
Johannes Meyer
fc35f3e46b
FilterEditor: Apply the filter on the query internally
...
refs #9029
2015-08-13 11:33:25 +02:00
Johannes Meyer
069fcc40ea
FilterEditor: Accept null for method setColumns()
...
refs #9029
2015-08-13 11:30:26 +02:00
Johannes Meyer
9ad14fc644
FilterEditor: Accept null for method setSearchColumns()
...
refs #9029
2015-08-13 11:30:05 +02:00
Alexander Fuhr
a9ff6eebc0
Merge branch 'master' into bugfix/cookie-support-7383
2015-08-13 11:22:14 +02:00
Alexander Fuhr
813154f6ef
Cookie: Make it no static and use the request
...
refs #7383
2015-08-13 11:19:48 +02:00
Alexander Fuhr
2332b94f0b
Request: Add getResponse() to retrieve the Response
...
refs #7383
2015-08-13 11:19:08 +02:00
Johannes Meyer
fa1e3a763d
Do not show the full layout on the login page
...
...
refs #9892
2015-08-13 08:12:30 +02:00
Alexander Fuhr
ad8f16c185
Cookie: Set the rigth license line header
...
refs #7383
2015-08-11 16:37:05 +02:00
Alexander Fuhr
cea3727c97
Merge conflicts
2015-08-11 16:35:14 +02:00
Eric Lippmann
1495cf5d04
Merge branch 'bugfix/icingacli-no-request-object-9375'
...
fixes #9375
2015-08-11 09:20:59 +02:00
Matthias Jentsch
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
Matthias Jentsch
fe805c82ca
Support multi line values in INI files
2015-08-10 15:15:40 +02:00
Eric Lippmann
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
Eric Lippmann
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
Eric Lippmann
b0a75dd89b
lib: Fix PHPDoc in ConfigObject
2015-08-10 13:25:08 +02:00
Johannes Meyer
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
Matthias Jentsch
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
Matthias Jentsch
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
Matthias Jentsch
eebd8be746
Prevent configuration changes that would break PHP lib ini parser
2015-08-06 17:39:46 +02:00
Matthias Jentsch
9b373e9d10
Fix issue that caused IniWriter to fail on empty configs
2015-08-06 17:21:52 +02:00
Johannes Meyer
c7cc9e66df
JavaScript: Load all available module javascript files
...
refs #9702
2015-08-06 15:15:02 +02:00
Johannes Meyer
9cea83242c
StyleSheet: Load all available module stylesheets
...
refs #9702
2015-08-06 15:14:29 +02:00
Johannes Meyer
712d545f48
Module: Allow to define additional Javascript files
...
refs #9702
2015-08-06 15:10:54 +02:00
Johannes Meyer
51aa22d429
Module: Allow to define additional CSS/LESS files
...
refs #9702
2015-08-06 15:10:33 +02:00
Johannes Meyer
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
Johannes Meyer
0695d5900c
Merge branch 'master' into feature/less-costly-count-queries-for-history-views-8615
2015-08-06 13:11:28 +02:00
Eric Lippmann
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
Johannes Meyer
7662545c2a
SimpleQuery: Provide a getter for the current iterator position
...
refs #8615
2015-08-06 09:39:23 +02:00
Matthias Jentsch
60675979bc
Merge branch 'bugfix/creating-dashlet-with-parentheses-9530'
...
fixes #9530
2015-08-05 18:22:29 +02:00
Matthias Jentsch
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
Johannes Meyer
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
Eric Lippmann
064e821383
lib: Fix wrong count for queries having a group by clause
...
fixes #9828
2015-08-04 16:25:34 +02:00
Matthias Jentsch
28e1b3119c
Remove unused "extends"-code
2015-08-04 15:14:10 +02:00
Alexander Fuhr
c3fe14a205
Modules/Manager: Fix that non-existent modules can be disabled
...
fixes #9374
2015-08-04 14:34:30 +02:00
Matthias Jentsch
7095ad5bc7
Improve ini editor and dashlet input validation
2015-08-04 13:23:30 +02:00
Matthias Jentsch
d88c628b6b
Escape section names before applying regex
...
refs #9530
2015-08-04 13:14:46 +02:00
Johannes Meyer
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
Eric Lippmann
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
Johannes Meyer
9a0e47a3e1
SimpleQuery: Add method hasResult()
...
refs #9632
2015-08-03 14:49:33 +02:00
Johannes Meyer
dbc2f98053
SimpleQuery: Initialize self::$iteratorPosition as late as possible
...
refs #9632
2015-08-03 14:09:55 +02:00
Eric Lippmann
ea5db51213
Fix "Try to get an inexistent pane." when clicking on the "Search" tab
2015-08-03 13:01:11 +02:00
Eric Lippmann
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
Eric Lippmann
177fafaa56
lib: Fix TicketHook's PHPDoc
...
refs #9611
2015-08-03 11:05:48 +02:00
Eric Lippmann
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
Johannes Meyer
99c69cc461
SimpleQuery: Add support for peek aheads
...
refs #9661
2015-07-31 13:51:39 +02:00
Johannes Meyer
fe41d312ca
RepositoryQuery: Do not bypass the query's own iterator
...
refs #9661
2015-07-31 13:12:41 +02:00
Johannes Meyer
16e54d3987
DbQuery: Be less error-prone while calling array_search
2015-07-31 11:05:23 +02:00
Johannes Meyer
6c105b867e
Form: Be less error-prone while calling array_search
2015-07-31 11:05:09 +02:00
Johannes Meyer
5345831742
SessionNamespace: Be less error-prone while calling array_search
2015-07-31 11:04:51 +02:00
Johannes Meyer
449a19c3a3
Session: Be less error-prone while calling array_search
2015-07-31 11:04:43 +02:00
Johannes Meyer
24cb123f47
Tabs: Be less error-prone while calling array_search
2015-07-31 11:04:36 +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
a234852f32
Merge branch 'feature/basic-auth-9660'
...
resolves #9660
2015-07-30 15:05:07 +02:00
Eric Lippmann
feed927fd2
Let external auth win over session auth and session auth over http auth
...
refs #9660
2015-07-30 14:50:05 +02:00
Eric Lippmann
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
Eric Lippmann
55ad2dd65f
Don't fail if password contains a colon on basic auth
...
refs #9660
2015-07-30 13:59:47 +02:00
Eric Lippmann
c594d6db33
Challenge client on invalid basic access auth credentials
...
refs #9660
2015-07-30 13:59:18 +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
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
Eric Lippmann
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
Eric Lippmann
9aa1599a18
Form: Disable CSRF counter measure only on API requests
...
refs #9660
2015-07-30 12:04:22 +02:00
Eric Lippmann
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
Eric Lippmann
3aae37aff3
Don't redirect on external auth
...
refs #9660
2015-07-30 12:02:42 +02:00
Eric Lippmann
db505281ee
lib: Disable CSRF token on HTTP authenticated users and not XHR
...
refs #9660
2015-07-30 09:33:04 +02:00
Eric Lippmann
36ff2d8914
lib: Set User::$isHttpUser in Auth
...
refs #9660
2015-07-30 09:32:24 +02:00
Eric Lippmann
775f8cced6
lib: Introduce User::$isHttpUser
...
refs #9660
2015-07-30 09:31:58 +02:00
Eric Lippmann
9f0e48a0a1
Don't send the X-Icinga-Module header more than once
...
fixes #9349
2015-07-30 09:28:05 +02:00
Matthias Jentsch
20aa17c831
Merge branch 'bugfix/selected-row-lost-after-autorefresh-8623'
...
fixes #8623
2015-07-29 17:30:45 +02:00
Eric Lippmann
cf8c680482
lib: Add basic access authentication (WIP)
...
refs #9660
2015-07-29 17:22:55 +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
Matthias Jentsch
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
Thomas Gelf
ba906d2fca
FilterEditor: allow to set custom filter columns
2015-07-29 17:13:18 +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
fb7666e6bd
LdapUserGroupBackend: Adjust usage of LdapCapabilities::hasAdOid()
...
Usage search ftw..
2015-07-29 16:26:39 +02:00
Eric Lippmann
c3a057dbdb
lib: Add AuthChain::setSkipExternalBackends() in favor of setIteratorMode()
...
There's only one mode.
refs #9660
2015-07-29 16:18:30 +02:00
Eric Lippmann
3ca85f9daa
lib: Add Auth::getRequest()
...
Basic auth will require the request.
refs #9660
2015-07-29 15:56:45 +02:00
Eric Lippmann
96e3111f58
lib: Reorder functions in Auth
...
refs #9660
2015-07-29 15:52:56 +02:00
Eric Lippmann
e7c7486097
lib: Fix PHPDoc in User
...
refs #9660
2015-07-29 15:46:53 +02:00
Eric Lippmann
37ef87b9ab
lib: Fix PHPDoc in ExternalBackend
...
refs #9660
2015-07-29 15:46:40 +02:00
Eric Lippmann
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
Eric Lippmann
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
Johannes Meyer
3f7081296b
Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609
2015-07-29 15:02:20 +02:00
Eric Lippmann
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
Eric Lippmann
91720810cc
lib: Document Response::redirectAndExit()
...
refs #9660
2015-07-29 14:22:45 +02:00
Eric Lippmann
a31c799043
lib: Introduce Response::getRequest()
...
refs #9660
2015-07-29 14:20:39 +02:00
Eric Lippmann
ae4b7144cd
lib: Implement Auth::getAuthChain()
...
Saves one use statement for auth chain usages.
refs #9660
2015-07-29 14:14:19 +02:00
Eric Lippmann
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
Johannes Meyer
13edbf901d
UserBackend: Implement interface ConfigAwareFactory
...
refs #9609
2015-07-29 13:44:26 +02:00
Johannes Meyer
83aafe8cda
Allow to discover LDAP connections in the wizard as well
...
...
2015-07-29 09:26:53 +02:00
Eric Lippmann
4d44a0625c
lib: Move UserBackendInterface::authenticate() to new interface Authenticatable
...
refs #9660
2015-07-29 09:25:14 +02:00
Eric Lippmann
2a4e614b5e
Fix code style in AuthChain
...
refs #9660
2015-07-28 19:55: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
d2467fee16
Merge branch 'feature/secure-modules-9644'
...
resolves #9644
2015-07-28 14:00:27 +02:00
Eric Lippmann
47925d0fa0
lib: Make BaseTestCase abstract
...
Else phpunit tries to run the "test" though it shouldn't :)
2015-07-28 13:58:23 +02:00
Eric Lippmann
fe73d6de83
Remove superfluous whitespaces in IcingaException
...
refs #9644
2015-07-28 13:46:32 +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
Matthias Jentsch
c8d065b3e0
Accept DbUserBackends with only one single user
...
fixes #9739
2015-07-28 12:41:08 +02:00
Johannes Meyer
e231ef8061
SortBox: Fix some documenation and code style issues
2015-07-28 12:04:16 +02:00
Johannes Meyer
f7b35b04f4
SortBox: Properly apply sort rules and show the user the default
...
refs #6644
2015-07-28 12:03:50 +02:00
Johannes Meyer
d0dd4b09a0
Repository: It's "sort rules" in general, not "default sort rules"
2015-07-28 11:42:13 +02:00
Johannes Meyer
05af310e4c
RepositoryQuery: Implement interface SortRules
...
refs #6644
2015-07-28 11:41:07 +02:00
Johannes Meyer
cdc2182430
Introduce interface SortRules
...
refs #6644
2015-07-28 11:40:27 +02:00
Eric Lippmann
b84650dd4b
Document variadic function IcingaException::__construct properly
...
refs #9644
2015-07-28 10:45:00 +02:00
Eric Lippmann
a68c05da7f
lib: Require a message when throwing IcingaExceptions
...
refs #9644
2015-07-28 10:43:17 +02:00
Eric Lippmann
78285b95a3
Make Controller::httpNotFound() variadic
...
refs #9644
2015-07-28 10:40:02 +02:00
Eric Lippmann
2c8235d486
lib: Introduce IcingaException::create()
...
refs #9644
2015-07-27 16:25:41 +02:00
Johannes Meyer
9cc7b45458
Merge branch 'master' into bugfix/separate-sort-controls-9421
2015-07-27 11:50:05 +02:00
Johannes Meyer
4d9aa54814
SortBox: Utilize a separate form for each control
...
refs #9421
2015-07-27 11:43:47 +02:00
Matthias Jentsch
a14da1c558
Make sure to log inspection messages into message log too
...
refs #9641
2015-07-27 09:44:07 +02:00
Johannes Meyer
86ad6c48ff
Form: Automatically remove query parameters only for GET forms
...
refs #9421
2015-07-27 08:52:33 +02:00
Johannes Meyer
982e226db0
IcingaException: Add utility method to format exceptions as one-liner
2015-07-24 16:19:20 +02:00
Johannes Meyer
c1a3d205bc
Show more details about unhandled exceptions in the CLI
...
fixes #9646
2015-07-24 15:58:32 +02:00
Eric Lippmann
8358e9165c
Don't require the module permission for the default module
...
refs #9644
2015-07-24 15:11:21 +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
Johannes Meyer
56759e7f21
Merge branch 'master' into feature/ldap-auth-backend-discovery-9602
2015-07-24 10:52:14 +02:00
Eric Lippmann
12856da971
Merge branch 'bugfix/filter-custom-variables-9692'
...
fixes #9692
2015-07-24 09:27:05 +02:00
Johannes Meyer
f06be5c9bc
LdapConnection: Let self::bind() return $this
2015-07-23 17:34:09 +02:00
Thomas Gelf
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
Eric Lippmann
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
Eric Lippmann
fd77c30838
Don't load module dashboards if the authenticated user lacks the module permission
...
refs #9644
2015-07-23 12:57:23 +02:00
Eric Lippmann
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
Eric Lippmann
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
Eric Lippmann
b000ae3a37
Do not require permissions if authentication is not required
...
refs #9644
2015-07-23 12:50:02 +02:00
Eric Lippmann
5dcc307e87
Add namespace for module permissions to the module manager
...
refs #9644
2015-07-22 14:59:35 +02:00
Eric Lippmann
aa567f8cd7
Introduce ModuleActionController::$requiresModulePermission
...
refs #9644
2015-07-22 14:56:02 +02:00
Eric Lippmann
13d954a956
Fix rawurlencode call
2015-07-22 13:36:25 +02:00
Eric Lippmann
52e352751e
Revert "ModuleActionController: fix forward/X-Icinga-Module"
...
This reverts commit bf82bd4ce1
.
We have a not merged branch for this.
refs #9349
2015-07-22 13:34:44 +02:00
Markus Frosch
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
Johannes Meyer
54a77b7253
Merge branch 'master' into feature/support-for-file-uploads-8758
2015-07-22 13:30:56 +02:00