Adds LDAP Adapter test in integration group

Adds ext-ldap on github-actions
symfony · derrabus · Nov 16, 2020 · Nov 2, 2020 · Nov 16, 2020 · Nov 16, 2020
commit af9562b12c1590fb546e9fc4272a022fff46e9f4
diff --git a/.github/workflows/actions/populate-ldap/Dockerfile b/.github/workflows/actions/populate-ldap/Dockerfile
@@ -0,0 +1,9 @@
+FROM osixia/openldap
+LABEL maintainer="wshihadeh.devx@gmail.com"
+ENV LDAP_ORGANISATION="Symfony"
+ENV LDAP_DOMAIN="symfony.com"
+ENV LDAP_ADMIN_PASSWORD="symfony"
+ENV LDAP_BASE_DN="dc=symfony,dc=com"
+ENV LDAP_SEED_INTERNAL_LDIF_PATH="/ldif-data"
+RUN mkdir /ldif-data
+COPY ./fixtures.ldif /ldif-data/50-fixtures.ldif
diff --git a/.github/workflows/actions/populate-ldap/action.yml b/.github/workflows/actions/populate-ldap/action.yml
@@ -0,0 +1,9 @@
+name: 'LDAP Populate'
+description: 'Create a pre-populated LDAP server with symfony test data'
+branding:
+  icon: 'database'
+  color: 'blue'
+
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
diff --git a/.github/workflows/actions/populate-ldap/fixtures.ldif b/.github/workflows/actions/populate-ldap/fixtures.ldif
@@ -0,0 +1,26 @@
+dn: cn=Fabien Potencier,dc=symfony,dc=com
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Fabien Potencier
+sn: fabpot
+mail: fabpot@symfony.com
+mail: fabien@potencier.com
+ou: People
+ou: Maintainers
+ou: Founder
+givenName: Fabien Potencier
+description: Founder and project lead @Symfony
+
+dn: ou=Components,dc=symfony,dc=com
+objectclass: organizationalunit
+ou: Components
+
+dn: ou=Ldap,ou=Components,dc=symfony,dc=com
+objectclass: organizationalunit
+ou: Ldap
+
+dn: ou=Ldap scoping,ou=Ldap,ou=Components,dc=symfony,dc=com
+objectclass: organizationalunit
+ou: Ldap scoping
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -45,6 +45,9 @@ jobs:
             -   name: Checkout
                 uses: actions/checkout@v2
 
+            - name: Populate LDAP
+                  uses: ./.github/actions/populate-ldap
+
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
@@ -87,6 +90,8 @@ jobs:
                     MESSENGER_REDIS_
8000
DSN: redis://127.0.0.1:7006/messages
                     MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
                     MEMCACHED_HOST: localhost
+                    LDAP_HOST: localhost
+                    LDAP_PORT: 3389
 
             -   name: Run HTTP push tests
                 if: matrix.php == '7.4'

diff --git a/.travis.yml b/.travis.yml
@@ -55,11 +55,6 @@ before_install:
       # General configuration
       set -e
       stty cols 120
-      mkdir /tmp/slapd
-      if [ ! -e /tmp/slapd-modules ]; then
-          [ -d /usr/lib/openldap ] && ln -s /usr/lib/openldap /tmp/slapd-modules || ln -s /usr/lib/ldap /tmp/slapd-modules
-      fi
-      slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 &
       cp .github/composer-config.json "$(composer config home)/config.json"
       export PHPUNIT=$(readlink -f ./phpunit)
       export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -15,7 +15,7 @@
         <ini name="memory_limit" value="-1" />
         <env name="DUMP_LIGHT_ARRAY" value="" />
         <env name="DUMP_STRING_LENGTH" value="" />
-        <env name="LDAP_HOST" value="127.0.0.1" />
+        <env name="LDAP_HOST" value="localhost" />
         <env name="LDAP_PORT" value="3389" />
         <env name="REDIS_HOST" value="localhost" />
         <env name="MEMCACHED_HOST" value="localhost" />

diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
@@ -25,12 +25,6 @@
  */
 class AdapterTest extends LdapTestCase
 {
-    private const PAGINATION_REQUIRED_CONFIG = [
-        'options' => [
-            'protocol_version' => 3,
-        ],
-    ];
-
     public function testLdapEscape()
     {
         $ldap = new Adapter();
@@ -122,7 +116,7 @@ public function testLdapQueryScopeOneLevel()
 
     public function testLdapPagination()
     {
-        $ldap = new Adapter(array_merge($this->getLdapConfig(), static::PAGINATION_REQUIRED_CONFIG));
+        $ldap = new Adapter(array_merge($this->getLdapConfig()));
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
         $entries = $this->setupTestUsers($ldap);
 
@@ -205,7 +199,7 @@ private function destroyEntries($ldap, $entries)
 
     public function testLdapPaginationLimits()
     {
-        $ldap = new Adapter(array_merge($this->getLdapConfig(), static::PAGINATION_REQUIRED_CONFIG));
+        $ldap = new Adapter(array_merge($this->getLdapConfig()));
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
 
         $entries = $this->setupTestUsers($ldap);

diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -15,14 +15,14 @@
 use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
 use Symfony\Component\Ldap\Adapter\ExtLdap\UpdateOperation;
 use Symfony\Component\Ldap\Entry;
-use Symfony\Component\Ldap\Exception\AlreadyExistsException;
 use Symfony\Component\Ldap\Exception\LdapException;
 use Symfony\Component\Ldap\Exception\NotBoundException;
 use Symfony\Component\Ldap\Exception\UpdateOperationException;
 use Symfony\Component\Ldap\Tests\LdapTestCase;
 
 /**
  * @requires extension ldap
+ * @group integration
  */
 class LdapManagerTest extends LdapTestCase
 {
@@ -82,7 +82,7 @@ public function testLdapAddInvalidEntry()
      */
     public function testLdapAddDouble()
     {
-        $this->expectException(AlreadyExistsException::class);
+        $this->expectException(LdapException::class);
         $this->executeSearchQuery(1);
 
         $entry = new Entry('cn=Elsa Amrouche,dc=symfony,dc=com', [
@@ -94,7 +94,12 @@ public function testLdapAddDouble()
 
         $em = $this->adapter->getEntryManager();
         $em->add($entry);
-        $em->add($entry);
+        try {
+            $em->add($entry);
+        } catch (LdapException $e) {
+            $em->remove($entry);
+            throw $e;
+        }
     }
 
     /**
@@ -210,7 +215,8 @@ public function testLdapRenameWithoutRemovingOldRdn()
         $newEntry = $result[0];
         $originalCN = $entry->getAttribute('cn')[0];
 
-        $this->assertStringContainsString($originalCN, $newEntry->getAttribute('cn'));
+        $this->assertContains($originalCN, $newEntry->getAttribute('cn'));
+        $this->assertContains('Kevin', $newEntry->getAttribute('cn'));
 
         $entryManager->rename($newEntry, 'cn='.$originalCN);
 
@@ -372,13 +378,16 @@ public function testLdapMove()
         $result = $this->executeSearchQuery(1);
 
         $entry = $result[0];
-        $this->assertNotContains('ou=Ldap', $entry->getDn());
+        $this->assertStringNotContainsString('ou=Ldap', $entry->getDn());
 
         $entryManager = $this->adapter->getEntryManager();
         $entryManager->move($entry, 'ou=Ldap,ou=Components,dc=symfony,dc=com');
 
         $result = $this->executeSearchQuery(1);
         $movedEntry = $result[0];
         $this->assertStringContainsString('ou=Ldap', $movedEntry->getDn());
+
+        // Move back entry
+        $entryManager->move($movedEntry, 'dc=symfony,dc=com');
     }
 }
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
@@ -9,6 +9,7 @@ class LdapTestCase extends TestCase
     protected function getLdapConfig()
     {
         $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));
+        ldap_set_option($h, LDAP_OPT_PROTOCOL_VERSION, 3);
 
         if (!$h || !@ldap_bind($h)) {
             $this->markTestSkipped('No server is listening on LDAP_HOST:LDAP_PORT');