luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include SSL errors in error message on HTTPS access.

This commit is contained in:
Matthias Koefferlein 2021-09-21 21:01:53 +02:00
parent 29384bf3f3
commit e1dd79acbf
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tl/tl/tlHttpStreamQt.cc
View File

@ -246,6 +246,7 @@ InputHttpStreamPrivateData::InputHttpStreamPrivateData (const std::string &url)
s_auth_handler = new AuthenticationHandler (); s_auth_handler = new AuthenticationHandler ();
connect (s_network_manager, SIGNAL (authenticationRequired (QNetworkReply *, QAuthenticator *)), s_auth_handler, SLOT (authenticationRequired (QNetworkReply *, QAuthenticator *))); connect (s_network_manager, SIGNAL (authenticationRequired (QNetworkReply *, QAuthenticator *)), s_auth_handler, SLOT (authenticationRequired (QNetworkReply *, QAuthenticator *)));
connect (s_network_manager, SIGNAL (proxyAuthenticationRequired (const QNetworkProxy &, QAuthenticator *)), s_auth_handler, SLOT (proxyAuthenticationRequired (const QNetworkProxy &, QAuthenticator *))); connect (s_network_manager, SIGNAL (proxyAuthenticationRequired (const QNetworkProxy &, QAuthenticator *)), s_auth_handler, SLOT (proxyAuthenticationRequired (const QNetworkProxy &, QAuthenticator *)));
connect (s_network_manager, SIGNAL (sslErrors (QNetworkReply *, const QList<QSslError> &)), this, SLOT (sslErrors (QNetworkReply *, const QList<QSslError> &)));
tl::StaticObjects::reg (&s_network_manager); tl::StaticObjects::reg (&s_network_manager);
tl::StaticObjects::reg (&s_auth_handler); tl::StaticObjects::reg (&s_auth_handler);
@ -346,6 +347,8 @@ InputHttpStreamPrivateData::issue_request (const QUrl &url)
delete mp_buffer; delete mp_buffer;
mp_buffer = 0; mp_buffer = 0;
m_ssl_errors.clear ();
// remove old request (important for redirect) // remove old request (important for redirect)
close (); close ();
@ -462,13 +465,18 @@ InputHttpStreamPrivateData::read (char *b, size_t n)
break; break;
default: default:
em = tl::to_string (QObject::tr ("Network API error")); em = tl::to_string (QObject::tr ("Network API error"));
if (! m_ssl_errors.empty ()) {
em += tl::to_string (QObject::tr (" (with SSL errors: "));
em += m_ssl_errors;
em += ")";
}
} }
ec = int (mp_reply->error ()); ec = int (mp_reply->error ());
} }
QByteArray data = mp_reply->readAll (); QByteArray data = mp_reply->readAll ();
throw HttpErrorException (em, ec, tl::to_string (mp_reply->url ().toString ()), tl::to_string (data.constData (), (int)data.size ())); throw HttpErrorException (em, ec, tl::to_string (mp_reply->url ().toString ()), tl::to_string (data.constData (), (int) data.size ()));
} }
@ -480,6 +488,20 @@ InputHttpStreamPrivateData::read (char *b, size_t n)
return data.size (); return data.size ();
} }
void
InputHttpStreamPrivateData::sslErrors (QNetworkReply *, const QList<QSslError> &errors)
{
// log SSL errors
for (QList<QSslError>::const_iterator e = errors.begin (); e != errors.end (); ++e) {
if (! m_ssl_errors.empty ()) {
m_ssl_errors += ", ";
}
m_ssl_errors += "\"";
m_ssl_errors += tl::to_string (e->errorString ());
m_ssl_errors += "\"";
}
}
void void
InputHttpStreamPrivateData::reset () InputHttpStreamPrivateData::reset ()
{ {

4
src/tl/tl/tlHttpStreamQt.h
View File

@ -31,9 +31,9 @@
#include <QBuffer> #include <QBuffer>
#include <QByteArray> #include <QByteArray>
#include <QTimer> #include <QTimer>
#include <QNetworkAccessManager>
#include <memory> #include <memory>
class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QNetworkProxy; class QNetworkProxy;
class QAuthenticator; class QAuthenticator;
@ -105,6 +105,7 @@ public:
private slots: private slots:
void finished (QNetworkReply *); void finished (QNetworkReply *);
void resend (); void resend ();
void sslErrors (QNetworkReply *reply, const QList<QSslError> &errors);
private: private:
std::string m_url; std::string m_url;
@ -116,6 +117,7 @@ private:
std::map<std::string, std::string> m_headers; std::map<std::string, std::string> m_headers;
tl::Event m_ready; tl::Event m_ready;
QTimer *mp_resend_timer; QTimer *mp_resend_timer;
std::string m_ssl_errors;
void issue_request (const QUrl &url); void issue_request (const QUrl &url);
}; };