Merge pull request #13131 from owncloud/db-connect-stacktrace

Prevent leaking db connection info in the stacktrace

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index d10adee558c..f2fcd8730af 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -7,6 +7,7 @@
  */
 
 namespace OC\DB;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
@@ -24,6 +25,15 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 	 */
 	protected $adapter;
 
+	public function connect() {
+		try {
+			return parent::connect();
+		} catch (DBALException $e) {
+			// throw a new exception to prevent leaking info from the stacktrace
+			throw new DBALException($e->getMessage(), $e->getCode());
+		}
+	}
+
 	/**
 	 * Initializes a new instance of the Connection class.
 	 *