Merge pull request #1124 from pathmissing/ldap-ssl

Support optional encryption parameter
appserver-io · Jun 22, 2019 · ae73a48 · ae73a48
2 parents 510c04f + f28e16f
commit ae73a48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/AppserverIo/Appserver/Doctrine/Utils/ConnectionUtil.php b/src/AppserverIo/Appserver/Doctrine/Utils/ConnectionUtil.php
@@ -134,6 +134,11 @@ public function fromDatabaseNode(DatabaseConfigurationInterface $databaseNode)
         if ($databasePortNode = $databaseNode->getDatabasePort()) {
             $connectionParameters['port'] = $databasePortNode->getNodeValue()->__toString();
         }
+
+	// adds the optional encryption option
+        if ($encryptionNode = $databaseNode->getEncryption()) {
+            $connectionParameters['encryption'] = $encryptionNode->getNodeValue()->__toString();
+        }
 
         // add charset, if specified
         if ($charsetNode = $databaseNode->getCharset()) {

diff --git a/src/AppserverIo/Appserver/Ldap/EntityManagerFactory.php b/src/AppserverIo/Appserver/Ldap/EntityManagerFactory.php
@@ -143,7 +143,8 @@ public function factory()
             $ldapClient = new LdapClient(
                 Ldap::create($connectionParameters['driver'], [
                     'host' => $connectionParameters['host'],
-                    'port' => $connectionParameters['port']
+                    'port' => $connectionParameters['port'],
+                    'encryption' => $connectionParameters['encryption']
                 ])
             );