Skip to content

Commit 671ce63

Browse files
dakcartodakcarto
committedOct 27, 2017
[auth] Integrate cert viable functions into auth system
·
ltr-3_40final-3_0_0
1 parent 8032de8 commit 671ce63

12 files changed

+25
-21
lines changed
 

‎src/auth/identcert/qgsauthidentcertmethod.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a
251251
// init client cert
252252
// Note: if this is not valid, no sense continuing
253253
QSslCertificate clientcert( cibundle.first );
254-
if ( !clientcert.isValid() )
254+
if ( !QgsAuthCertUtils::certIsViable( clientcert ) )
255255
{
256-
QgsDebugMsg( QString( "PKI bundle for authcfg %1: insert FAILED, client cert is not valid" ).arg( authcfg ) );
256+
QgsDebugMsg( QString( "PKI bundle for authcfg %1: insert FAILED, client cert is not viable" ).arg( authcfg ) );
257257
return bundle;
258258
}
259259

‎src/auth/pkipaths/qgsauthpkipathsedit.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <QSslKey>
2525

2626
#include "qgsapplication.h"
27+
#include "qgsauthcertutils.h"
2728
#include "qgsauthmanager.h"
2829
#include "qgsauthguiutils.h"
2930
#include "qgslogger.h"
@@ -97,21 +98,21 @@ bool QgsAuthPkiPathsEdit::validateConfig()
9798
return validityChange( false );
9899
}
99100

100-
bool certvalid = cert.isValid();
101101
QDateTime startdate( cert.effectiveDate() );
102102
QDateTime enddate( cert.expiryDate() );
103103

104104
writePkiMessage( lePkiPathsMsg,
105105
tr( "%1 thru %2" ).arg( startdate.toString(), enddate.toString() ),
106-
( certvalid ? Valid : Invalid ) );
106+
( QgsAuthCertUtils::certIsCurrent( cert ) ? Valid : Invalid ) );
107107

108-
bool showCas( certvalid && populateCas() );
108+
bool certviable = QgsAuthCertUtils::certIsViable( cert );
109+
bool showCas( certviable && populateCas() );
109110
lblCas->setVisible( showCas );
110111
twCas->setVisible( showCas );
111112
cbAddCas->setVisible( showCas );
112113
cbAddRootCa->setVisible( showCas );
113114

114-
return validityChange( certvalid );
115+
return validityChange( certviable );
115116
}
116117

117118
QgsStringMap QgsAuthPkiPathsEdit::configMap() const

‎src/auth/pkipaths/qgsauthpkipathsmethod.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ QgsPkiConfigBundle *QgsAuthPkiPathsMethod::getPkiConfigBundle( const QString &au
284284
// init client cert
285285
// Note: if this is not valid, no sense continuing
286286
QSslCertificate clientcert( QgsAuthCertUtils::certFromFile( mconfig.config( QStringLiteral( "certpath" ) ) ) );
287-
if ( !clientcert.isValid() )
287+
if ( !QgsAuthCertUtils::certIsViable( clientcert ) )
288288
{
289-
QgsDebugMsg( QString( "PKI bundle for authcfg %1: insert FAILED, client cert is not valid" ).arg( authcfg ) );
289+
QgsDebugMsg( QString( "PKI bundle for authcfg %1: insert FAILED, client cert is not viable" ).arg( authcfg ) );
290290
return bundle;
291291
}
292292

‎src/auth/pkipkcs12/qgsauthpkcs12method.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,9 @@ QgsPkiConfigBundle *QgsAuthPkcs12Method::getPkiConfigBundle( const QString &auth
292292
// init client cert
293293
// Note: if this is not valid, no sense continuing
294294
QSslCertificate clientcert( bundlelist.at( 0 ).toLatin1() );
295-
if ( !clientcert.isValid() )
295+
if ( !QgsAuthCertUtils::certIsViable( clientcert ) )
296296
{
297-
QgsDebugMsg( QString( "PKI bundle for authcfg %1: insert FAILED, client cert is not valid" ).arg( authcfg ) );
297+
QgsDebugMsg( QString( "PKI bundle for authcfg %1: insert FAILED, client cert is not viable" ).arg( authcfg ) );
298298
return bundle;
299299
}
300300

‎src/core/auth/qgsauthconfig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ bool QgsPkiBundle::isNull() const
275275

276276
bool QgsPkiBundle::isValid() const
277277
{
278-
return ( !isNull() && mCert.isValid() );
278+
return ( !isNull() && QgsAuthCertUtils::certIsViable( mCert ) );
279279
}
280280

281281
const QString QgsPkiBundle::certId() const

‎src/core/auth/qgsauthmanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ const QPair<QSslCertificate, QSslKey> QgsAuthManager::certIdentityBundle( const
17841784
const QStringList QgsAuthManager::certIdentityBundleToPem( const QString &id )
17851785
{
17861786
QPair<QSslCertificate, QSslKey> bundle( certIdentityBundle( id ) );
1787-
if ( bundle.first.isValid() && !bundle.second.isNull() )
1787+
if ( QgsAuthCertUtils::certIsViable( bundle.first ) && !bundle.second.isNull() )
17881788
{
17891789
return QStringList() << QString( bundle.first.toPem() ) << QString( bundle.second.toPem() );
17901790
}
@@ -2719,7 +2719,7 @@ const QList<QSslCertificate> QgsAuthManager::trustedCaCerts( bool includeinvalid
27192719
}
27202720
else if ( defaultpolicy == QgsAuthCertUtils::Trusted && !untrustedids.contains( certid ) )
27212721
{
2722-
if ( !includeinvalid && !cert.isValid() )
2722+
if ( !includeinvalid && !QgsAuthCertUtils::certIsViable( cert ) )
27232723
continue;
27242724
trustedcerts.append( cert );
27252725
}

‎src/gui/auth/qgsauthcertificateinfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ void QgsAuthCertInfo::updateCurrentCertInfo( int chainindx )
295295
mCurrentTrustPolicy = trustpolicy;
296296

297297
cmbbxTrust->setTrustPolicy( trustpolicy );
298-
if ( !mCurrentQCert.isValid() )
298+
if ( !QgsAuthCertUtils::certIsViable( mCurrentQCert ) )
299299
{
300300
cmbbxTrust->setDefaultTrustPolicy( QgsAuthCertUtils::Untrusted );
301301
}
@@ -880,7 +880,7 @@ void QgsAuthCertInfo::decorateCertTreeItem( const QSslCertificate &cert,
880880
return;
881881
}
882882

883-
if ( !cert.isValid() )
883+
if ( !QgsAuthCertUtils::certIsViable( cert ) )
884884
{
885885
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificateUntrusted.svg" ) ) );
886886
return;

‎src/gui/auth/qgsauthidentitieseditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void QgsAuthIdentitiesEditor::appendIdentitiesToItem( const QList<QSslCertificat
205205
QTreeWidgetItem *item( new QTreeWidgetItem( parent, coltxts, ( int )identype ) );
206206

207207
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificate.svg" ) ) );
208-
if ( !cert.isValid() )
208+
if ( !QgsAuthCertUtils::certIsViable( cert ) )
209209
{
210210
item->setForeground( 2, redb );
211211
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificateUntrusted.svg" ) ) );

‎src/gui/auth/qgsauthimportcertdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void QgsAuthImportCertDialog::validateCertificates()
170170

171171
Q_FOREACH ( const QSslCertificate &cert, certs )
172172
{
173-
if ( cert.isValid() )
173+
if ( QgsAuthCertUtils::certIsViable( cert ) )
174174
++validcerts;
175175

176176
if ( filterCAs )

‎src/gui/auth/qgsauthimportidentitydialog.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,13 @@ bool QgsAuthImportIdentityDialog::validatePkiPaths()
277277
ca_certs = certs;
278278
}
279279

280-
isvalid = clientcert.isValid();
280+
isvalid = QgsAuthCertUtils::certIsViable( clientcert );
281+
281282
QDateTime startdate( clientcert.effectiveDate() );
282283
QDateTime enddate( clientcert.expiryDate() );
283284

284285
writeValidation( tr( "%1 thru %2" ).arg( startdate.toString(), enddate.toString() ),
285-
( isvalid ? Valid : Invalid ) );
286+
( QgsAuthCertUtils::certIsCurrent( clientcert ) ? Valid : Invalid ) );
286287
//TODO: set enabled on cert info button, relative to cert validity
287288

288289
// check for valid private key and that any supplied password works

‎src/gui/auth/qgsauthserverseditor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "qgssettings.h"
2525
#include "qgsapplication.h"
2626
#include "qgsauthcertificateinfo.h"
27+
#include "qgsauthcertutils.h"
2728
#include "qgsauthmanager.h"
2829
#include "qgsauthguiutils.h"
2930
#include "qgslogger.h"
@@ -206,7 +207,7 @@ void QgsAuthServersEditor::appendSslConfigsToItem( const QList<QgsAuthConfigSslS
206207
QTreeWidgetItem *item( new QTreeWidgetItem( parent, coltxts, ( int )conftype ) );
207208

208209
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificate.svg" ) ) );
209-
if ( !cert.isValid() )
210+
if ( !QgsAuthCertUtils::certIsViable( cert ) )
210211
{
211212
item->setForeground( 2, redb );
212213
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificateUntrusted.svg" ) ) );

‎src/gui/auth/qgsauthtrustedcasdialog.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "qgssettings.h"
2323
#include "qgsapplication.h"
2424
#include "qgsauthcertificateinfo.h"
25+
#include "qgsauthcertutils.h"
2526
#include "qgsauthguiutils.h"
2627
#include "qgsauthmanager.h"
2728
#include "qgslogger.h"
@@ -196,7 +197,7 @@ void QgsAuthTrustedCAsDialog::appendCertsToItem( const QList<QSslCertificate> &c
196197
QTreeWidgetItem *item( new QTreeWidgetItem( parent, coltxts, ( int )catype ) );
197198

198199
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificate.svg" ) ) );
199-
if ( !cert.isValid() )
200+
if ( !QgsAuthCertUtils::certIsViable( cert ) )
200201
{
201202
item->setForeground( 2, redb );
202203
item->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconCertificateUntrusted.svg" ) ) );

0 commit comments

Comments
 (0)
Please sign in to comment.