more db ssl options

espocrm · Aug 15, 2017 · 1c7fb79 · 1c7fb79
1 parent c6c16cd
commit 1c7fb79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/application/Espo/Core/Loaders/EntityManager.php b/application/Espo/Core/Loaders/EntityManager.php
@@ -46,9 +46,11 @@ public function load()
             'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',
             'driver' => $config->get('database.driver'),
             'platform' => $config->get('database.platform'),
-            'sslCA' =>  $config->get('database.sslCA'),
-            'sslCert' =>  $config->get('database.sslCert'),
-            'sslKey' =>  $config->get('database.sslKey')
+            'sslCA' => $config->get('database.sslCA'),
+            'sslCert' => $config->get('database.sslCert'),
+            'sslKey' => $config->get('database.sslKey'),
+            'sslCAPath' => $config->get('database.sslCAPath'),
+            'sslCipher' => $config->get('database.sslCipher')
         );
 
         $entityManager = new \Espo\Core\ORM\EntityManager($params);

diff --git a/application/Espo/ORM/EntityManager.php b/application/Espo/ORM/EntityManager.php
@@ -145,6 +145,12 @@ protected function initPDO()
         if (isset($params['sslKey'])) {
             $options[\PDO::MYSQL_ATTR_SSL_KEY] = $params['sslKey'];
         }
+        if (isset($params['sslCAPath'])) {
+            $options[\PDO::MYSQL_ATTR_SSL_CAPATH] = $params['sslCAPath'];
+        }
+        if (isset($params['sslCipher'])) {
+            $options[\PDO::MYSQL_ATTR_SSL_CIPHER] = $params['sslCipher'];
+        }
 
         $this->pdo = new \PDO($platform . ':host='.$params['host'].';'.$port.'dbname=' . $params['dbname'] . ';charset=' . $params['charset'], $params['user'], $params['password'], $options);
         $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);