Fix db login procedure for listener

qgis · May 5, 2021 · b7f990d · b7f990d
1 parent 89c069f
commit b7f990d
Showing 1 changed file with 38 additions and 7 deletions.
diff --git a/src/providers/postgres/qgspostgreslistener.cpp b/src/providers/postgres/qgspostgreslistener.cpp
@@ -16,7 +16,8 @@
  ***************************************************************************/
 
 #include "qgspostgreslistener.h"
-
+#include "qgsdatasourceuri.h"
+#include "qgscredentials.h"
 #include "qgslogger.h"
 
 #ifdef Q_OS_WIN
@@ -58,7 +59,42 @@ QgsPostgresListener::~QgsPostgresListener()
 void QgsPostgresListener::run()
 {
   PGconn *conn = nullptr;
-  conn = PQconnectdb( mConnString.toLocal8Bit() );
+
+  conn = PQconnectdb( mConnString.toUtf8() );
+
+  if ( PQstatus( conn ) != CONNECTION_OK )
+  {
+    QgsDataSourceUri uri( mConnString );
+    QString username = uri.username();
+    QString password = uri.password();
+
+    PQfinish( conn );
+
+    QgsCredentials::instance()->lock();
+
+    if ( QgsCredentials::instance()->get( mConnString, username, password, PQerrorMessage( conn ) ) )
+    {
+      if ( !username.isEmpty() )
+        uri.setUsername( username );
+
+      if ( !password.isEmpty() )
+        uri.setPassword( password );
+
+      QString connectString = uri.connectionInfo( false );
+      conn = PQconnectdb( connectString.toUtf8() );
+      if ( PQstatus( conn ) == CONNECTION_OK )
+        QgsCredentials::instance()->put( mConnString, username, password );
+    }
+
+    QgsCredentials::instance()->unlock();
+
+    if ( PQstatus( conn ) != CONNECTION_OK )
+    {
+      QgsDebugMsg( QStringLiteral( "LISTENer not started" ) );
+      return;
+    }
+  }
+
 
   PGresult *res = PQexec( conn, "LISTEN qgis" );
   if ( PQresultStatus( res ) != PGRES_COMMAND_OK )
@@ -94,7 +130,6 @@ void QgsPostgresListener::run()
     timeout.tv_sec = 1;
     timeout.tv_usec = 0;
 
-    QgsDebugMsg( QStringLiteral( "select in the loop" ) );
     if ( select( sock + 1, &input_mask, nullptr, nullptr, &timeout ) < 0 )
     {
       QgsDebugMsg( QStringLiteral( "error in select" ) );
@@ -110,10 +145,6 @@ void QgsPostgresListener::run()
       QgsDebugMsg( "notify " + msg );
       PQfreemem( n );
     }
-    else
-    {
-      QgsDebugMsg( QStringLiteral( "not a notify" ) );
-    }
 
     if ( mStop )
     {