1 files changed, 56 insertions, 18 deletions

diff --git a/api/logic/net/Download.cpp b/api/logic/net/Download.cpp
index 12c1b201..631d3076 100644
--- a/api/logic/net/Download.cpp
+++ b/api/logic/net/Download.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,8 @@ void Download::start()
 	connect(rep, SIGNAL(downloadProgress(qint64, qint64)), SLOT(downloadProgress(qint64, qint64)));
 	connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
 	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
-	connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
+	connect(rep, &QNetworkReply::sslErrors, this, &Download::sslErrors);
+	connect(rep, &QNetworkReply::readyRead, this, &Download::downloadReadyRead);
 }
 
 void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
@@ -135,31 +136,68 @@ void Download::downloadError(QNetworkReply::NetworkError error)
 	}
 }
 
-bool Download::handleRedirect()
+void Download::sslErrors(const QList<QSslError> & errors)
 {
-	QVariant redirect = m_reply->header(QNetworkRequest::LocationHeader);
-	QString redirectURL;
-	if(redirect.isValid())
+	int i = 1;
+	for (auto error : errors)
 	{
-		redirectURL = redirect.toString();
+		qCritical() << "Download" << m_url.toString() << "SSL Error #" << i << " : " << error.errorString();
+		auto cert = error.certificate();
+		qCritical() << "Certificate in question:\n" << cert.toText();
+		i++;
 	}
-	// FIXME: This is a hack for https://bugreports.qt-project.org/browse/QTBUG-41061
-	else if(m_reply->hasRawHeader("Location"))
+}
+
+bool Download::handleRedirect()
+{
+	QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
+	if(!redirect.isValid())
 	{
-		auto data = m_reply->rawHeader("Location");
-		if(data.size() > 2 && data[0] == '/' && data[1] == '/')
+		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 the URL begins with //, we need to insert the URL scheme.
+		 * See: https://bugreports.qt-project.org/browse/QTBUG-41061
+		 */
+		if(redirectStr.startsWith("//"))
+		{
+			redirectStr = m_reply->url().scheme() + ":" + redirectStr;
+		}
+
+		/*
+		 * 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())
 		{
-			redirectURL = m_reply->url().scheme() + ":" + data;
+			qWarning() << "Failed to parse redirect URL:" << redirectStr;
+			downloadError(QNetworkReply::ProtocolFailure);
+			return false;
 		}
+		qDebug() << "Fixed location header:" << redirect;
 	}
-	if (!redirectURL.isEmpty())
+	else
 	{
-		m_url = QUrl(redirect.toString());
-		qDebug() << "Following redirect to " << m_url.toString();
-		start();
-		return true;
+		qDebug() << "Location header:" << redirect;
 	}
-	return false;
+
+	m_url = QUrl(redirect.toString());
+	qDebug() << "Following redirect to " << m_url.toString();
+	start();
+	return true;
 }