[auth] don't share config db connection across threads

(fixes #20054)
qgis · Oct 10, 2018 · 69dab87 · 69dab87
1 parent e71e135
commit 69dab87
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -41,6 +41,7 @@
 #include "keychain.h"
 
 // QGIS includes
+#include "qgsapplication.h"
 #include "qgsauthcertutils.h"
 #include "qgsauthcrypto.h"
 #include "qgsauthmethod.h"
@@ -111,15 +112,28 @@ QSqlDatabase QgsAuthManager::authDatabaseConnection() const
   if ( isDisabled() )
     return authdb;
 
-  QString connectionname = QStringLiteral( "authentication.configs" );
-  if ( !QSqlDatabase::contains( connectionname ) )
+  QString connectionName = QStringLiteral( "authentication.configs" );
+  // Sharing the same connection between threads is not allowed.
+  // We use a dedicated connection for each thread requiring access to the database,
+  // using the thread address as connection name.
+  const QString threadAddress = QStringLiteral( ":0x%1" ).arg( reinterpret_cast< quintptr >( QThread::currentThreadId() ), 16 );
+  connectionName += threadAddress;
+  if ( !QSqlDatabase::contains( connectionName ) )
   {
-    authdb = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ), connectionname );
+    authdb = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ), connectionName );
     authdb.setDatabaseName( authenticationDatabasePath() );
+    // for background threads, remove database when current thread finishes
+    if ( QThread::currentThread() != QgsApplication::instance()->thread() )
+    {
+      connect( QThread::currentThread(), &QThread::finished, QThread::currentThread(), [connectionName]
+      {
+        QSqlDatabase::removeDatabase( connectionName );
+      } );
+    }
   }
   else
   {
-    authdb = QSqlDatabase::database( connectionname );
+    authdb = QSqlDatabase::database( connectionName );
   }
   if ( !authdb.isOpen() )
   {