X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=e7f68b01ceaa99c494866fe13c44e50ca9d3e36c;hp=601bff0368eb534f5ec1f03c2f33bc017b11d637;hb=018d1d001bf3c051b55525f523d933a8d694e071;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 601bff03..e7f68b01 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -20,6 +20,10 @@
 
 #include "clientsyncer.h"
 
+#ifndef QT_NO_NETWORKPROXY
+#  include <QNetworkProxy>
+#endif
+
 #include "client.h"
 #include "global.h"
 #include "identity.h"
@@ -29,17 +33,16 @@
 #include "signalproxy.h"
 
 
-ClientSyncer::ClientSyncer(QObject *parent) : QObject(parent) {
+ClientSyncer::ClientSyncer(QObject *parent)
+  : QObject(parent)
+{
   socket = 0;
   blockSize = 0;
 
   connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-
 }
 
 ClientSyncer::~ClientSyncer() {
-
-
 }
 
 void ClientSyncer::coreHasData() {
@@ -72,23 +75,12 @@ void ClientSyncer::coreHasData() {
       emit loginSuccess();
     } else if(msg["MsgType"] == "SessionInit") {
       sessionStateReceived(msg["SessionState"].toMap());
+      break; // this is definitively the last message we process here!
     } else {
       emit connectionError(tr("<b>Invalid data received from core!</b><br>Disconnecting."));
       disconnectFromCore();
       return;
     }
-    /*
-    if (!msg["StartWizard"].toBool()) {
-    recvCoreState(msg["Reply"]);
-  } else {
-    qWarning("Core not configured!");
-    qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
-    emit showConfigWizard(msg);
-  }
-    blockSize = 0;
-    return;
-  }
-    */
   }
   if(blockSize > 0) {
     emit recvPartialItem(socket->bytesAvailable(), blockSize);
@@ -96,6 +88,7 @@ void ClientSyncer::coreHasData() {
 }
 
 void ClientSyncer::coreSocketError(QAbstractSocket::SocketError) {
+  qDebug() << "coreSocketError" << socket << socket->errorString();
   emit connectionError(socket->errorString());
   socket->deleteLater();
 }
@@ -129,7 +122,23 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
     //clientMode = RemoteCore;
     //emit coreConnectionMsg(tr("Connecting..."));
     Q_ASSERT(!socket);
+
+#ifndef QT_NO_OPENSSL
+    QSslSocket *sock = new QSslSocket(Client::instance());
+#else
+    if(conn["useSsl"].toBool()) {
+	emit connectionError(tr("<b>This client is built without SSL Support!</b><br />Disable the usage of SSL in the account settings."));
+	emit encrypted(false);
+	return;
+    }
     QTcpSocket *sock = new QTcpSocket(Client::instance());
+#endif
+#ifndef QT_NO_NETWORKPROXY
+    if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
+      QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
+      sock->setProxy(proxy);
+    }
+#endif
     socket = sock;
     connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
     connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
@@ -150,7 +159,14 @@ void ClientSyncer::coreSocketConnected() {
   clientInit["ClientVersion"] = Global::quasselVersion;
   clientInit["ClientDate"] = Global::quasselDate;
   clientInit["ClientBuild"] = Global::quasselBuild; // this is a minimum, since we probably won't update for every commit
-  clientInit["UseSsl"] = false;  // FIXME implement SSL
+  clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
+#ifndef QT_NO_COMPRESS
+  clientInit["UseCompression"] = true;
+#else
+  clientInit["UseCompression"] = false;
+#endif
+
+  
   SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
@@ -177,6 +193,31 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
     return;
   }
   emit connectionMsg(msg["CoreInfo"].toString());
+
+#ifndef QT_NO_OPENSSL
+  if(coreConnectionInfo["useSsl"].toBool()) {
+    if(msg["SupportSsl"].toBool()) {
+      QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
+      Q_ASSERT(sslSocket);
+      connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+      sslSocket->startClientEncryption();
+      emit encrypted(true);
+      Client::instance()->setSecuredConnection();
+    } else {
+      emit connectionError(tr("<b>The Quassel Core you are trying to connect to does not support SSL!</b><br />If you want to connect anyways, disable the usage of SSL in the account settings."));
+      emit encrypted(false);
+      disconnectFromCore();
+      return;
+    }
+  }
+#endif
+
+#ifndef QT_NO_COMPRESS
+  if(msg["SupportsCompression"].toBool()) {
+    socket->setProperty("UseCompression", true);
+  }
+#endif
+  
   if(!msg["Configured"].toBool()) {
     // start wizard
     emit startCoreSetup(msg["StorageBackends"].toList());
@@ -335,3 +376,14 @@ void ClientSyncer::checkSyncState() {
   }
 }
 
+#ifndef QT_NO_OPENSSL
+void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
+  qDebug() << "SSL Errors:";
+  foreach(QSslError err, errors)
+    qDebug() << "  " << err;
+
+  QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
+  if(socket)
+    socket->ignoreSslErrors();
+}
+#endif