record which SSL errors are ok to ignore

jef · jef · commit 2025236bcd51 · 2011-02-17T12:56:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15182 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7218,23 +7218,29 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
 {
   QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );
   bool otherError = false;
+  static QSet<QSslError::SslError> ignoreErrors;
 
   foreach( QSslError error, errors )
   {
-    if ( error.error() != QSslError::SelfSignedCertificate &&
-         error.error() != QSslError::HostNameMismatch )
-      otherError = true;
+    QgsDebugMsg( QString( "SSL error %1: %2" ).arg( error.error() ).arg( error.errorString() ) );
+
+    otherError = otherError || !ignoreErrors.contains( error.error() );
+
     msg += "\n" + error.errorString();
   }
 
-  msg += tr( "\n\nIgnore errors?" );
+  msg += tr( "\n\nAlways ignore these errors?" );
 
   if ( !otherError ||
        QMessageBox::warning( this,
-                             tr( "SSL errors occured" ),
+                             tr( "%n SSL errors occured", "number of errors", errors.size() ),
                              msg,
                              QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Ok )
   {
+    foreach( QSslError error, errors )
+    {
+      ignoreErrors << error.error();
+    }
     reply->ignoreSslErrors();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7218,23 +7218,29 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors`
`7218`	`7218`	`{`
`7219`	`7219`	`QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );`
`7220`	`7220`	`bool otherError = false;`
	`7221`	`+ static QSet<QSslError::SslError> ignoreErrors;`
`7221`	`7222`
`7222`	`7223`	`foreach( QSslError error, errors )`
`7223`	`7224`	`{`
`7224`		`- if ( error.error() != QSslError::SelfSignedCertificate &&`
`7225`		`- error.error() != QSslError::HostNameMismatch )`
`7226`		`- otherError = true;`
	`7225`	`+ QgsDebugMsg( QString( "SSL error %1: %2" ).arg( error.error() ).arg( error.errorString() ) );`
	`7226`	`+`
	`7227`	`+ otherError = otherError \|\| !ignoreErrors.contains( error.error() );`
	`7228`	`+`
`7227`	`7229`	`msg += "\n" + error.errorString();`
`7228`	`7230`	`}`
`7229`	`7231`
`7230`		`- msg += tr( "\n\nIgnore errors?" );`
	`7232`	`+ msg += tr( "\n\nAlways ignore these errors?" );`
`7231`	`7233`
`7232`	`7234`	`if ( !otherError \|\|`
`7233`	`7235`	`QMessageBox::warning( this,`
`7234`		`- tr( "SSL errors occured" ),`
	`7236`	`+ tr( "%n SSL errors occured", "number of errors", errors.size() ),`
`7235`	`7237`	`msg,`
`7236`	`7238`	`QMessageBox::Ok \| QMessageBox::Cancel ) == QMessageBox::Ok )`
`7237`	`7239`	`{`
	`7240`	`+ foreach( QSslError error, errors )`
	`7241`	`+ {`
	`7242`	`+ ignoreErrors << error.error();`
	`7243`	`+ }`
`7238`	`7244`	`reply->ignoreSslErrors();`
`7239`	`7245`	`}`
`7240`	`7246`	`}`