kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Found the actual issue I tried to fix last time which was the broken midair collision check. Now it also makes sense why the function broke with the later fixing I did. Basically countMail() was not aware of any LDAP escaping when counting objects with an excluded DN. Should now be fixed and I added a test for that problem.

1 files changed, 13 insertions, 0 deletions

diff --git a/test/KolabAdmin/Unit/BaseTest.php b/test/KolabAdmin/Unit/BaseTest.php
index 55e7f9b..f7b6f23 100644
--- a/test/KolabAdmin/Unit/BaseTest.php
+++ b/test/KolabAdmin/Unit/BaseTest.php
@@ -88,6 +88,19 @@ class KolabAdmin_Unit_BaseTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    public function testCountmailReturnsZeroOnExistingMailWithEscapedDnCharactersIfDnExcluded()
+    {
+        $this->_add($this->_getTestUser(',=,'));
+        $this->assertEquals(
+            0,
+            $this->ldap->countMail(
+                $_SESSION['base_dn'],
+                'kolabadmin.test.,=,@' . $_SESSION['fqdnhostname'],
+                'cn=' . $this->ldap->dn_escape('KolabAdmin TestUser,=,') . ',' . $_SESSION['base_dn']
+            )
+        );
+    }
+
     public function testAddingObjectIsSuccessful()
     {
         $this->_add($this->_getTestUser());