[auth] Added mutex to protect cache for identcert auth

elpaso · elpaso · commit 71d90261f2ae · 2017-10-06T18:11:01.000+02:00
diff --git a/src/auth/identcert/qgsauthidentcertmethod.cpp b/src/auth/identcert/qgsauthidentcertmethod.cpp
@@ -25,6 +25,7 @@
 #include <QSslConfiguration>
 #include <QSslError>
 #endif
+#include <QMutexLocker>
 
 #include "qgsauthcertutils.h"
 #include "qgsauthmanager.h"
@@ -50,6 +51,7 @@ QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()
 
 QgsAuthIdentCertMethod::~QgsAuthIdentCertMethod()
 {
+  QMutexLocker locker( &mConfigMutex );
   qDeleteAll( sPkiConfigBundleCache );
   sPkiConfigBundleCache.clear();
 }
@@ -219,6 +221,7 @@ void QgsAuthIdentCertMethod::updateMethodConfig( QgsAuthMethodConfig &mconfig )
 
 QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &authcfg )
 {
+  QMutexLocker locker( &mConfigMutex );
   QgsPkiConfigBundle *bundle = nullptr;
 
   // check if it is cached
@@ -263,6 +266,7 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a
 
   bundle = new QgsPkiConfigBundle( mconfig, clientcert, clientkey );
 
+  locker.unlock();
   // cache bundle
   putPkiConfigBundle( authcfg, bundle );
 
@@ -271,12 +275,14 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a
 
 void QgsAuthIdentCertMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiConfigBundle *pkibundle )
 {
+  QMutexLocker locker( &mConfigMutex );
   QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
   sPkiConfigBundleCache.insert( authcfg, pkibundle );
 }
 
 void QgsAuthIdentCertMethod::removePkiConfigBundle( const QString &authcfg )
 {
+  QMutexLocker locker( &mConfigMutex );
   if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
     QgsPkiConfigBundle *pkibundle = sPkiConfigBundleCache.take( authcfg );
diff --git a/src/auth/identcert/qgsauthidentcertmethod.h b/src/auth/identcert/qgsauthidentcertmethod.h
@@ -18,6 +18,7 @@
 #define QGSAUTHIDENTCERTMETHOD_H
 
 #include <QObject>
+#include <QMutex>
 
 #include "qgsauthconfig.h"
 #include "qgsauthmethod.h"
@@ -57,6 +58,8 @@ class QgsAuthIdentCertMethod : public QgsAuthMethod
     void removePkiConfigBundle( const QString &authcfg );
 
     static QMap<QString, QgsPkiConfigBundle *> sPkiConfigBundleCache;
+
+    QMutex mConfigMutex;
 };
 
 #endif // QGSAUTHIDENTCERTMETHOD_H

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include <QSslConfiguration>`
`26`	`26`	`#include <QSslError>`
`27`	`27`	`#endif`
	`28`	`+#include <QMutexLocker>`
`28`	`29`
`29`	`30`	`#include "qgsauthcertutils.h"`
`30`	`31`	`#include "qgsauthmanager.h"`
`@@ -50,6 +51,7 @@ QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()`
`50`	`51`
`51`	`52`	`QgsAuthIdentCertMethod::~QgsAuthIdentCertMethod()`
`52`	`53`	`{`
	`54`	`+ QMutexLocker locker( &mConfigMutex );`
`53`	`55`	`qDeleteAll( sPkiConfigBundleCache );`
`54`	`56`	`sPkiConfigBundleCache.clear();`
`55`	`57`	`}`
`@@ -219,6 +221,7 @@ void QgsAuthIdentCertMethod::updateMethodConfig( QgsAuthMethodConfig &mconfig )`
`219`	`221`
`220`	`222`	`QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &authcfg )`
`221`	`223`	`{`
	`224`	`+ QMutexLocker locker( &mConfigMutex );`
`222`	`225`	`QgsPkiConfigBundle *bundle = nullptr;`
`223`	`226`
`224`	`227`	`// check if it is cached`
`@@ -263,6 +266,7 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a`
`263`	`266`
`264`	`267`	`bundle = new QgsPkiConfigBundle( mconfig, clientcert, clientkey );`
`265`	`268`
	`269`	`+ locker.unlock();`
`266`	`270`	`// cache bundle`
`267`	`271`	`putPkiConfigBundle( authcfg, bundle );`
`268`	`272`
`@@ -271,12 +275,14 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a`
`271`	`275`
`272`	`276`	`void QgsAuthIdentCertMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiConfigBundle *pkibundle )`
`273`	`277`	`{`
	`278`	`+ QMutexLocker locker( &mConfigMutex );`
`274`	`279`	`QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );`
`275`	`280`	`sPkiConfigBundleCache.insert( authcfg, pkibundle );`
`276`	`281`	`}`
`277`	`282`
`278`	`283`	`void QgsAuthIdentCertMethod::removePkiConfigBundle( const QString &authcfg )`
`279`	`284`	`{`
	`285`	`+ QMutexLocker locker( &mConfigMutex );`
`280`	`286`	`if ( sPkiConfigBundleCache.contains( authcfg ) )`
`281`	`287`	`{`
`282`	`288`	`QgsPkiConfigBundle *pkibundle = sPkiConfigBundleCache.take( authcfg );`