Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle

1 files changed, 3 insertions, 206 deletions

diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 3f6f5829..726572e5 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -38,219 +38,16 @@
 
 #include "Upload.h"
 
+#include <memory>
 #include <utility>
-#include "Application.h"
-#include "BuildConfig.h"
 #include "ByteArraySink.h"
 
-#include "net/Logging.h"
-
 namespace Net {
 
-bool Upload::abort()
-{
-    if (m_reply) {
-        m_reply->abort();
-    } else {
-        m_state = State::AbortedByUser;
-    }
-    return true;
-}
-
-void Upload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-    setProgress(bytesReceived, bytesTotal);
-}
-
-void Upload::downloadError(QNetworkReply::NetworkError error)
-{
-    if (error == QNetworkReply::OperationCanceledError) {
-        qCCritical(taskUploadLogC) << getUid().toString() << "Aborted " << m_url.toString();
-        m_state = State::AbortedByUser;
-    } else {
-        // error happened during download.
-        qCCritical(taskUploadLogC) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
-        m_state = State::Failed;
-    }
-}
-
-void Upload::sslErrors(const QList<QSslError>& errors)
-{
-    int i = 1;
-    for (const auto& error : errors) {
-        qCCritical(taskUploadLogC) << getUid().toString() << "Upload" << m_url.toString() << "SSL Error #" << i << " : "
-                                   << error.errorString();
-        auto cert = error.certificate();
-        qCCritical(taskUploadLogC) << getUid().toString() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-bool Upload::handleRedirect()
-{
-    QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
-    if (!redirect.isValid()) {
-        if (!m_reply->hasRawHeader("Location")) {
-            // no redirect -> it's fine to continue
-            return false;
-        }
-        // there is a Location header, but it's not correct. we need to apply some workarounds...
-        QByteArray redirectBA = m_reply->rawHeader("Location");
-        if (redirectBA.size() == 0) {
-            // empty, yet present redirect header? WTF?
-            return false;
-        }
-        QString redirectStr = QString::fromUtf8(redirectBA);
-
-        if (redirectStr.startsWith("//")) {
-            /*
-             * IF the URL begins with //, we need to insert the URL scheme.
-             * See: https://bugreports.qt.io/browse/QTBUG-41061
-             * See: http://tools.ietf.org/html/rfc3986#section-4.2
-             */
-            redirectStr = m_reply->url().scheme() + ":" + redirectStr;
-        } else if (redirectStr.startsWith("/")) {
-            /*
-             * IF the URL begins with /, we need to process it as a relative URL
-             */
-            auto url = m_reply->url();
-            url.setPath(redirectStr, QUrl::TolerantMode);
-            redirectStr = url.toString();
-        }
-
-        /*
-         * Next, make sure the URL is parsed in tolerant mode. Qt doesn't parse the location header in tolerant mode, which causes issues.
-         * FIXME: report Qt bug for this
-         */
-        redirect = QUrl(redirectStr, QUrl::TolerantMode);
-        if (!redirect.isValid()) {
-            qCWarning(taskUploadLogC) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
-            downloadError(QNetworkReply::ProtocolFailure);
-            return false;
-        }
-        qCDebug(taskUploadLogC) << getUid().toString() << "Fixed location header:" << redirect;
-    } else {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Location header:" << redirect;
-    }
-
-    m_url = QUrl(redirect.toString());
-    qCDebug(taskUploadLogC) << getUid().toString() << "Following redirect to " << m_url.toString();
-    startAction(m_network);
-    return true;
-}
-
-void Upload::downloadFinished()
-{
-    // handle HTTP redirection first
-    // very unlikely for post requests, still can happen
-    if (handleRedirect()) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload redirected:" << m_url.toString();
-        return;
-    }
-
-    // if the download failed before this point ...
-    if (m_state == State::Succeeded) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed but we are allowed to proceed:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit succeeded();
-        return;
-    } else if (m_state == State::Failed) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit failed("");
-        return;
-    } else if (m_state == State::AbortedByUser) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit aborted();
-        return;
-    }
-
-    // make sure we got all the remaining data, if any
-    auto data = m_reply->readAll();
-    if (data.size()) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Writing extra" << data.size() << "bytes";
-        m_state = m_sink->write(data);
-    }
-
-    // otherwise, finalize the whole graph
-    m_state = m_sink->finalize(*m_reply.get());
-    if (m_state != State::Succeeded) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed to finalize:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit failed("");
-        return;
-    }
-    m_reply.reset();
-    qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
-    emit succeeded();
-}
-
-void Upload::downloadReadyRead()
-{
-    if (m_state == State::Running) {
-        auto data = m_reply->readAll();
-        m_state = m_sink->write(data);
-    }
-}
-
-void Upload::executeTask()
+QNetworkReply* Upload::getReply(QNetworkRequest& request)
 {
-    setStatus(tr("Uploading %1").arg(m_url.toString()));
-
-    if (m_state == State::AbortedByUser) {
-        qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
-        emit aborted();
-        return;
-    }
-    QNetworkRequest request(m_url);
-    m_state = m_sink->init(request);
-    switch (m_state) {
-        case State::Succeeded:
-            emitSucceeded();
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload cache hit " << m_url.toString();
-            return;
-        case State::Running:
-            qCDebug(taskUploadLogC) << getUid().toString() << "Uploading " << m_url.toString();
-            break;
-        case State::Inactive:
-        case State::Failed:
-            emitFailed("");
-            return;
-        case State::AbortedByUser:
-            emitAborted();
-            return;
-    }
-
-    request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
-    // TODO remove duplication
-    if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
-        request.setRawHeader("x-api-key", APPLICATION->getFlameAPIKey().toUtf8());
-    } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
-               request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
-        QString token = APPLICATION->getModrinthAPIToken();
-        if (!token.isNull())
-            request.setRawHeader("Authorization", token.toUtf8());
-    }
-
-    // TODO other types of post requests ?
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    QNetworkReply* rep = m_network->post(request, m_post_data);
-
-    m_reply.reset(rep);
-    connect(rep, &QNetworkReply::downloadProgress, this, &Upload::downloadProgress);
-    connect(rep, &QNetworkReply::finished, this, &Upload::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &Upload::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Upload::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &Upload::sslErrors);
-    connect(rep, &QNetworkReply::readyRead, this, &Upload::downloadReadyRead);
+    return m_network->post(request, m_post_data);
 }
 
 Upload::Ptr Upload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)