7 files changed, 56 insertions, 22 deletions
diff --git a/logic/auth/MojangAccount.cpp b/logic/auth/MojangAccount.cpp
index bc6af98f..a462eda5 100644
--- a/logic/auth/MojangAccount.cpp
+++ b/logic/auth/MojangAccount.cpp
@@ -32,7 +32,8 @@ MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object)
 	// The JSON object must at least have a username for it to be valid.
 	if (!object.value("username").isString())
 	{
-		QLOG_ERROR() << "Can't load Mojang account info from JSON object. Username field is missing or of the wrong type.";
+		QLOG_ERROR() << "Can't load Mojang account info from JSON object. Username field is "
+						"missing or of the wrong type.";
 		return nullptr;
 	}
 
@@ -43,7 +44,8 @@ MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object)
 	QJsonArray profileArray = object.value("profiles").toArray();
 	if (profileArray.size() < 1)
 	{
-		QLOG_ERROR() << "Can't load Mojang account with username \"" << username << "\". No profiles found.";
+		QLOG_ERROR() << "Can't load Mojang account with username \"" << username
+					 << "\". No profiles found.";
 		return nullptr;
 	}
 
@@ -63,7 +65,7 @@ MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object)
 	}
 
 	MojangAccountPtr account(new MojangAccount());
-	if(object.value("user").isObject())
+	if (object.value("user").isObject())
 	{
 		User u;
 		QJsonObject userStructure = object.value("user").toObject();
@@ -92,7 +94,7 @@ MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object)
 	return account;
 }
 
-MojangAccountPtr MojangAccount::createFromUsername(const QString& username)
+MojangAccountPtr MojangAccount::createFromUsername(const QString &username)
 {
 	MojangAccountPtr account(new MojangAccount());
 	account->m_clientToken = QUuid::createUuid().toString().remove(QRegExp("[{}-]"));
@@ -152,27 +154,27 @@ bool MojangAccount::setCurrentProfile(const QString &profileId)
 	return false;
 }
 
-const AccountProfile* MojangAccount::currentProfile() const
+const AccountProfile *MojangAccount::currentProfile() const
 {
-	if(m_currentProfile == -1)
+	if (m_currentProfile == -1)
 		return nullptr;
 	return &m_profiles[m_currentProfile];
 }
 
 AccountStatus MojangAccount::accountStatus() const
 {
-	if(m_accessToken.isEmpty())
+	if (m_accessToken.isEmpty())
 		return NotVerified;
-	if(!m_online)
+	if (!m_online)
 		return Verified;
 	return Online;
 }
 
-std::shared_ptr<Task> MojangAccount::login(QString password)
+std::shared_ptr<YggdrasilTask> MojangAccount::login(QString password)
 {
-	if(m_currentTask)
+	if (m_currentTask)
 		return m_currentTask;
-	if(password.isEmpty())
+	if (password.isEmpty())
 	{
 		m_currentTask.reset(new RefreshTask(this));
 	}
@@ -196,7 +198,7 @@ void MojangAccount::authFailed(QString reason)
 {
 	// This is emitted when the yggdrasil tasks time out or are cancelled.
 	// -> we treat the error as no-op
-	if(reason != "Yggdrasil task cancelled.")
+	if (reason != "Yggdrasil task cancelled.")
 	{
 		m_online = false;
 		m_accessToken = QString();
diff --git a/logic/auth/MojangAccount.h b/logic/auth/MojangAccount.h
index 325aa826..dd5d54ae 100644
--- a/logic/auth/MojangAccount.h
+++ b/logic/auth/MojangAccount.h
@@ -95,7 +95,7 @@ public: /* manipulation */
 	 * Attempt to login. Empty password means we use the token.
 	 * If the attempt fails because we already are performing some task, it returns false.
 	 */
-	std::shared_ptr<Task> login(QString password = QString());
+	std::shared_ptr<YggdrasilTask> login(QString password = QString());
 
 	void downgrade()
 	{
diff --git a/logic/auth/YggdrasilTask.cpp b/logic/auth/YggdrasilTask.cpp
index 088e1fc0..277d7bfd 100644
--- a/logic/auth/YggdrasilTask.cpp
+++ b/logic/auth/YggdrasilTask.cpp
@@ -48,6 +48,7 @@ void YggdrasilTask::executeTask()
 	connect(m_netReply, &QNetworkReply::finished, this, &YggdrasilTask::processReply);
 	connect(m_netReply, &QNetworkReply::uploadProgress, this, &YggdrasilTask::refreshTimers);
 	connect(m_netReply, &QNetworkReply::downloadProgress, this, &YggdrasilTask::refreshTimers);
+	connect(m_netReply, &QNetworkReply::sslErrors, this, &YggdrasilTask::sslErrors);
 	timeout_keeper.setSingleShot(true);
 	timeout_keeper.start(timeout_max);
 	counter.setSingleShot(false);
@@ -75,16 +76,45 @@ void YggdrasilTask::abort()
 	m_netReply->abort();
 }
 
+void YggdrasilTask::sslErrors(QList<QSslError> errors)
+{
+	int i = 1;
+	for (auto error : errors)
+	{
+		QLOG_ERROR() << "LOGIN SSL Error #" << i << " : " << error.errorString();
+		auto cert = error.certificate();
+		QLOG_ERROR() << "Certificate in question:\n" << cert.toText();
+		i++;
+	}
+}
+
 void YggdrasilTask::processReply()
 {
 	setStatus(getStateMessage(STATE_PROCESSING_RESPONSE));
 
+	if (m_netReply->error() == QNetworkReply::SslHandshakeFailedError)
+	{
+		emitFailed(
+			tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
+			   "<ul>"
+			   "<li>You use Windows XP and need to <a "
+			   "href=\"http://www.microsoft.com/en-us/download/details.aspx?id=38918\">update "
+			   "your root certificates</a></li>"
+			   "<li>Some device on your network is interfering with SSL traffic. In that case, "
+			   "you have bigger worries than Minecraft not starting.</li>"
+			   "<li>Possibly something else. Check the MultiMC log file for details</li>"
+			   "</ul>"));
+		return;
+	}
+
 	// any network errors lead to offline mode right now
 	if (m_netReply->error() >= QNetworkReply::ConnectionRefusedError &&
 		m_netReply->error() <= QNetworkReply::UnknownNetworkError)
 	{
 		// WARNING/FIXME: the value here is used in MojangAccount to detect the cancel/timeout
 		emitFailed("Yggdrasil task cancelled.");
+		QLOG_ERROR() << "Yggdrasil task cancelled because of: " << m_netReply->error() << " : "
+					 << m_netReply->errorString();
 		return;
 	}
 
@@ -172,10 +202,10 @@ QString YggdrasilTask::getStateMessage(const YggdrasilTask::State state) const
 	switch (state)
 	{
 	case STATE_SENDING_REQUEST:
-		return tr("Sending request to auth servers.");
+		return tr("Sending request to auth servers...");
 	case STATE_PROCESSING_RESPONSE:
-		return tr("Processing response from servers.");
+		return tr("Processing response from servers...");
 	default:
-		return tr("Processing. Please wait.");
+		return tr("Processing. Please wait...");
 	}
 }
diff --git a/logic/auth/YggdrasilTask.h b/logic/auth/YggdrasilTask.h
index 1f81a2d0..85f5a1e1 100644
--- a/logic/auth/YggdrasilTask.h
+++ b/logic/auth/YggdrasilTask.h
@@ -20,6 +20,7 @@
 #include <QString>
 #include <QJsonObject>
 #include <QTimer>
+#include <qsslerror.h>
 
 #include "logic/auth/MojangAccount.h"
 
@@ -99,6 +100,7 @@ slots:
 	void processReply();
 	void refreshTimers(qint64, qint64);
 	void heartbeat();
+	void sslErrors(QList<QSslError>);
 
 public
 slots:
diff --git a/logic/auth/flows/AuthenticateTask.cpp b/logic/auth/flows/AuthenticateTask.cpp
index f60be35d..6548c4e9 100644
--- a/logic/auth/flows/AuthenticateTask.cpp
+++ b/logic/auth/flows/AuthenticateTask.cpp
@@ -194,9 +194,9 @@ QString AuthenticateTask::getStateMessage(const YggdrasilTask::State state) cons
 	switch (state)
 	{
 	case STATE_SENDING_REQUEST:
-		return tr("Authenticating: Sending request.");
+		return tr("Authenticating: Sending request...");
 	case STATE_PROCESSING_RESPONSE:
-		return tr("Authenticating: Processing response.");
+		return tr("Authenticating: Processing response...");
 	default:
 		return YggdrasilTask::getStateMessage(state);
 	}
diff --git a/logic/auth/flows/RefreshTask.cpp b/logic/auth/flows/RefreshTask.cpp
index 5f68ccc7..f63c736e 100644
--- a/logic/auth/flows/RefreshTask.cpp
+++ b/logic/auth/flows/RefreshTask.cpp
@@ -145,9 +145,9 @@ QString RefreshTask::getStateMessage(const YggdrasilTask::State state) const
 	switch (state)
 	{
 	case STATE_SENDING_REQUEST:
-		return tr("Refreshing login token.");
+		return tr("Refreshing login token...");
 	case STATE_PROCESSING_RESPONSE:
-		return tr("Refreshing login token: Processing response.");
+		return tr("Refreshing login token: Processing response...");
 	default:
 		return YggdrasilTask::getStateMessage(state);
 	}
diff --git a/logic/auth/flows/ValidateTask.cpp b/logic/auth/flows/ValidateTask.cpp
index 84d5e703..4f7323fd 100644
--- a/logic/auth/flows/ValidateTask.cpp
+++ b/logic/auth/flows/ValidateTask.cpp
@@ -55,9 +55,9 @@ QString ValidateTask::getStateMessage(const YggdrasilTask::State state) const
 	switch (state)
 	{
 	case STATE_SENDING_REQUEST:
-		return tr("Validating Access Token: Sending request.");
+		return tr("Validating access token: Sending request...");
 	case STATE_PROCESSING_RESPONSE:
-		return tr("Validating Access Token: Processing response.");
+		return tr("Validating access token: Processing response...");
 	default:
 		return YggdrasilTask::getStateMessage(state);
 	}