25f397042b
Merge branch 'master' into feature/improve-multi-select-view-8565
...
Conflicts:
modules/monitoring/application/controllers/HostsController.php
modules/monitoring/application/controllers/ServicesController.php
modules/monitoring/application/views/scripts/hosts/show.phtml
modules/monitoring/application/views/scripts/list/hosts.phtml
modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
modules/monitoring/application/views/scripts/services/show.phtml
modules/monitoring/public/css/module.less
public/js/icinga/behavior/tooltip.js
2015-05-11 13:28:43 +02:00
be696e5adf
LogFileIterator: Fix missing closing bracket
2015-05-05 12:50:35 +02:00
7c0be30def
Handle and display multiline log messages correctly
2015-04-24 17:36:49 +02:00
ec82b3bc09
Implement Icinga\Protocol\File\LogFileIterator
2015-04-24 17:36:48 +02:00
3d53e6f9b5
Icinga\Protocol\File\FileReader::count(): call iterator_count() only once per instance and cache the returned value
2015-04-24 11:10:40 +02:00
46da404452
Add docstrings to ObjectList and coding style
2015-04-07 16:34:20 +02:00
967a2e82dc
Use (only) "@return $this" in fluent interfaces' documentation
2015-04-07 14:24:11 +02:00
9ce9e0270c
Fix that LDAP encryption settings have no effect
...
I renamed the directive for the encryption setting from 'connection' to 'encryption' before releasing Beta3 but
I forgot to change the Connection class accordingly.
fixes #8953
2015-04-02 10:41:25 +02:00
316d926811
Ldap/Query: re-add __toString
...
We stopped using __toString as it is unable to handle exceptions - and
this makes sense. However, that's IMO not a good reason to completely
drop __toString. Especially when debugging, benchmarking and similar you
often need a quick way to "dump" an object.
In that case you are often not in a mood to figure out whether that
specific class prefers create(), dump(), render() or whatever. We should
not base our view scripts on __toString - at least unless we do not catch
Exceptions in __toString methods, eventually "forwarding" them as triggered
error where needed.
2015-03-13 08:58:25 +01:00
d8d0d88c95
Rename Capability::hasStartTLS to Capability::hasStartTls()
2015-03-13 00:29:00 +01:00
db08ccad4b
Fix encryption setting written to a LDAP reource's INI configuration
...
Use starttls for STARTTLS and ldaps for LDAPS.
2015-03-12 23:56:25 +01:00
86f3ce9133
Rename Ldap\Connetion::SSL to ::LDAPS
...
The SSL constant was used to denote LDAP over TLS/SSL. In fact both STARTTLS and LDAPS use encrypted TLS/SSL communication
w/ STARTTLS upgrading a plain text connection and LDAPS using a separate port. Thus speaking of SSL only for LDAPS and TLS only for STARTTLS
is not correct.
2015-03-12 23:56:08 +01:00
1b9ddaacac
Add PHPDoc to Ldap\Connection's encryption consts
2015-03-12 23:35:38 +01:00
17393a7b41
Remove unnecessary PHPDoc tags from Ldap\Connection
2015-03-12 23:30:04 +01:00
8295d6d9b0
Do not require the `connection' directive when creating a LDAP resource
2015-03-12 15:36:52 +01:00
5de5a65df0
Do not suppress errors when a LDAP capability query fails
2015-03-12 15:18:00 +01:00
1b440a4f1b
Make SSL/TLS configurable for LDAP resources
...
refs #7771
2015-03-12 15:17:19 +01:00
0758be4af1
Add support for dynamic ldap filter expressions
...
"Dynamic" is a more of a overstatement when describing this commit but
the current implementation is just the start. Once our ldap protocol stuff
supports our filter implementation this will be vastly improved.
refs #8365
2015-03-11 09:50:41 +01:00
2cf09ebc48
Revert "LdapResourceForm: Validate the host field and do not require a port"
...
This reverts commit a34d6026b3#7990
2015-03-11 08:00:20 +01:00
a34d6026b3
LdapResourceForm: Validate the host field and do not require a port
...
fixes #7990
2015-03-10 15:03:48 +01:00
36d2d31035
Do not use page control unless explicitly announced
...
refs #8490
2015-02-27 17:10:55 +01:00
65821863fa
Don't crash on single ldap capability entries
...
refs #8490
2015-02-27 17:10:21 +01:00
e93a5f16d9
Move capability-related code of the ldap connection into a separate class
...
Achieve a better separation between the different concerns, more readable code and get rid of unused dead code.
2015-02-27 17:10:21 +01:00
bc950a855d
Surpress warnings when ldap page control is not available
2015-02-25 18:39:03 +01:00
d4dc0177c0
Sort LDAP user list
...
fixes #7693
2015-02-24 12:50:57 +01:00
b70cda77d4
Fail gracefully if the page control is not available
...
Execute the runPagedQuery without pagination instead of throwing an exception.
fixes #8490
2015-02-24 12:22:29 +01:00
b828f8b13a
Fix ldap authentication when authenticating against ActiveDirectory
...
Unlike OpenLDAP, ActiveDirectory does not seem to react on the size limit
passed to ldap_search() in global manner causing it to not to respond with
LDAP_SIZELIMIT_EXCEEDED (4) in case a requested page contains more
entries than the requested maximum.
fixes #7993
2015-02-06 16:37:35 +01:00
3852feb069
Add defaults for limit and offset in Icinga\Protocol\Ldap\Query
2015-02-06 16:32:59 +01:00
c49f723f05
Let Icinga\Protocol\Ldap\Exception inherit from IcingaException
2015-02-06 16:31:03 +01:00
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
12497749fc
Do not log when using a limited query for a paged search operation
2015-02-04 10:51:49 +01:00
5f624e42fd
Fix minor mistakes in Ldap/Connection
...
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-02-04 09:44:17 +01:00
5b4fab0750
Add license header
...
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
5fa2e3cfdc
Revert "Add license header"
...
This reverts commit 338d067aba
2015-02-03 16:16:26 +01:00
338d067aba
Add license header
...
fixes #7788
2015-02-03 15:51:04 +01:00
7989b48248
Fix ldap auth when the userNameAttribute holds multiple values
...
fixes #8246
2015-02-03 10:15:54 +01:00
3e128732b8
Apply a limit to results fetched via Ldap\Connection::fetchRow()
...
fixes #7993
2015-01-29 17:29:11 +01:00
6e533f223e
Log warnings emitted by ldap_control_paged_result_response() as debug
...
Such a warning is emitted as well in case it's not critical. That is passing
an alternative overall result limit using ldap_search() to the server causes
it being applied across pages so ldap_control_paged_result_response()
does not indicate the "end" of the resultset just by adjusting the cookie
but by emitting the warning as well.
2015-01-29 17:12:59 +01:00
9ff0bbcfc0
Fix that Icinga\Protocol\Ldap\Connection does not correctly apply limits
2015-01-29 17:07:58 +01:00
97cc37b99c
Move php version check from ...\Ldap\Query to ...\Ldap\Connection
...
refs #8261
refs #6176
2015-01-29 15:59:03 +01:00
2a115e71d4
Add support for paged LDAP search results
...
fixes #8261
refs #6176
2015-01-29 15:53:15 +01:00
c288a68ed5
Merge branch 'master' into bugfix/drop-zend-config-7147
...
Conflicts:
application/forms/LdapDiscoveryForm.php
2014-11-18 13:21:18 +01:00
7621f6642d
Adjust usages of Icinga\Application\Config
...
refs #7147
2014-11-18 13:11:52 +01:00
5f8fcf4005
Fix Ldap server discovery
...
Add a new connection member that stores whether settings were guessed or product of a discovery, move discovery methods into seperate class.
fixes #7691
2014-11-18 09:45:54 +01:00
b6464c5d83
Livestatus\Connection: one more comment
2014-11-16 18:43:11 +01:00
aaec1b84bf
Livestatus\Query: indentation
2014-11-16 18:42:10 +01:00
0ff9d57504
Livestatus\Connection: just a comment
2014-11-16 18:37:01 +01:00
195375f055
Livestatus\Query: use calculated column headers
2014-11-16 18:03:58 +01:00
d368df8211
Livestatus\Connection: check resource on disconnect
2014-11-16 18:01:07 +01:00
2c7373f385
Livestatus\Connection: benchmark, comments
2014-11-16 17:59:56 +01:00
Matthias Jentsch
Alexander Fuhr
Alexander A. Klimov
Eric Lippmann
Thomas Gelf
Johannes Meyer
Marcus Cobden