#include "clientsyncer.h"
+#ifndef QT_NO_NETWORKPROXY
+# include <QNetworkProxy>
+#endif
+
#include "client.h"
#include "global.h"
#include "identity.h"
#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() {
QVariant item;
while(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
emit connectionError(msg["Error"].toString());
disconnectFromCore();
return;
+ } else if(msg["MsgType"] == "CoreSetupAck") {
+ emit coreSetupSuccess();
+ } else if(msg["MsgType"] == "CoreSetupReject") {
+ emit coreSetupFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginReject") {
emit loginFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginAck") {
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);
}
void ClientSyncer::coreSocketError(QAbstractSocket::SocketError) {
+ qDebug() << "coreSocketError" << socket << socket->errorString();
emit connectionError(socket->errorString());
socket->deleteLater();
}
// emit coreConnectionError(tr("Already connected to Core!"));
// return;
// }
-
if(socket != 0) {
socket->deleteLater();
socket = 0;
//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()));
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"];
+
SignalProxy::writeDataToDevice(socket, clientInit);
}
// Core has accepted our version info and sent its own. Let's see if we accept it as well...
if(msg["CoreBuild"].toUInt() < Global::coreBuildNeeded) {
emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
- "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::quasselBuild));
+ "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::coreBuildNeeded));
disconnectFromCore();
return;
}
emit connectionMsg(msg["CoreInfo"].toString());
- if(msg["LoginEnabled"].toBool()) {
+
+#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
+
+ if(!msg["Configured"].toBool()) {
+ // start wizard
+ emit startCoreSetup(msg["StorageBackends"].toList());
+ } else if(msg["LoginEnabled"].toBool()) {
emit startLogin();
}
}
+void ClientSyncer::doCoreSetup(const QVariant &setupData) {
+ QVariantMap setup;
+ setup["MsgType"] = "CoreSetupData";
+ setup["SetupData"] = setupData;
+ SignalProxy::writeDataToDevice(socket, setup);
+}
+
void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
emit connectionMsg(tr("Logging in..."));
QVariantMap clientLogin;
disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(sessionProgress(quint32, quint32)));
disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy
//Client::signalProxy()->addPeer(socket);
- Client::instance()->setConnectedToCore(socket);
+ Client::instance()->setConnectedToCore(socket, coreConnectionInfo["AccountId"].value<AccountId>());
syncToCore(state);
}
void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
- // store sessionData
- QVariantMap sessData = sessionState["SessionData"].toMap();
- foreach(QString key, sessData.keys()) Client::instance()->recvSessionData(key, sessData[key]);
-
// create identities
foreach(QVariant vid, sessionState["Identities"].toList()) {
Client::instance()->coreIdentityCreated(vid.value<Identity>());
connect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *)));
Client::addNetwork(net);
}
+ checkSyncState();
}
void ClientSyncer::networkInitDone() {
}
}
+#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
projects / quassel.git / blobdiff