X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=e9d64f3206131bc36c917050eafca64558455ff6;hp=139f44b3c25b53909c740811f8eebc316e996662;hb=4aed4b037ea6feaeec09743e5d6018f58d47a535;hpb=4649188af29520951aa7485c577aa7ab912bef1a

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 139f44b3..e9d64f32 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,8 +26,6 @@
 
 #include "client.h"
 #include "identity.h"
-#include "ircuser.h"
-#include "ircchannel.h"
 #include "network.h"
 #include "networkmodel.h"
 #include "quassel.h"
@@ -125,10 +123,10 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
 
 #ifdef HAVE_SSL
     QSslSocket *sock = new QSslSocket(Client::instance());
+    connect(sock, SIGNAL(encrypted()), this, SIGNAL(encrypted()));
 #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());
@@ -169,9 +167,35 @@ void ClientSyncer::coreSocketConnected() {
   SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
-void ClientSyncer::useInternalCore(AccountId internalAccountId) {
+void ClientSyncer::useInternalCore() {
+  AccountId internalAccountId;
+
+  CoreAccountSettings accountSettings;
+  QList<AccountId> knownAccounts = accountSettings.knownAccounts();
+  foreach(AccountId id, knownAccounts) {
+    if(!id.isValid())
+      continue;
+    QVariantMap data = accountSettings.retrieveAccountData(id);
+    if(data.contains("InternalAccount") && data["InternalAccount"].toBool()) {
+      internalAccountId = id;
+      break;
+    }
+  }
+
+  if(!internalAccountId.isValid()) {
+    for(AccountId i = 1;; i++) {
+      if(!knownAccounts.contains(i)) {
+	internalAccountId = i;
+	break;
+      }
+    }
+    QVariantMap data;
+    data["InternalAccount"] = true;
+    accountSettings.storeAccountData(internalAccountId, data);
+  }
+
   coreConnectionInfo["AccountId"] = QVariant::fromValue<AccountId>(internalAccountId);
-  emit startInternalCore();
+  emit startInternalCore(this);
   emit connectToInternalCore(Client::instance()->signalProxy());
 }
 
@@ -198,36 +222,42 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   }
   emit connectionMsg(msg["CoreInfo"].toString());
 
+#ifndef QT_NO_COMPRESS
+  if(msg["SupportsCompression"].toBool()) {
+    socket->setProperty("UseCompression", true);
+  }
+#endif
+
+  _coreMsgBuffer = msg;
 #ifdef HAVE_SSL
   if(coreConnectionInfo["useSsl"].toBool()) {
     if(msg["SupportSsl"].toBool()) {
       QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
       Q_ASSERT(sslSocket);
+      connect(sslSocket, SIGNAL(encrypted()), this, SLOT(sslSocketEncrypted()));
       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;
     }
+    return;
   }
 #endif
+  // if we use SSL we wait for the next step until every SSL warning has been cleared
+  connectionReady();
+}
 
-#ifndef QT_NO_COMPRESS
-  if(msg["SupportsCompression"].toBool()) {
-    socket->setProperty("UseCompression", true);
-  }
-#endif
-
-  if(!msg["Configured"].toBool()) {
+void ClientSyncer::connectionReady() {
+  if(!_coreMsgBuffer["Configured"].toBool()) {
     // start wizard
-    emit startCoreSetup(msg["StorageBackends"].toList());
-  } else if(msg["LoginEnabled"].toBool()) {
+    emit startCoreSetup(_coreMsgBuffer["StorageBackends"].toList());
+  } else if(_coreMsgBuffer["LoginEnabled"].toBool()) {
     emit startLogin();
   }
+  _coreMsgBuffer.clear();
+  resetWarningsHandler();
 }
 
 void ClientSyncer::doCoreSetup(const QVariant &setupData) {
@@ -308,14 +338,44 @@ void ClientSyncer::checkSyncState() {
   }
 }
 
+void ClientSyncer::setWarningsHandler(const char *slot) {
+  resetWarningsHandler();
+  connect(this, SIGNAL(handleIgnoreWarnings(bool)), this, slot);
+}
+
+void ClientSyncer::resetWarningsHandler() {
+  disconnect(this, SIGNAL(handleIgnoreWarnings(bool)), this, 0);
+}
+
 #ifdef HAVE_SSL
-void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
-  qDebug() << "SSL Errors:";
-  foreach(QSslError err, errors)
-    qDebug() << "  " << err;
+void ClientSyncer::ignoreSslWarnings(bool permanently) {
+  QAbstractSocket *sock = qobject_cast<QAbstractSocket *>(socket);
+  if(sock) {
+    // ensure that a proper state is displayed and no longer a warning
+    emit socketStateChanged(sock->state());
+  }
+  emit connectionMsg(_coreMsgBuffer["CoreInfo"].toString());
+  connectionReady();
+}
+
+void ClientSyncer::sslSocketEncrypted() {
+  QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
+  if(socket) {
+    QByteArray digest = socket->peerCertificate().digest();
+  }
+}
 
+void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
   QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
-  if(socket)
+  if(socket) {
     socket->ignoreSslErrors();
+  }
+
+  QStringList warnings;
+  foreach(QSslError err, errors)
+    warnings << err.errorString();
+
+  setWarningsHandler(SLOT(ignoreSslWarnings(bool)));
+  emit connectionWarnings(warnings);
 }
 #endif