X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=233157bc1fe1540205039758322ac4fdb1d78680;hp=66d1d37b34a6b58b9199d0b0d380dc081c23f31e;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=2e6dc76ae100a6b8e1b1661e422995f90083500e

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 66d1d37b..233157bc 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -18,16 +18,20 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QMetaObject>
+#include <QMetaMethod>
+#include <QCoreApplication>
+
 #include "core.h"
 #include "coresession.h"
 #include "coresettings.h"
+#include "quassel.h"
 #include "signalproxy.h"
 #include "sqlitestorage.h"
+#include "network.h"
+#include "logger.h"
 
-#include <QMetaObject>
-#include <QMetaMethod>
-
-#include <QCoreApplication>
+#include "util.h"
 
 Core *Core::instanceptr = 0;
 
@@ -43,314 +47,496 @@ void Core::destroy() {
   instanceptr = 0;
 }
 
-Core::Core()
-  : storage(0)
-{
+Core::Core() : storage(0) {
+  _startTime = QDateTime::currentDateTime().toUTC();  // for uptime :)
+
+  loadTranslation(QLocale::system());
+
+  // Register storage backends here!
+  registerStorageBackend(new SqliteStorage(this));
+
+  if(!_storageBackends.count()) {
+    qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting..."));
+    qWarning() << qPrintable(tr("Currently, Quassel only supports SQLite3. You need to build your\n"
+                                "Qt library with the sqlite plugin enabled in order for quasselcore\n"
+                                "to work."));
+    exit(1); // TODO make this less brutal (especially for mono client -> popup)
+  }
+  connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage()));
+  _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes
 }
 
 void Core::init() {
-  // TODO: Remove this again at some point
-  // Check if old core settings need to be migrated in order to make the switch to the
-  // new location less painful.
+  configured = false;
+
   CoreSettings cs;
-  QVariant foo = cs.databaseSettings();
-  
-  if(!foo.isValid()) {
-    // ok, no settings stored yet. check for old ones.
-#ifdef Q_WS_MAC
-    QSettings os("quassel-irc.org", "Quassel IRC", this);
-#else
-    QSettings os("Quassel IRC Development Team", "Quassel IRC");
-#endif
-    QVariant bar = os.value("Core/DatabaseSettings");
-    if(bar.isValid()) {
-      // old settings available -- migrate!
-      qWarning() << "\n\nOld settings detected. Will migrate core settings to the new location...\nNOTE: GUI style settings won't be migrated!\n";
-#ifdef Q_WS_MAC
-      QSettings ncs("quassel-irc.org", "Quassel Core");
-#else
-      QSettings ncs("Quassel Project", "Quassel Core");
-#endif
-      ncs.setValue("Core/CoreState", os.value("Core/CoreState"));
-      ncs.setValue("Core/DatabaseSettings", os.value("Core/DatabaseSettings"));
-      os.beginGroup("SessionData");
-      foreach(QString group, os.childGroups()) {
-        ncs.setValue(QString("CoreUser/%1/SessionData/Identities").arg(group), os.value(QString("%1/Identities").arg(group)));
-        ncs.setValue(QString("CoreUser/%1/SessionData/Networks").arg(group), os.value(QString("%1/Networks").arg(group)));
-      }
-      os.endGroup();
-#ifdef Q_WS_MAC
-      QSettings ngs("quassel-irc.org", "Quassel Client");
-#else
-      QSettings ngs("Quassel Project", "Quassel Client");
-#endif
-      os.beginGroup("Accounts");
-      foreach(QString key, os.childKeys()) {
-        ngs.setValue(QString("Accounts/%1").arg(key), os.value(key));
-      }
-      foreach(QString group, os.childGroups()) {
-        ngs.setValue(QString("Accounts/%1/AccountData").arg(group), os.value(QString("%1/AccountData").arg(group)));
-      }
-      os.endGroup();
-      os.beginGroup("Geometry");
-      foreach(QString key, os.childKeys()) {
-        ngs.setValue(QString("UI/%1").arg(key), os.value(key));
-      }
-      os.endGroup();
 
-      ncs.sync();
-      ngs.sync();
-      qWarning() << "Migration successfully finished. You may now delete $HOME/.config/Quassel IRC Development Team/ (on Linux).\n\n";
+  if(!(configured = initStorage(cs.storageSettings().toMap()))) {
+    qWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup.";
+
+    // try to migrate old settings
+    QVariantMap old = cs.oldDbSettings().toMap();
+    if(old.count() && old["Type"].toString().toUpper() == "SQLITE") {
+      QVariantMap newSettings;
+      newSettings["Backend"] = "SQLite";
+      if((configured = initStorage(newSettings))) {
+        qWarning() << "...but thankfully I found some old settings to migrate!";
+        cs.setStorageSettings(newSettings);
+      }
     }
   }
-  // END
 
-  configured = false;
+  connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+  connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+  if(!startListening()) exit(1); // TODO make this less brutal
+}
 
-  if(!(configured = initStorage(cs.databaseSettings().toMap()))) {
-    qWarning("Core is currently not configured!");
+Core::~Core() {
+  foreach(QTcpSocket *socket, blocksizes.keys()) {
+    socket->disconnectFromHost();  // disconnect non authed clients
   }
-  
-  connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
-  startListening(cs.port());
-  guiUser = 0;
-
+  qDeleteAll(sessions);
+  qDeleteAll(_storageBackends);
 }
 
-bool Core::initStorage(QVariantMap dbSettings, bool setup) {
-  QString engine = dbSettings["Type"].toString().toLower();
+/*** Session Restore ***/
 
-  if(storage) {
-    qDebug() << "Deleting old storage object.";
-    storage->deleteLater();
-    storage = 0;
-  }
+void Core::saveState() {
+  CoreSettings s;
+  QVariantMap state;
+  QVariantList activeSessions;
+  foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue<UserId>(user);
+  state["CoreStateVersion"] = 1;
+  state["ActiveSessions"] = activeSessions;
+  s.setCoreState(state);
+}
 
-  // FIXME register new storageProviders here
-  if(engine == "sqlite" && SqliteStorage::isAvailable()) {
-    storage = new SqliteStorage(this);
-  } else {
-    qWarning() << "Selected StorageBackend is not available:" << dbSettings["Type"].toString();
-    return configured = false;
+void Core::restoreState() {
+  if(!instance()->configured) {
+    // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
+    return;
+  }
+  if(instance()->sessions.count()) {
+    qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!"));
+    return;
   }
+  CoreSettings s;
+  /* We don't check, since we are at the first version since switching to Git
+  uint statever = s.coreState().toMap()["CoreStateVersion"].toUInt();
+  if(statever < 1) {
+    qWarning() << qPrintable(tr("Core state too old, ignoring..."));
+    return;
+  }
+  */
+  QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList();
+  if(activeSessions.count() > 0) {
+    quInfo() << "Restoring previous core state...";
+    foreach(QVariant v, activeSessions) {
+      UserId user = v.value<UserId>();
+      instance()->createSession(user, true);
+    }
+  }
+}
 
-  if(setup && !storage->setup(dbSettings)) {
-    return configured = false;
+/*** Core Setup ***/
+QString Core::setupCoreForInternalUsage() {
+  Q_ASSERT(!_storageBackends.isEmpty());
+  QVariantMap setupData;
+  qsrand(QDateTime::currentDateTime().toTime_t());
+  int pass = 0;
+  for(int i = 0; i < 10; i++) {
+    pass *= 10;
+    pass += qrand() % 10;
   }
+  setupData["AdminUser"] = "AdminUser";
+  setupData["AdminPasswd"] = QString::number(pass);
+  setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName();
+  return setupCore(setupData);
+}
 
-  return configured = storage->init(dbSettings);
+QString Core::setupCore(QVariantMap setupData) {
+  QString user = setupData.take("AdminUser").toString();
+  QString password = setupData.take("AdminPasswd").toString();
+  if(user.isEmpty() || password.isEmpty()) {
+    return tr("Admin user or password not set.");
+  }
+  if(!initStorage(setupData, true)) {
+    return tr("Could not setup storage!");
+  }
+  CoreSettings s;
+  s.setStorageSettings(setupData);
+  quInfo() << qPrintable(tr("Creating admin user..."));
+  storage->addUser(user, password);
+  startListening();  // TODO check when we need this
+  return QString();
 }
 
-bool Core::initStorage(QVariantMap dbSettings) {
-  return initStorage(dbSettings, false);
+/*** Storage Handling ***/
+
+bool Core::registerStorageBackend(Storage *backend) {
+  if(backend->isAvailable()) {
+    _storageBackends[backend->displayName()] = backend;
+    return true;
+  } else {
+    backend->deleteLater();
+    return false;
+  }
 }
 
-Core::~Core() {
-  qDeleteAll(sessions);
+void Core::unregisterStorageBackend(Storage *backend) {
+  _storageBackends.remove(backend->displayName());
+  backend->deleteLater();
 }
 
-void Core::restoreState() {
-  Q_ASSERT(!instance()->sessions.count());
-  CoreSettings s;
-  QList<QVariant> users = s.coreState().toList();
-  if(users.count() > 0) {
-    qDebug() << "Restoring previous core state...";
-    foreach(QVariant v, users) {
-      QVariantMap m = v.toMap();
-      if(m.contains("UserId")) {
-        CoreSession *sess = createSession(m["UserId"].toUInt());
-        sess->restoreState(m["State"]);
-      }
-    }
+// old db settings:
+// "Type" => "sqlite"
+bool Core::initStorage(QVariantMap dbSettings, bool setup) {
+  QString backend = dbSettings["Backend"].toString();
+  if(backend.isEmpty()) {
+    //qWarning() << "No storage backend selected!";
+    return configured = false;
   }
-}
 
-void Core::saveState() {
-  CoreSettings s;
-  QList<QVariant> users;
-  foreach(CoreSession *sess, instance()->sessions.values()) {
-    QVariantMap m;
-    m["UserId"] = sess->userId();
-    m["State"] = sess->state();
-    users << m;
+  if(_storageBackends.contains(backend)) {
+    storage = _storageBackends[backend];
+  } else {
+    qCritical() << "Selected storage backend is not available:" << backend;
+    return configured = false;
   }
-  s.setCoreState(users);
-}
+  if(!storage->init(dbSettings)) {
+    if(!setup || !(storage->setup(dbSettings) && storage->init(dbSettings))) {
+      qCritical() << "Could not init storage!";
+      storage = 0;
+      return configured = false;
+    }
+  }
+  // delete all other backends
+  foreach(Storage *s, _storageBackends.values()) {
+    if(s != storage) s->deleteLater();
+  }
+  _storageBackends.clear();
 
-CoreSession *Core::session(UserId uid) {
-  Core *core = instance();
-  if(core->sessions.contains(uid)) return core->sessions[uid];
-  else return 0;
+  connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)));
+  return configured = true;
 }
 
-CoreSession *Core::localSession() {
-  Core *core = instance();
-  if(core->guiUser && core->sessions.contains(core->guiUser)) return core->sessions[core->guiUser];
-  else return 0;
+void Core::syncStorage() {
+  if(storage) storage->sync();
 }
 
-CoreSession *Core::createSession(UserId uid) {
-  Core *core = instance();
-  Q_ASSERT(!core->sessions.contains(uid));
-  CoreSession *sess = new CoreSession(uid, core->storage);
-  core->sessions[uid] = sess;
-  return sess;
+/*** Storage Access ***/
+bool Core::createNetwork(UserId user, NetworkInfo &info) {
+  NetworkId networkId = instance()->storage->createNetwork(user, info);
+  if(!networkId.isValid())
+    return false;
+
+  info.networkId = networkId;
+  return true;
 }
 
-bool Core::startListening(uint port) {
-  if(!server.listen(QHostAddress::Any, port)) {
-    qWarning(QString(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())).toAscii());
-    return false;
+/*** Network Management ***/
+
+bool Core::startListening() {
+  // in mono mode we only start a local port if a port is specified in the cli call
+  if(Quassel::runMode() == Quassel::Monolithic && !Quassel::isOptionSet("port"))
+    return true;
+
+  bool success = false;
+  uint port = Quassel::optionValue("port").toUInt();
+
+  if(_server.listen(QHostAddress::Any, port)) {
+    quInfo() << "Listening for GUI clients on IPv4 port" << _server.serverPort()
+             << "using protocol version" << Quassel::buildInfo().protocolVersion;
+    success = true;
   }
-  qDebug() << "Listening for GUI clients on port" << server.serverPort();
-  return true;
+  if(_v6server.listen(QHostAddress::AnyIPv6, port)) {
+    quInfo() << "Listening for GUI clients on IPv6 port" << _v6server.serverPort()
+             << "using protocol version" << Quassel::buildInfo().protocolVersion;
+    success = true;
+  }
+
+  if(!success) {
+    qCritical() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString()));
+  }
+
+  return success;
 }
 
-void Core::stopListening() {
-  server.close();
-  qDebug() << "No longer listening for GUI clients.";
+void Core::stopListening(const QString &reason) {
+  bool wasListening = false;
+  if(_server.isListening()) {
+    wasListening = true;
+    _server.close();
+  }
+  if(_v6server.isListening()) {
+    wasListening = true;
+    _v6server.close();
+  }
+  if(wasListening) {
+    if(reason.isEmpty())
+      quInfo() << "No longer listening for GUI clients.";
+    else
+      quInfo() << qPrintable(reason);
+  }
 }
 
 void Core::incomingConnection() {
-  // TODO implement SSL
-  while (server.hasPendingConnections()) {
-    QTcpSocket *socket = server.nextPendingConnection();
+  QTcpServer *server = qobject_cast<QTcpServer *>(sender());
+  Q_ASSERT(server);
+  while(server->hasPendingConnections()) {
+    QTcpSocket *socket = server->nextPendingConnection();
     connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
     connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData()));
-    blockSizes.insert(socket, (quint32)0);
-    qDebug() << "Client connected from " << socket->peerAddress().toString();
-    
-    if (!configured) {
-      server.close();
-      qDebug() << "Closing server for basic setup.";
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
+
+    QVariantMap clientInfo;
+    blocksizes.insert(socket, (quint32)0);
+    quInfo() << qPrintable(tr("Client connected from"))  << qPrintable(socket->peerAddress().toString());
+
+    if(!configured) {
+      stopListening(tr("Closing server for basic setup."));
     }
   }
 }
 
 void Core::clientHasData() {
   QTcpSocket *socket = dynamic_cast<QTcpSocket*>(sender());
-  Q_ASSERT(socket && blockSizes.contains(socket));
-  quint32 bsize = blockSizes.value(socket);
+  Q_ASSERT(socket && blocksizes.contains(socket));
   QVariant item;
-  if(SignalProxy::readDataFromDevice(socket, bsize, item)) {
-    // we need to auth the client
-    try {
-      QVariantMap msg = item.toMap();
-      if (msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) {
-        throw Exception("GUI client version mismatch");
+  while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) {
+    QVariantMap msg = item.toMap();
+    processClientMessage(socket, msg);
+    if(!blocksizes.contains(socket)) break;  // this socket is no longer ours to handle!
+  }
+}
+
+void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
+  if(!msg.contains("MsgType")) {
+    // Client is way too old, does not even use the current init format
+    qWarning() << qPrintable(tr("Antique client trying to connect... refusing."));
+    socket->close();
+    return;
+  }
+  // OK, so we have at least an init message format we can understand
+  if(msg["MsgType"] == "ClientInit") {
+    QVariantMap reply;
+
+    // Just version information -- check it!
+    uint ver = msg["ProtocolVersion"].toUInt();
+    if(ver < Quassel::buildInfo().coreNeedsProtocol) {
+      reply["MsgType"] = "ClientInitReject";
+      reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
+      "This core needs at least client/core protocol version %1.<br>"
+      "Please consider upgrading your client.").arg(Quassel::buildInfo().coreNeedsProtocol);
+      SignalProxy::writeDataToDevice(socket, reply);
+      qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting."));
+      socket->close(); return;
+    }
+
+    reply["CoreVersion"] = Quassel::buildInfo().fancyVersionString;
+    reply["CoreDate"] = Quassel::buildInfo().buildDate;
+    reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
+    // TODO: Make the core info configurable
+    int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC());
+    int updays = uptime / 86400; uptime %= 86400;
+    int uphours = uptime / 3600; uptime %= 3600;
+    int upmins = uptime / 60;
+    reply["CoreInfo"] = tr("<b>Quassel Core Version %1</b><br>"
+			   "Built: %2<br>"
+			   "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
+                                                     .arg(Quassel::buildInfo().buildDate)
+      .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate));
+
+#ifdef HAVE_SSL
+    SslServer *sslServer = qobject_cast<SslServer *>(&_server);
+    QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
+    bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid();
+#else
+    bool supportSsl = false;
+#endif
+
+#ifndef QT_NO_COMPRESS
+    bool supportsCompression = true;
+#else
+    bool supportsCompression = false;
+#endif
+
+    reply["SupportSsl"] = supportSsl;
+    reply["SupportsCompression"] = supportsCompression;
+    // switch to ssl/compression after client has been informed about our capabilities (see below)
+
+    reply["LoginEnabled"] = true;
+
+    // check if we are configured, start wizard otherwise
+    if(!configured) {
+      reply["Configured"] = false;
+      QList<QVariant> backends;
+      foreach(Storage *backend, _storageBackends.values()) {
+        QVariantMap v;
+        v["DisplayName"] = backend->displayName();
+        v["Description"] = backend->description();
+        backends.append(v);
       }
-      if (configured) {
-        processClientInit(socket, msg);
+      reply["StorageBackends"] = backends;
+      reply["LoginEnabled"] = false;
+    } else {
+      reply["Configured"] = true;
+    }
+    clientInfo[socket] = msg; // store for future reference
+    reply["MsgType"] = "ClientInitAck";
+    SignalProxy::writeDataToDevice(socket, reply);
+
+#ifdef HAVE_SSL
+    // after we told the client that we are ssl capable we switch to ssl mode
+    if(supportSsl && msg["UseSsl"].toBool()) {
+      qDebug() << qPrintable(tr("Starting TLS for Client:"))  << qPrintable(socket->peerAddress().toString());
+      connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+      sslSocket->startServerEncryption();
+    }
+#endif
+
+#ifndef QT_NO_COMPRESS
+    if(supportsCompression && msg["UseCompression"].toBool()) {
+      socket->setProperty("UseCompression", true);
+      qDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString());
+    }
+#endif
+
+  } else {
+    // for the rest, we need an initialized connection
+    if(!clientInfo.contains(socket)) {
+      QVariantMap reply;
+      reply["MsgType"] = "ClientLoginReject";
+      reply["Error"] = tr("<b>Client not initialized!</b><br>You need to send an init message before trying to login.");
+      SignalProxy::writeDataToDevice(socket, reply);
+      qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("did not send an init message before trying to login, rejecting."));
+      socket->close(); return;
+    }
+    if(msg["MsgType"] == "CoreSetupData") {
+      QVariantMap reply;
+      QString result = setupCore(msg["SetupData"].toMap());
+      if(!result.isEmpty()) {
+        reply["MsgType"] = "CoreSetupReject";
+        reply["Error"] = result;
       } else {
-        processCoreSetup(socket, msg);
+        reply["MsgType"] = "CoreSetupAck";
       }
-    } catch(Storage::AuthError) {
-      qWarning() << "Authentification error!";  // FIXME: send auth error to client
-      socket->close();
-      return;
-    } catch(Exception e) {
-      qWarning() << "Client init error:" << e.msg();
-      socket->close();
-      return;
+      SignalProxy::writeDataToDevice(socket, reply);
+    } else if(msg["MsgType"] == "ClientLogin") {
+      QVariantMap reply;
+      UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString());
+      if(uid == 0) {
+        reply["MsgType"] = "ClientLoginReject";
+        reply["Error"] = tr("<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.");
+        SignalProxy::writeDataToDevice(socket, reply);
+        return;
+      }
+      reply["MsgType"] = "ClientLoginAck";
+      SignalProxy::writeDataToDevice(socket, reply);
+      quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(msg["User"].toString()).arg(uid.toInt()));
+      setupClientSession(socket, uid);
     }
   }
-  blockSizes[socket] = bsize = 0;  // FIXME blockSizes aufr�um0rn!
 }
 
-// FIXME: no longer called, since connection handling is now in SignalProxy
-// No, it is called as long as core is not configured. (kaffeedoktor)
+// Potentially called during the initialization phase (before handing the connection off to the session)
 void Core::clientDisconnected() {
-  QTcpSocket *socket = dynamic_cast<QTcpSocket*>(sender());
-  blockSizes.remove(socket);
-  qDebug() << "Client disconnected.";
-  
+  QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+  if(socket) {
+    // here it's safe to call methods on socket!
+    quInfo() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString());
+    blocksizes.remove(socket);
+    clientInfo.remove(socket);
+    socket->deleteLater();
+  } else {
+    // we have to crawl through the hashes and see if we find a victim to remove
+    qDebug() << qPrintable(tr("Non-authed client disconnected. (socket allready destroyed)"));
+
+    // DO NOT CALL ANY METHODS ON socket!!
+    socket = static_cast<QTcpSocket *>(sender());
+
+    QHash<QTcpSocket *, quint32>::iterator blockSizeIter = blocksizes.begin();
+    while(blockSizeIter != blocksizes.end()) {
+      if(blockSizeIter.key() == socket) {
+	blocksizes.erase(blockSizeIter);
+      }
+      blockSizeIter++;
+    }
+
+    QHash<QTcpSocket *, QVariantMap>::iterator clientInfoIter = clientInfo.begin();
+    while(clientInfoIter != clientInfo.end()) {
+      if(clientInfoIter.key() == socket) {
+	clientInfo.erase(clientInfoIter);
+      }
+      clientInfoIter++;
+    }
+  }
+
+
   // make server listen again if still not configured
   if (!configured) {
     startListening();
   }
-  
-  // TODO remove unneeded sessions - if necessary/possible...
-}
 
-QVariant Core::connectLocalClient(QString user, QString passwd) {
-  UserId uid = instance()->storage->validateUser(user, passwd);
-  QVariant reply = instance()->initSession(uid);
-  instance()->guiUser = uid;
-  qDebug() << "Local client connected.";
-  return reply;
-}
-
-void Core::disconnectLocalClient() {
-  qDebug() << "Local client disconnected.";
-  instance()->guiUser = 0;
+  // TODO remove unneeded sessions - if necessary/possible...
+  // Suggestion: kill sessions if they are not connected to any network and client.
 }
 
-void Core::processClientInit(QTcpSocket *socket, const QVariantMap &msg) {
-  // Auth
-  QVariantMap reply;
-  UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); // throws exception if this failed
-  reply["StartWizard"] = false;
-  reply["Reply"] = initSession(uid);
+void Core::setupClientSession(QTcpSocket *socket, UserId uid) {
+  // Find or create session for validated user
+  SessionThread *sess;
+  if(sessions.contains(uid)) sess = sessions[uid];
+  else sess = createSession(uid);
+  // Hand over socket, session then sends state itself
   disconnect(socket, 0, this, 0);
-  sessions[uid]->addClient(socket);
-  qDebug() << "Client initialized successfully.";
-  SignalProxy::writeDataToDevice(socket, reply);
+  blocksizes.remove(socket);
+  clientInfo.remove(socket);
+  if(!sess) {
+    qWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString());
+    socket->close();
+  }
+  sess->addClient(socket);
 }
 
-void Core::processCoreSetup(QTcpSocket *socket, QVariantMap &msg) {
-  if(msg["HasSettings"].toBool()) {
-    QVariantMap auth;
-    auth["User"] = msg["User"];
-    auth["Password"] = msg["Password"];
-    msg.remove("User");
-    msg.remove("Password");
-    qDebug() << "Initializing storage provider" << msg["Type"].toString();
-
-    if(!initStorage(msg, true)) {
-      // notify client to start wizard again
-      qWarning("Core is currently not configured!");
-      QVariantMap reply;
-      reply["StartWizard"] = true;
-      reply["StorageProviders"] = availableStorageProviders();
-      SignalProxy::writeDataToDevice(socket, reply);
-    } else {
-      // write coresettings
-      CoreSettings s;
-      s.setDatabaseSettings(msg);
-      // write admin user to database & make the core listen again to connections
-      storage->addUser(auth["User"].toString(), auth["Password"].toString());
-      startListening();
-      // continue the normal procedure
-      processClientInit(socket, auth);
-    }
-  } else {
-    // notify client to start wizard
-    QVariantMap reply;
-    reply["StartWizard"] = true;
-    reply["StorageProviders"] = availableStorageProviders();
-    SignalProxy::writeDataToDevice(socket, reply);
+void Core::setupInternalClientSession(SignalProxy *proxy) {
+  if(!configured) {
+    stopListening();
+    setupCoreForInternalUsage();
   }
-}
 
-QVariant Core::initSession(UserId uid) {
+  UserId uid = storage->internalUser();
+
   // Find or create session for validated user
-  CoreSession *sess;
+  SessionThread *sess;
   if(sessions.contains(uid))
     sess = sessions[uid];
   else
     sess = createSession(uid);
-  QVariantMap reply;
-  reply["SessionState"] = sess->sessionState();
-  return reply;
+  sess->addClient(proxy);
 }
 
-QStringList Core::availableStorageProviders() {
-  QStringList storageProviders;
-  if (SqliteStorage::isAvailable()) {
-    storageProviders.append(SqliteStorage::displayName());
+SessionThread *Core::createSession(UserId uid, bool restore) {
+  if(sessions.contains(uid)) {
+    qWarning() << "Calling createSession() when a session for the user already exists!";
+    return 0;
   }
-  // TODO: temporary
-  // storageProviders.append("MySQL");
-  
-  return storageProviders;
+  SessionThread *sess = new SessionThread(uid, restore, this);
+  sessions[uid] = sess;
+  sess->start();
+  return sess;
+}
+
+#ifdef HAVE_SSL
+void Core::sslErrors(const QList<QSslError> &errors) {
+  Q_UNUSED(errors);
+  QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
+  if(socket)
+    socket->ignoreSslErrors();
+}
+#endif
+
+void Core::socketError(QAbstractSocket::SocketError err) {
+  QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(sender());
+  if(socket && err != QAbstractSocket::RemoteHostClosedError)
+    qWarning() << "Core::socketError()" << socket << err << socket->errorString();
 }