Commit Graph

406 Commits

Author SHA1 Message Date
Matthias Jentsch 3600e1088c Fix key and value sanitazion in ini writer 2015-06-08 13:11:40 +02:00
Johannes Meyer e66f8731af UserBackendConfigForm: Allow to configure user backends of type msldap
fixes #9355
2015-06-05 17:20:31 +02:00
Johannes Meyer 267e71f38b User: Consider the required permission more important if it has a wildcard
refs #9202
2015-06-02 12:01:02 +02:00
Johannes Meyer cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +02:00
Johannes Meyer 2490d0ae67 ConfigController: We're configuring user backends from now on
refs #8826
2015-06-02 09:58:57 +02:00
Matthias Jentsch 4c6a2b4f06 Fix ini writer unit tests
refs #8706
2015-06-01 16:46:52 +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 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
Johannes Meyer fb07f0b94c Merge branch 'master' into feature/user-and-group-management-8826
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
Eric Lippmann 5b3957baca Drop the DateTimeRendererTest
refs #6778
2015-05-19 12:46:33 +02:00
Eric Lippmann 15b2e873b2 Drop the DateTimeFactoryTest
refs #6778
2015-05-19 11:27:56 +02:00
Eric Lippmann 82ee1d6e60 Merge branch 'master' into bugfix/significant-whitespaces-8777
Conflicts:
	library/Icinga/Web/Widget/FilterEditor.php
2015-05-18 13:35:28 +02:00
Johannes Meyer c91d3e52ac Merge branch 'master' into feature/user-and-group-management-8826 2015-05-12 15:39:02 +02:00
Alexander Fuhr 891ce0fe57 UserTest: Fix wrong assert condition for wildcard 2015-05-07 17:19:00 +02:00
Johannes Meyer e228404bf4 Adjust ConfigObjectTest as ConfigObjects are not countable anymore
They are of course still indirectly countable, by using Config::count() or
ConfigObject::select()::count().
2015-05-05 15:36:15 +02:00
Alexander Fuhr 612fefba9c Fix the permission wildcards assertion
fixes #9202
2015-05-05 12:36:26 +02:00
Johannes Meyer 9163fb0f0f Drop Icinga\Protocol\Ldap\ConnectionTest
...located at *test*/php/library/Icinga/Protocol/Ldap/.
2015-05-04 13:40:54 +02:00
Johannes Meyer 100d475b58 Fix ldap ConnectionTest
If I ever have to look at this test again, I'll drop it.

refs #8826
2015-05-04 13:25:07 +02:00
Johannes Meyer c441117324 LdapUserBackend: Extend Repository and implement UserBackendInterface
refs #8826
2015-05-04 12:18:25 +02:00
Johannes Meyer 99ac0b78ea DbUserBackend: Extend DbRepository and implement UserBackendInterface
refs #8826
2015-05-04 12:15:05 +02:00
Johannes Meyer 5baa0590b1 Ldap\Query: Extend SimpleQuery and add missing documentation
refs #8826
refs #8955
2015-05-04 11:26:27 +02:00
Johannes Meyer d09ea2845d Merge branch 'master' into feature/user-and-group-management-8826 2015-04-30 15:20:40 +02:00
Johannes Meyer 034421d0cb Fix form tests utilizing Mockery's partial mock functionality
Since an update of Mockery, partial mocks do not call the constructor
of their mocked classes anymore without explicitly passing a non empty
array. This is a regression of the following bug:
https://github.com/padraic/mockery/issues/144
2015-04-30 15:20:19 +02:00
Johannes Meyer adae7b34c1 Fix DbBackendFormTest and LdapBackendFormTest
refs #8826
2015-04-22 10:36:37 +02:00
Eric Lippmann 09acddb3b7 Fix filter tests not taking whitespaces into account
refs #8777
2015-04-08 10:18:42 +02: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 5c371a6d0b Fix form tests 2015-03-04 09:43:37 +01:00
Matthias Jentsch e4f71eacd6 Add unit tests for ldap connection behavior
It is important that we test handling of protocol extensions properly, to prohibit errors that are difficult to reproduce like this in the future.

fixes #7993
2015-02-27 17:11:12 +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
Johannes Meyer 625fa4d738 Use shipped Zend framework in the testsuite as well 2014-11-27 11:37:18 +01:00
Alexander Klimov a3fa31c35a PHP tests: don't require Hamcrest 2014-11-26 13:51:48 +01:00
Marius Hein bfa7320d85 Dashboard: Fix tests
refs #7751
2014-11-20 12:48:05 +01:00
Marius Hein 8c3dbb2b45 Dashbosrd: Fix tests
refs #4537
2014-11-18 17:26:28 +01:00
Johannes Meyer 7621f6642d Adjust usages of Icinga\Application\Config
refs #7147
2014-11-18 13:11:52 +01:00
Johannes Meyer 0c84bf614d Split config functionality into two classes
There is now Icinga\Application\Config as our ini configuration handler and
Icinga\Data\ConfigObject as our general configuration container.

refs #7147
2014-11-18 13:02:56 +01:00
Johannes Meyer ddf2ef5cc9 Remove $request parameter from Form::onSuccess and Form::onRequest
fixes #7552
2014-11-14 14:59:29 +01:00
Johannes Meyer 586b4f463b Let our module autloader know that we renamed our form namespaces
refs #7553
2014-11-14 11:30:44 +01:00
Johannes Meyer 775c20d9ad Rename namespace Icinga\Form to Icinga\Forms
refs #7553
2014-11-14 10:57:14 +01:00
Eric Lippmann ac2ec83852 Merge branch 'master' into feature/localization-form-6073
Conflicts:
	library/Icinga/Application/ApplicationBootstrap.php
	test/php/library/Icinga/User/Store/DbStoreTest.php
2014-11-13 17:03:41 +01:00
Alexander Fuhr b8113b688b Update User\Store\IniStoreTest 2014-11-12 17:13:15 +01:00
Alexander Fuhr 8bb318eb72 Update User\Store\DbStoreTest 2014-11-12 17:12:05 +01:00
Johannes Meyer 7aae291f69 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 10:08:28 +01:00
Johannes Meyer a6af51f402 Fix that Config::fromSection cannot return the actual value
refs #7147
2014-11-11 15:51:54 +01:00
Matthias Jentsch fdfad34e5c Do not normalize configuration keys to nested arrays in IniWriter
More than one nesting level (the section) is no longer allowed in configuration files. Dots in keys are now
part of the key and will not lead to a nested configuration.

fixes #7120
2014-11-11 15:05:34 +01:00
Johannes Meyer af99f62843 Prefer Icinga\Application\Config over Zend_Config
refs #7163
2014-11-11 12:11:14 +01:00
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Johannes Meyer 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00