From a3ba3e7185809ee36f38ebb37517f938a7e6d408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 17 May 2011 08:11:54 +0000 Subject: [PATCH] to test, ignore all ssl errors; refs #43 --- swisssurfer/src/browser.hxx | 5 +++- swisssurfer/src/downloadmanager.hxx | 3 ++- swisssurfer/src/smartcardauth.hxx | 4 +-- swisssurfer/src/swisssurfer_de.ts | 38 ++++++++++++++--------------- swisssurfer/src/swisssurfer_en.ts | 38 ++++++++++++++--------------- swisssurfer/src/swisssurfer_fr.ts | 38 ++++++++++++++--------------- swisssurfer/src/swisssurfer_it.ts | 38 ++++++++++++++--------------- 7 files changed, 84 insertions(+), 80 deletions(-) diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index 911a4af..3caf00c 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -420,7 +420,10 @@ class Browser: public QMainWindow, protected Ui::Browser { void load(QUrl page, QWebView* view=0) { LOG<showMessage(tr("Checking: %1").arg(page.toString())); - if (page.scheme()=="https") _scAuth.login(); + if (page.scheme()=="https") { + LOG<<"Need to login"; + _scAuth.login(); + } if (!check(page)) { LOG<<"########## BLACK LISTED IGNORED ##########"; statusBar()->showMessage(tr("Forbidden: %1").arg(page.toString())); diff --git a/swisssurfer/src/downloadmanager.hxx b/swisssurfer/src/downloadmanager.hxx index 243195b..2d1e7c9 100644 --- a/swisssurfer/src/downloadmanager.hxx +++ b/swisssurfer/src/downloadmanager.hxx @@ -163,9 +163,10 @@ class DownloadManager: public QObject { } void sslErrors(const QList & errors) { LOG; + qobject_cast(sender())->ignoreSslErrors(errors); for (QList::const_iterator err(errors.begin()); err!=errors.end(); ++err) { - LOG<<"SSL-Error: "<errorString(); + LOG<<"SSL-Error: "<<(int)err->error()<<": "<errorString(); LOG<<"Certificate Issuer: " <<"O="<certificate().issuerInfo(QSslCertificate::Organization) <<"CN="<certificate().issuerInfo(QSslCertificate::CommonName) diff --git a/swisssurfer/src/smartcardauth.hxx b/swisssurfer/src/smartcardauth.hxx index b32acfa..46a47ac 100644 --- a/swisssurfer/src/smartcardauth.hxx +++ b/swisssurfer/src/smartcardauth.hxx @@ -123,14 +123,14 @@ class SmartCardAuth: public QObject { for (std::list::iterator cert(_cacerts.begin()); cert!=_cacerts.end(); ++cert) { SSL_CTX_add_extra_chain_cert(ctx, openssl::X509(*cert).lowLevelCopy()); - expectedSslErrors.push_back(QSslError(QSslError::SelfSignedCertificate, + expectedSslErrors.push_back(QSslError(QSslError::SelfSignedCertificateInChain, QSslCertificate::fromData (QByteArray(cert->data(), cert->size()), QSsl::Der).at(0))); //qDebug()<<"Added:\n"<data(), cert->size()), QSsl::Der).toPem(); } - socket->ignoreSslErrors(expectedSslErrors); + //socket->ignoreSslErrors(expectedSslErrors); SSL_CTX_set_client_cert_cb(ctx, &SmartCardAuth::clientCert); } diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index 64e25fc..a5df5df 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -232,82 +232,82 @@ - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 64e25fc..a5df5df 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -232,82 +232,82 @@ - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 64e25fc..a5df5df 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -232,82 +232,82 @@ - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 64e25fc..a5df5df 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -232,82 +232,82 @@ - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error