[auth] Added mutex to protect cache for basic auth

elpaso · elpaso · commit d76b04a97586 · 2017-10-06T18:10:38.000+02:00
diff --git a/src/auth/basic/qgsauthbasicmethod.cpp b/src/auth/basic/qgsauthbasicmethod.cpp
@@ -21,6 +21,7 @@
 #include "qgslogger.h"
 
 #include <QNetworkProxy>
+#include <QMutexLocker>
 
 static const QString AUTH_METHOD_KEY = QStringLiteral( "Basic" );
 static const QString AUTH_METHOD_DESCRIPTION = QStringLiteral( "Basic authentication" );
@@ -169,6 +170,7 @@ void QgsAuthBasicMethod::clearCachedConfig( const QString &authcfg )
 
 QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg, bool fullconfig )
 {
+  QMutexLocker locker( &mConfigMutex );
   QgsAuthMethodConfig mconfig;
 
   // check if it is cached
@@ -187,19 +189,22 @@ QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg,
   }
 
   // cache bundle
+  locker.unlock();
   putMethodConfig( authcfg, mconfig );
 
   return mconfig;
 }
 
 void QgsAuthBasicMethod::putMethodConfig( const QString &authcfg, const QgsAuthMethodConfig &mconfig )
 {
+  QMutexLocker locker( &mConfigMutex );
   QgsDebugMsg( QString( "Putting basic config for authcfg: %1" ).arg( authcfg ) );
   sAuthConfigCache.insert( authcfg, mconfig );
 }
 
 void QgsAuthBasicMethod::removeMethodConfig( const QString &authcfg )
 {
+  QMutexLocker locker( &mConfigMutex );
   if ( sAuthConfigCache.contains( authcfg ) )
   {
     sAuthConfigCache.remove( authcfg );
diff --git a/src/auth/basic/qgsauthbasicmethod.h b/src/auth/basic/qgsauthbasicmethod.h
@@ -18,6 +18,7 @@
 #define QGSAUTHBASICMETHOD_H
 
 #include <QObject>
+#include <QMutex>
 
 #include "qgsauthconfig.h"
 #include "qgsauthmethod.h"
@@ -61,6 +62,8 @@ class QgsAuthBasicMethod : public QgsAuthMethod
     QString escapeUserPass( const QString &val, QChar delim = '\'' ) const;
 
     static QMap<QString, QgsAuthMethodConfig> sAuthConfigCache;
+
+    QMutex mConfigMutex;
 };
 
 #endif // QGSAUTHBASICMETHOD_H

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`#include "qgslogger.h"`
`22`	`22`
`23`	`23`	`#include <QNetworkProxy>`
	`24`	`+#include <QMutexLocker>`
`24`	`25`
`25`	`26`	`static const QString AUTH_METHOD_KEY = QStringLiteral( "Basic" );`
`26`	`27`	`static const QString AUTH_METHOD_DESCRIPTION = QStringLiteral( "Basic authentication" );`
`@@ -169,6 +170,7 @@ void QgsAuthBasicMethod::clearCachedConfig( const QString &authcfg )`
`169`	`170`
`170`	`171`	`QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg, bool fullconfig )`
`171`	`172`	`{`
	`173`	`+ QMutexLocker locker( &mConfigMutex );`
`172`	`174`	`QgsAuthMethodConfig mconfig;`
`173`	`175`
`174`	`176`	`// check if it is cached`
`@@ -187,19 +189,22 @@ QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg,`
`187`	`189`	`}`
`188`	`190`
`189`	`191`	`// cache bundle`
	`192`	`+ locker.unlock();`
`190`	`193`	`putMethodConfig( authcfg, mconfig );`
`191`	`194`
`192`	`195`	`return mconfig;`
`193`	`196`	`}`
`194`	`197`
`195`	`198`	`void QgsAuthBasicMethod::putMethodConfig( const QString &authcfg, const QgsAuthMethodConfig &mconfig )`
`196`	`199`	`{`
	`200`	`+ QMutexLocker locker( &mConfigMutex );`
`197`	`201`	`QgsDebugMsg( QString( "Putting basic config for authcfg: %1" ).arg( authcfg ) );`
`198`	`202`	`sAuthConfigCache.insert( authcfg, mconfig );`
`199`	`203`	`}`
`200`	`204`
`201`	`205`	`void QgsAuthBasicMethod::removeMethodConfig( const QString &authcfg )`
`202`	`206`	`{`
	`207`	`+ QMutexLocker locker( &mConfigMutex );`
`203`	`208`	`if ( sAuthConfigCache.contains( authcfg ) )`
`204`	`209`	`{`
`205`	`210`	`sAuthConfigCache.remove( authcfg );`