From: Konrad Rosenbaum <konrad@silmor.de>
Date: Mon, 23 Jul 2012 06:57:55 +0000 (+0200)
Subject: fix: ignore SSL NoError;
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=24da0f41e07b9cce6e7ad0173546db08547049eb;p=web%2Fkonrad%2Fsmoke.git

fix: ignore SSL NoError;
show smoke data path in about box
---

diff --git a/src/iface/sslexception.cpp b/src/iface/sslexception.cpp
index 80457fc..6b8340e 100644
--- a/src/iface/sslexception.cpp
+++ b/src/iface/sslexception.cpp
@@ -38,6 +38,7 @@ MSslExceptions::MSslExceptions(QString p)
 			QSslCertificate c(el.text().toAscii());
 			if(c.isNull())continue;
 			sslexcept.append(QPair<QSslCertificate,int>(c,e));
+			qDebug()<<"Note: will ignore SSL exception of type"<<e<<"from certificate (hash)"<<c.digest(QCryptographicHash::Sha1).toHex().data();
 		}
 	}
 }
@@ -85,6 +86,7 @@ bool MSslExceptions::checksslexcept(const QList<QSslError>&errs)
 {
 	//stage 1: record unknown exceptions
 	for(int i=0;i<errs.size();i++){
+		if(errs[i].error()==QSslError::NoError)continue;
 		QPair<QSslCertificate,int>p(errs[i].certificate(),errs[i].error());
 		bool known=false;
 		for(int j=0;j<sslrecord.size();j++){
@@ -97,6 +99,7 @@ bool MSslExceptions::checksslexcept(const QList<QSslError>&errs)
 	}
 	//stage 2: compare to acceptable exceptions
 	for(int i=0;i<errs.size();i++){
+		if(errs[i].error()==QSslError::NoError)continue;
 		QPair<QSslCertificate,int>p(errs[i].certificate(),errs[i].error());
 		bool known=false;
 		for(int j=0;j<sslexcept.size();j++){
@@ -105,7 +108,10 @@ bool MSslExceptions::checksslexcept(const QList<QSslError>&errs)
 				break;
 			}
 		}
-		if(!known)return false;
+		if(!known){
+			qDebug()<<"Ooops! Non-ignored SSL exception of type"<<(int)errs[i].error()<<"certificate\n"<<errs[i].certificate().toPem().data();
+			return false;
+		}
 	}
 	return true;
 }
diff --git a/src/main.cpp b/src/main.cpp
index 3fb7195..db654a9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -90,16 +90,19 @@ void MApplication::aboutMS()
 	QMessageBox mb;
 	mb.setIconPixmap(QPixmap(":/icon.png"));
 	mb.setWindowTitle(tr("About MagicSmoke"));
+	MSInterface*ifc=MSInterface::instance();
 	mb.setText(tr(	"<h3>MagicSmoke v. %1</h3>"
 			"&copy; Konrad Rosenbaum, 2007-2011<br>"
 			"&copy; Peter Keller, 2007-2008<br>"
 			"protected under the GNU GPL v.3 or at your option any newer<p>"
 			"See also the <a href=\"%2\">MagicSmoke Homepage</a>.<p>"
-			"This version was compiled from repository '%3' revision '%4'.")
+			"This version was compiled from repository '%3' revision '%4'.<p>"
+			"The current application data base path is '%5'.")
 			.arg(MSInterface::staticVersionInfo(WOb::VersionHR)) //%1
 			.arg(HOMEPAGE_BASEURL) //%2
 			.arg(MSInterface::staticVersionInfo(WOb::VersionRootURL)) //%3
 			.arg(MSInterface::staticVersionInfo(WOb::VersionNumber)) //%4
+			.arg(ifc?ifc->dataDir(): ::dataDir)
 		);
 	mb.setStandardButtons(QMessageBox::Ok);
 	mb.exec();