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
Johannes Meyer
a199d36207
Stylesheet: Disable extendend @import statements provided by LESS
...
fixes #9687
2015-07-22 12:45:10 +02:00
Eric Lippmann
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
Thomas Gelf
bf82bd4ce1
ModuleActionController: fix forward/X-Icinga-Module
2015-07-22 10:53:42 +02:00
Johannes Meyer
cecd94be50
Merge branch 'master' into feature/support-for-file-uploads-8758
2015-07-22 08:47:24 +02:00
Johannes Meyer
c0de2e6ee3
Form: Add missing use statement for the ProgrammingError exception
2015-07-22 08:39:24 +02:00
Eric Lippmann
ce2b686252
Add file and line of logged menu item renderer exceptions
...
fixes #9696
2015-07-21 16:54:23 +02:00
Johannes Meyer
8f2849f32a
Form: Improve code readability..
...
..and avoid the necessity to provide another mock when testing
Form::handleRequest().
refs #8758
2015-07-21 16:48:56 +02:00
Johannes Meyer
7c89887773
Form: Provide an absolute url as redirect url for successful frame uploads
...
refs #8758
2015-07-21 16:35:56 +02:00
Johannes Meyer
6c9819204d
Form: Only work with a single type when handling redirect urls
...
$form->setRedirectUrl('some/url') still works, but $form->getRedirectUrl()
will only return instances of Icinga\Web\Url now.
2015-07-21 16:33:24 +02:00
Johannes Meyer
fc481e527b
Form: Process request parameter _frameUpload
...
This parameter is being used to flag a request as form submission issued
by utilizing an iframe. Appending it to a form's action causes no redirection
to take place in case of successful submission and a reduced but still valid
layout to be printed in any way. Redirection must be handled by the client
regarding the meta tag "redirectUrl".
refs #8758
2015-07-21 15:22:24 +02:00
Johannes Meyer
0a9a066749
Form: Do not create a new instance of Url when returning the redirect url
...
We're shifting parameters and by creating a new instance we'll lose
such changes.
refs #8758
2015-07-21 15:13:56 +02:00
Johannes Meyer
47fbc24f17
Merge branch 'master' into bugfix/improve-form-notifications-8983
...
Conflicts:
library/Icinga/Web/Form.php
modules/setup/application/forms/AdminAccountPage.php
2015-07-20 15:52:10 +02:00
Matthias Jentsch
5478027855
Bring back user count in ldap backend inspection
...
We already use count later in the wizard anyways.
refs #9630
2015-07-16 16:52:56 +02:00
Matthias Jentsch
e357960d1e
Add Inspection API to DB backend
...
refs #9641
2015-07-16 16:16:55 +02:00
Matthias Jentsch
f4054d575b
Add Inspection API to db connection
...
refs #9641
2015-07-16 15:29:45 +02:00
Matthias Jentsch
c55ba6dff4
fix coding guideline violations
2015-07-16 13:51:35 +02:00
Matthias Jentsch
ffe672c252
Improve message texts and scalabillity
...
Always start uppercase and don't use count() function until we've got a more scalable implementation in the LdapConnection.
refs #9630
2015-07-16 13:51:26 +02:00
Matthias Jentsch
6b8e5da76d
Move all assertion functions into the inspect functions
...
Reduce code duplication and add class Inspection
refs #9630
2015-07-16 12:21:11 +02:00
Johannes Meyer
2164bb86c8
Tabs: Do not create a new instance of Url when rendering the refresh url
...
We're shifting parameters and by creating a new instance we'll lose
such changes.
refs #8758
2015-07-16 11:27:31 +02:00
Johannes Meyer
549f36f82c
Form: Do not create a new instance of Url when setting the action
...
We're shifting parameters and by creating a new instance we'll lose
such changes.
refs #8758
2015-07-16 11:27:02 +02:00
Johannes Meyer
d192410435
Introduce GET parameter _disableLayout to ... disable the entire layout
...
refs #8758
2015-07-16 11:23:48 +02:00
Matthias Jentsch
59c4f8d056
Use Inspection API in User Backend Form
...
refs #9630
2015-07-15 19:35:25 +02:00
Matthias Jentsch
cf8b760ade
Use Inspection API in LdapResourceForm
...
refs #9630
2015-07-15 19:33:47 +02:00
Matthias Jentsch
276aa43aa2
Upgrdae Inspection API again
...
Do not use InspectionException any more to reduce complexity of nested inspections, but keep error states
in the Inspection object itself.
refs #9630
2015-07-15 18:39:09 +02:00
Matthias Jentsch
6762ef053e
Upgrade Inspection API
...
Reduce code duplication and stateffullnes by using InspectionException to indicate that an error was thrown, and only using one inspect function.
refs #9630
2015-07-15 17:51:18 +02:00
Matthias Jentsch
774d6ce94a
Fix invalid function call in getCapabilities caused by refactoring
2015-07-15 15:36:32 +02:00
Johannes Meyer
f3c8f2229f
ErrorLabeller: Provide localized output for the MimeType validator
...
refs #8758
2015-07-15 15:15:15 +02:00
Matthias Jentsch
af58d6964b
Fix isEncrypted function broken by refactaring
...
refs #9608
2015-07-15 12:23:30 +02:00
Matthias Jentsch
7daa97a166
Clean up unneded code
...
Remove the now useless error handling cases in case encryption wasn't successful.
refs #9608
2015-07-15 11:31:56 +02:00
Matthias Jentsch
3b8b5b0022
Revert accidentally commited unneded changes
2015-07-15 11:16:06 +02:00
Matthias Jentsch
212111511a
Fix violations of coding guidelines
2015-07-15 10:32:54 +02:00
Matthias Jentsch
84899e3e56
Revert some unneeded changes
...
refs #9605
2015-07-15 09:56:18 +02:00
Matthias Jentsch
f4d8bfc309
Display connection test info when inspecting LdapConnections
...
refs #9605
2015-07-14 18:36:26 +02:00
Matthias Jentsch
3ddb8ca1bd
Add abillity to discover AD version and vendor name to discovery
...
refs #9605
2015-07-14 18:32:44 +02:00
Matthias Jentsch
40d432100b
Add a function to test the connection health
...
refs #9605
2015-07-14 18:29:58 +02:00
Matthias Jentsch
6599940e6c
Introduce Interface for inspecting ldap connections
...
refs #9605
2015-07-14 12:30:16 +02:00
Johannes Meyer
23f7570ce0
LdapConnection: Don't run a discovery when preparing a new connection
...
fixes #9179
2015-07-10 10:45:10 +02:00
Johannes Meyer
a8ac420897
LdapConnection: Establish a connection lazily
2015-07-10 09:51:39 +02:00
Johannes Meyer
f5089dab1a
DbUserGroupBackend: Use is_numeric() instead of is_int()
...
Using MySQL fetchColumn() returns integers for id fields, using MariaDB
though, fetchColumn() returns strings..
fixes #9572
2015-07-07 14:07:55 +02:00
Johannes Meyer
caca219aa1
DbRepository: Consider table aliases while handling statement columns
...
Usually not required as there are no aliases for statements possible
but since we cannot differentiate everywhere what type of column
we're processing it is safer to always handle such.
fixes #9553
2015-07-03 13:06:10 +02:00
Johannes Meyer
066b3d9e28
ApplicationConfigForm: Make preference options be global options
...
refs #8709
2015-07-01 15:41:45 +02:00
Johannes Meyer
5b908d85bb
Form: Fix notifications
...
* Coding style issues
* Notifications were not grouped by type
* Notifications of sub-forms were overwriting existing ones
(cherry picked from commit 147f6be714
)
2015-07-01 14:26:03 +02:00
Johannes Meyer
d5ba40ac19
Form: Add hint support
...
Hints are short messages displayed at the bottom of a form
used to describe specific aspects on how to interact with
the form.
refs #8983
2015-06-30 15:02:58 +02:00
Johannes Meyer
ea6f707bdf
FormDescriptions: Do not render a description for required fields
...
refs #8983
2015-06-30 14:28:27 +02:00
Johannes Meyer
147f6be714
Form: Fix notifications
...
* Coding style issues
* Notifications were not grouped by type
* Notifications of sub-forms were overwriting existing ones
2015-06-30 14:25:33 +02:00
Matthias Jentsch
aecfb2eb97
Merge branch 'bugfix/multiselection-not-visible-9054'
...
fixes #9054
fixes #9346
2015-06-30 14:08:19 +02:00
Johannes Meyer
702a9c9523
Form: Show notifications and errors below any descriptions
...
They might be textually related to one or more descriptions.
refs #8983
2015-06-30 13:22:54 +02:00
Matthias Jentsch
6a7e3fe440
Document multi selection and use clearer names
...
refs #9054
2015-06-30 13:03:41 +02:00
Matthias Jentsch
aec59d9941
Use current filter to highlight active rows instead of storing active rows in JS
...
Clean up selection code and move it into separate behavior and parse filter query to fetch selectable rows.
refs #9054
refs #9346
2015-06-29 18:48:42 +02:00
Johannes Meyer
e795665421
Wizard: Issue a partial validation only if desired for a certain page
...
fixes #9306
2015-06-29 17:08:31 +02:00
Johannes Meyer
cfd43f251e
Revert "Sortable: Allow to check for a particular sort rule"
...
This reverts commit ae21baa41e
.
2015-06-26 15:13:46 +02:00
Johannes Meyer
0fc8e6046c
RepositoryQuery: Update sort order when converting sort rules in fetchAll
2015-06-26 15:13:31 +02:00
Johannes Meyer
0bcf7907d4
RepositoryQuery: Optimize value conversion in fetchColumn & -Pairs
2015-06-26 15:11:15 +02:00
Johannes Meyer
ae21baa41e
Sortable: Allow to check for a particular sort rule
2015-06-26 14:54:15 +02:00
Johannes Meyer
9055eb9cb7
RepositoryQuery: Do not sort by converted columns for limited queries
...
A limited query with conversion rules makes it impossible to sort
the result.
2015-06-26 14:24:03 +02:00
Johannes Meyer
56c506c8af
SimpleQuery: Do not report to have a limit if there is none
2015-06-26 14:21:09 +02:00
Johannes Meyer
5d3eb5e8cb
Repository: Allow to check for conversion rules of a specific column
2015-06-26 14:20:35 +02:00
Johannes Meyer
4ba84903f1
Repository: Accept already resolved columns as well
...
If a column was aliased, one was required to use the alias when
selecting, sorting or filtering. This is now not necessary anymore
as it's now possible to use the actual column name as well.
2015-06-26 13:07:21 +02:00
Johannes Meyer
f956d09597
LdapConnection: Fetch attributes required for sorting the results
2015-06-25 15:51:19 +02:00
Johannes Meyer
6ff15acc1b
LdapConnection: Fix that fetchColumn() returns results unordered
2015-06-25 15:50:15 +02:00
Johannes Meyer
ca112af9ad
RepositoryQuery: Allow to ignore any default sort rules
2015-06-25 15:49:09 +02:00
Johannes Meyer
3dddee8b7d
Setup: Fix authentication backend validation
...
This is a ridiculous dirty fix. We'll definitely need to
improve how we create authentication backends...
fixes #9509
2015-06-25 14:36:51 +02:00
Johannes Meyer
ebe144c16a
Form: Do not encode actions twice
2015-06-24 16:15:45 +02:00
Johannes Meyer
8448f4ade4
Revert "Tabs: Merge the action's params into the current request url's params"
...
This reverts commit ba4dd255ec
.
fixes #9494
2015-06-24 15:27:39 +02:00
Johannes Meyer
98b01207cf
Show intersecting ok-states as well in the default servicegrid view
...
fixes #9360
2015-06-24 14:37:07 +02:00
Johannes Meyer
9595809dfa
SimpleQuery: Deep clone the filter when cloning the query
2015-06-24 14:33:11 +02:00
Johannes Meyer
3c47ef6826
Ldap\Exception: Rename to LdapException
...
refs #8954
2015-06-24 09:19:41 +02:00
Johannes Meyer
5dea14f04b
Ldap\Query: Rename to LdapQuery
...
refs #8954
2015-06-24 09:14:25 +02:00
Johannes Meyer
c3ad7b211a
Ldap\Connection: Rename to LdapConnection
...
refs #8954
2015-06-24 09:05:29 +02:00
Johannes Meyer
7921e62a0c
Ldap\Connection: Fix existing documentation
...
Part #2
refs #8954
2015-06-23 17:38:19 +02:00
Johannes Meyer
f234b3b768
Ldap\Connection: Re-organize some methods..
...
..and add some missing documentation.
refs #8954
2015-06-23 17:37:10 +02:00
Johannes Meyer
372ca8859e
Ldap\Connection: Some coding style fixes
...
refs #8954
2015-06-23 17:27:30 +02:00
Johannes Meyer
7640284564
Ldap\Connection: Add missing documentation
...
Part #2
refs #8954
2015-06-23 17:23:47 +02:00
Johannes Meyer
b25bf4838b
Ldap\Connection: Re-organize some properties
...
lowerCamelCase, initialisation in __construct, and stuff..
refs #8954
2015-06-23 17:22:26 +02:00
Johannes Meyer
9b0ac3000a
Ldap\Connection: Drop unused property $count
...
refs #8954
2015-06-23 17:17:53 +02:00
Johannes Meyer
02ee460c08
Ldap\Connection: Fix existing documentation
...
Part #1
refs #8954
2015-06-23 17:12:24 +02:00
Johannes Meyer
778bf376b2
Ldap\Connection: Add missing documentation
...
Part #1
refs #8954
2015-06-23 17:06:35 +02:00
Johannes Meyer
c32f9ae735
Ldap\Connection: Drop parameter $fields from method fetchDn()
2015-06-23 15:56:29 +02:00
Johannes Meyer
87e31f497e
Ldap\Connection: Rename method deleteDN() to deleteDn()
2015-06-23 15:21:32 +02:00
Johannes Meyer
3f5cd4b670
Ldap\Connection: Rename method getDN() to getDn()
2015-06-23 15:16:53 +02:00
Johannes Meyer
56cb4c28c4
Ldap\Connection: Rename method hasDN() to hasDn()
2015-06-23 15:11:11 +02:00
Johannes Meyer
759e243d90
Ldap\Connection: Add method fetchPairs()
2015-06-23 15:05:47 +02:00
Johannes Meyer
ac7a7e6674
Ldap\Connection: Add method fetchColumn()
2015-06-23 15:05:03 +02:00
Johannes Meyer
197861efda
Ldap\Connection: Do not suppress errors for failed credential tests
2015-06-23 14:12:01 +02:00
Johannes Meyer
9d6d76a26d
Ldap\Connection: Return false if nothing is found for fetchOne()
...
This should behave like DbConnection::fetchOne().
refs #8954
2015-06-23 12:41:50 +02:00