mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-09-03 13:39:21 +00:00
NOISSUE add ssl error logging to Requestor
This commit is contained in:
parent
4ea52f4758
commit
f1a5f7bc4d
@ -80,6 +80,9 @@ protected slots:
|
|||||||
/// Handle request error.
|
/// Handle request error.
|
||||||
void onRequestError(QNetworkReply::NetworkError error);
|
void onRequestError(QNetworkReply::NetworkError error);
|
||||||
|
|
||||||
|
/// Handle ssl errors.
|
||||||
|
void onSslErrors(QList<QSslError> errors);
|
||||||
|
|
||||||
/// Re-try request (after successful token refresh).
|
/// Re-try request (after successful token refresh).
|
||||||
void retry();
|
void retry();
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@ int Requestor::get(const QNetworkRequest &req, int timeout/* = 60*1000*/) {
|
|||||||
timedReplies_.add(new Reply(reply_, timeout));
|
timedReplies_.add(new Reply(reply_, timeout));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,6 +54,7 @@ int Requestor::post(const QNetworkRequest &req, const QByteArray &data, int time
|
|||||||
timedReplies_.add(new Reply(reply_, timeout));
|
timedReplies_.add(new Reply(reply_, timeout));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
@ -69,6 +71,7 @@ int Requestor::post(const QNetworkRequest & req, QHttpMultiPart* data, int timeo
|
|||||||
timedReplies_.add(new Reply(reply_, timeout));
|
timedReplies_.add(new Reply(reply_, timeout));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
@ -83,6 +86,7 @@ int Requestor::put(const QNetworkRequest &req, const QByteArray &data, int timeo
|
|||||||
timedReplies_.add(new Reply(reply_, timeout));
|
timedReplies_.add(new Reply(reply_, timeout));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
@ -99,6 +103,7 @@ int Requestor::put(const QNetworkRequest & req, QHttpMultiPart* data, int timeou
|
|||||||
timedReplies_.add(new Reply(reply_, timeout));
|
timedReplies_.add(new Reply(reply_, timeout));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
@ -118,6 +123,7 @@ int Requestor::customRequest(const QNetworkRequest &req, const QByteArray &verb,
|
|||||||
timedReplies_.add(new Reply(reply_));
|
timedReplies_.add(new Reply(reply_));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
@ -131,6 +137,7 @@ int Requestor::head(const QNetworkRequest &req, int timeout/* = 60*1000*/)
|
|||||||
timedReplies_.add(new Reply(reply_, timeout));
|
timedReplies_.add(new Reply(reply_, timeout));
|
||||||
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)), Qt::QueuedConnection);
|
||||||
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()), Qt::QueuedConnection);
|
||||||
|
connect(reply_, &QNetworkReply::sslErrors, this, &Requestor::onSslErrors);
|
||||||
return id_;
|
return id_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -180,6 +187,16 @@ void Requestor::onRequestError(QNetworkReply::NetworkError error) {
|
|||||||
QTimer::singleShot(10, this, SLOT(finish()));
|
QTimer::singleShot(10, this, SLOT(finish()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Requestor::onSslErrors(QList<QSslError> errors) {
|
||||||
|
int i = 1;
|
||||||
|
for (auto error : errors) {
|
||||||
|
qCritical() << "LOGIN SSL Error #" << i << " : " << error.errorString();
|
||||||
|
auto cert = error.certificate();
|
||||||
|
qCritical() << "Certificate in question:\n" << cert.toText();
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Requestor::onUploadProgress(qint64 uploaded, qint64 total) {
|
void Requestor::onUploadProgress(qint64 uploaded, qint64 total) {
|
||||||
if (status_ == Idle) {
|
if (status_ == Idle) {
|
||||||
qWarning() << "O2Requestor::onUploadProgress: No pending request";
|
qWarning() << "O2Requestor::onUploadProgress: No pending request";
|
||||||
|
Loading…
Reference in New Issue
Block a user