X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=3c8e20c67a573f5ef6fee25103983cb502620cf4;hp=c9891d23bb65738ec6c8e347ad29bb8494ef8cbb;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hpb=04754cf669dd295205226b744bc769b94693866a

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index c9891d23..11a95301 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,488 +15,768 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "coresession.h"
+
 #include <QtScript>
 
 #include "core.h"
-#include "coresession.h"
-#include "networkconnection.h"
-
-#include "signalproxy.h"
-#include "buffersyncer.h"
+#include "corebacklogmanager.h"
+#include "corebuffersyncer.h"
+#include "corebufferviewmanager.h"
+#include "coredccconfig.h"
+#include "coreeventmanager.h"
+#include "coreidentity.h"
+#include "coreignorelistmanager.h"
+#include "coreinfo.h"
+#include "coreirclisthelper.h"
+#include "corenetwork.h"
+#include "corenetworkconfig.h"
+#include "coresessioneventprocessor.h"
+#include "coretransfermanager.h"
+#include "coreuserinputhandler.h"
+#include "coreusersettings.h"
+#include "ctcpparser.h"
+#include "eventstringifier.h"
+#include "internalpeer.h"
+#include "ircchannel.h"
+#include "ircparser.h"
+#include "ircuser.h"
+#include "messageevent.h"
+#include "remotepeer.h"
 #include "storage.h"
+#include "util.h"
 
-#include "network.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-#include "identity.h"
+class ProcessMessagesEvent : public QEvent
+{
+public:
+    ProcessMessagesEvent()
+        : QEvent(QEvent::User)
+    {}
+};
+
+CoreSession::CoreSession(UserId uid, bool restoreState, bool strictIdentEnabled, QObject* parent)
+    : QObject(parent)
+    , _user(uid)
+    , _strictIdentEnabled(strictIdentEnabled)
+    , _signalProxy(new SignalProxy(SignalProxy::Server, this))
+    , _aliasManager(this)
+    , _bufferSyncer(new CoreBufferSyncer(this))
+    , _backlogManager(new CoreBacklogManager(this))
+    , _bufferViewManager(new CoreBufferViewManager(_signalProxy, this))
+    , _dccConfig(new CoreDccConfig(this))
+    , _ircListHelper(new CoreIrcListHelper(this))
+    , _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this))
+    , _coreInfo(new CoreInfo(this))
+    , _transferManager(new CoreTransferManager(this))
+    , _eventManager(new CoreEventManager(this))
+    , _eventStringifier(new EventStringifier(this))
+    , _sessionEventProcessor(new CoreSessionEventProcessor(this))
+    , _ctcpParser(new CtcpParser(this))
+    , _ircParser(new IrcParser(this))
+    , scriptEngine(new QScriptEngine(this))
+    , _processMessages(false)
+    , _ignoreListManager(this)
+    , _highlightRuleManager(this)
+{
+    SignalProxy* p = signalProxy();
+    p->setHeartBeatInterval(30);
+    p->setMaxHeartBeatCount(60);  // 30 mins until we throw a dead socket out
+
+    connect(p, &SignalProxy::peerRemoved, this, &CoreSession::removeClient);
+
+    connect(p, &SignalProxy::connected, this, &CoreSession::clientsConnected);
+    connect(p, &SignalProxy::disconnected, this, &CoreSession::clientsDisconnected);
+
+    p->attachSlot(SIGNAL(sendInput(BufferInfo,QString)), this, &CoreSession::msgFromClient);
+    p->attachSignal(this, &CoreSession::displayMsg);
+    p->attachSignal(this, &CoreSession::displayStatusMsg);
+
+    p->attachSignal(this, &CoreSession::identityCreated);
+    p->attachSignal(this, &CoreSession::identityRemoved);
+    p->attachSlot(SIGNAL(createIdentity(Identity,QVariantMap)), this, selectOverload<const Identity&, const QVariantMap&>(&CoreSession::createIdentity));
+    p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, &CoreSession::removeIdentity);
+
+    p->attachSignal(this, &CoreSession::networkCreated);
+    p->attachSignal(this, &CoreSession::networkRemoved);
+    p->attachSlot(SIGNAL(createNetwork(NetworkInfo,QStringList)), this,&CoreSession::createNetwork);
+    p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, &CoreSession::removeNetwork);
+
+    p->attachSlot(SIGNAL(changePassword(PeerPtr,QString,QString,QString)), this, &CoreSession::changePassword);
+    p->attachSignal(this, &CoreSession::passwordChanged);
+
+    p->attachSlot(SIGNAL(kickClient(int)), this, &CoreSession::kickClient);
+    p->attachSignal(this, &CoreSession::disconnectFromCore);
+
+    QVariantMap data;
+    data["quasselVersion"] = Quassel::buildInfo().fancyVersionString;
+    data["quasselBuildDate"] = Quassel::buildInfo().commitDate;  // "BuildDate" for compatibility
+    data["startTime"] = Core::instance()->startTime();
+    data["sessionConnectedClients"] = 0;
+    _coreInfo->setCoreData(data);
+
+    loadSettings();
+    initScriptEngine();
+
+    eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
+    eventManager()->registerObject(sessionEventProcessor(), EventManager::HighPriority);  // needs to process events *before* the stringifier!
+    eventManager()->registerObject(ctcpParser(), EventManager::NormalPriority);
+    eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
+    eventManager()->registerObject(this, EventManager::LowPriority);  // for sending MessageEvents to the client
+    // some events need to be handled after msg generation
+    eventManager()->registerObject(sessionEventProcessor(), EventManager::LowPriority, "lateProcess");
+    eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
+
+    // periodically save our session state
+    connect(Core::instance()->syncTimer(), &QTimer::timeout, this, &CoreSession::saveSessionState);
+
+    p->synchronize(_bufferSyncer);
+    p->synchronize(&aliasManager());
+    p->synchronize(_backlogManager);
+    p->synchronize(dccConfig());
+    p->synchronize(ircListHelper());
+    p->synchronize(networkConfig());
+    p->synchronize(_coreInfo);
+    p->synchronize(&_ignoreListManager);
+    p->synchronize(&_highlightRuleManager);
+    // Listen to network removed events
+    connect(this, &CoreSession::networkRemoved, &_highlightRuleManager, &HighlightRuleManager::networkRemoved);
+    p->synchronize(transferManager());
+    // Restore session state
+    if (restoreState)
+        restoreSessionState();
+
+    emit initialized();
+}
+
+void CoreSession::shutdown()
+{
+    saveSessionState();
+
+    // Request disconnect from all connected networks in parallel, and wait until every network
+    // has emitted the disconnected() signal before deleting the session itself
+    for (CoreNetwork* net : _networks.values()) {
+        if (net->socketState() != QAbstractSocket::UnconnectedState) {
+            _networksPendingDisconnect.insert(net->networkId());
+            connect(net, &CoreNetwork::disconnected, this, &CoreSession::onNetworkDisconnected);
+            net->shutdown();
+        }
+    }
 
-#include "util.h"
-#include "coreusersettings.h"
+    if (_networksPendingDisconnect.isEmpty()) {
+        // Nothing to do, suicide so the core can shut down
+        deleteLater();
+    }
+}
 
-CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent),
-    _user(uid),
-    _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
-    _bufferSyncer(new BufferSyncer(this)),
-    scriptEngine(new QScriptEngine(this))
+void CoreSession::onNetworkDisconnected(NetworkId networkId)
 {
+    _networksPendingDisconnect.remove(networkId);
+    if (_networksPendingDisconnect.isEmpty()) {
+        // We're done, suicide so the core can shut down
+        deleteLater();
+    }
+}
 
-  SignalProxy *p = signalProxy();
+CoreNetwork* CoreSession::network(NetworkId id) const
+{
+    if (_networks.contains(id))
+        return _networks[id];
+    return nullptr;
+}
 
-  p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
-  p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
-  p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
-  p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant)));
-  p->attachSignal(this, SIGNAL(displayMsg(Message)));
-  p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
-  p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool)));
-  p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo)));
+CoreIdentity* CoreSession::identity(IdentityId id) const
+{
+    if (_identities.contains(id))
+        return _identities[id];
+    return nullptr;
+}
 
-  p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
-  p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
-  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
-  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(updateIdentity(const Identity &)));
-  p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
+void CoreSession::loadSettings()
+{
+    CoreUserSettings s(user());
 
-  p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
-  p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
-  p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
-  p->attachSlot(SIGNAL(updateNetwork(const NetworkInfo &)), this, SLOT(updateNetwork(const NetworkInfo &)));
-  p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
+    // migrate to db
+    QList<IdentityId> ids = s.identityIds();
+    QList<NetworkInfo> networkInfos = Core::networks(user());
+    foreach (IdentityId id, ids) {
+        CoreIdentity identity(s.identity(id));
+        IdentityId newId = Core::createIdentity(user(), identity);
+        QList<NetworkInfo>::iterator networkIter = networkInfos.begin();
+        while (networkIter != networkInfos.end()) {
+            if (networkIter->identity == id) {
+                networkIter->identity = newId;
+                Core::updateNetwork(user(), *networkIter);
+                networkIter = networkInfos.erase(networkIter);
+            }
+            else {
+                ++networkIter;
+            }
+        }
+        s.removeIdentity(id);
+    }
+    // end of migration
 
-  loadSettings();
-  initScriptEngine();
+    foreach (CoreIdentity identity, Core::identities(user())) {
+        createIdentity(identity);
+    }
 
-  // init BufferSyncer
-  QHash<BufferId, QDateTime> lastSeenHash = Core::bufferLastSeenDates(user());
-  foreach(BufferId id, lastSeenHash.keys()) _bufferSyncer->requestSetLastSeen(id, lastSeenHash[id]);
-  connect(_bufferSyncer, SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(storeBufferLastSeen(BufferId, const QDateTime &)));
-  connect(_bufferSyncer, SIGNAL(removeBufferRequested(BufferId)), this, SLOT(removeBufferRequested(BufferId)));
-  connect(this, SIGNAL(bufferRemoved(BufferId)), _bufferSyncer, SLOT(removeBuffer(BufferId)));
-  p->synchronize(_bufferSyncer);
+    foreach (NetworkInfo info, Core::networks(user())) {
+        createNetwork(info);
+    }
+}
 
-  // Restore session state
-  if(restoreState) restoreSessionState();
+void CoreSession::saveSessionState() const
+{
+    _bufferSyncer->storeDirtyIds();
+    _bufferViewManager->saveBufferViews();
+    _networkConfig->save();
+}
 
-  emit initialized();
+void CoreSession::restoreSessionState()
+{
+    QList<NetworkId> nets = Core::connectedNetworks(user());
+    CoreNetwork* net = nullptr;
+    foreach (NetworkId id, nets) {
+        net = network(id);
+        Q_ASSERT(net);
+        net->connectToIrc();
+    }
 }
 
-CoreSession::~CoreSession() {
-  saveSessionState();
-  foreach(NetworkConnection *conn, _connections.values()) {
-    delete conn;
-  }
-  foreach(Network *net, _networks.values()) {
-    delete net;
-  }
+void CoreSession::addClient(RemotePeer* peer)
+{
+    signalProxy()->setTargetPeer(peer);
+
+    peer->dispatch(sessionState());
+    signalProxy()->addPeer(peer);
+    _coreInfo->setConnectedClientData(signalProxy()->peerCount(), signalProxy()->peerData());
+
+    signalProxy()->setTargetPeer(nullptr);
 }
 
-UserId CoreSession::user() const {
-  return _user;
+void CoreSession::addClient(InternalPeer* peer)
+{
+    signalProxy()->addPeer(peer);
+    emit sessionStateReceived(sessionState());
 }
 
-Network *CoreSession::network(NetworkId id) const {
-  if(_networks.contains(id)) return _networks[id];
-  return 0;
+void CoreSession::removeClient(Peer* peer)
+{
+    auto* p = qobject_cast<RemotePeer*>(peer);
+    if (p)
+        qInfo() << qPrintable(tr("Client")) << p->description() << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
+    _coreInfo->setConnectedClientData(signalProxy()->peerCount(), signalProxy()->peerData());
 }
 
-NetworkConnection *CoreSession::networkConnection(NetworkId id) const {
-  if(_connections.contains(id)) return _connections[id];
-  return 0;
+QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const
+{
+    return Core::persistentChannels(user(), id);
 }
 
-Identity *CoreSession::identity(IdentityId id) const {
-  if(_identities.contains(id)) return _identities[id];
-  return 0;
+QHash<QString, QByteArray> CoreSession::bufferCiphers(NetworkId id) const
+{
+    return Core::bufferCiphers(user(), id);
 }
 
-void CoreSession::loadSettings() {
-  CoreUserSettings s(user());
+void CoreSession::setBufferCipher(NetworkId id, const QString& bufferName, const QByteArray& cipher) const
+{
+    Core::setBufferCipher(user(), id, bufferName, cipher);
+}
 
-  foreach(IdentityId id, s.identityIds()) {
-    Identity *i = new Identity(s.identity(id), this);
-    if(!i->isValid()) {
-      qWarning() << QString("Invalid identity! Removing...");
-      s.removeIdentity(id);
-      delete i;
-      continue;
-    }
-    if(_identities.contains(i->id())) {
-      qWarning() << "Duplicate identity, ignoring!";
-      delete i;
-      continue;
-    }
-    _identities[i->id()] = i;
-    signalProxy()->synchronize(i);
-  }
-  if(!_identities.count()) {
-    Identity i(1);
-    i.setToDefaults();
-    i.setIdentityName(tr("Default Identity"));
-    createIdentity(i);
-  }
-
-
-  // migration to pure DB storage
-  QList<NetworkId> netIds = s.networkIds();
-  if(!netIds.isEmpty()) {
-    qDebug() << "Migrating Networksettings to DB Storage for User:" << user();
-    foreach(NetworkId id, netIds) {
-      NetworkInfo info = s.networkInfo(id);
-
-      // default new options
-      info.useRandomServer = false;
-      info.useAutoReconnect = true;
-      info.autoReconnectInterval = 60;
-      info.autoReconnectRetries = 20;
-      info.unlimitedReconnectRetries = false;
-      info.useAutoIdentify = false;
-      info.autoIdentifyService = "NickServ";
-      info.rejoinChannels = true;
-
-      Core::updateNetwork(user(), info);
-      s.removeNetworkInfo(id);
+// FIXME switch to BufferId
+void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg)
+{
+    CoreNetwork* net = network(bufinfo.networkId());
+    if (net) {
+        net->userInput(bufinfo, msg);
     }
-  }
-
-  foreach(NetworkInfo info, Core::networks(user())) {
-    createNetwork(info);
-  }
-}
-
-void CoreSession::saveSessionState() const {
-  QVariantMap res;
-  QVariantList conn;
-  foreach(NetworkConnection *net, _connections.values()) {
-    QVariantMap m;
-    m["NetworkId"] = QVariant::fromValue<NetworkId>(net->networkId());
-    m["State"] = net->state();
-    conn << m;
-  }
-  res["CoreBuild"] = Global::quasselBuild;
-  res["ConnectedNetworks"] = conn;
-  CoreUserSettings s(user());
-  s.setSessionState(res);
-}
-
-void CoreSession::restoreSessionState() {
-  CoreUserSettings s(user());
-  uint build = s.sessionState().toMap()["CoreBuild"].toUInt();
-  if(build < 362) {
-    qWarning() << qPrintable(tr("Session state does not exist or is too old!"));
-    return;
-  }
-  QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList();
-  foreach(QVariant v, conn) {
-    NetworkId id = v.toMap()["NetworkId"].value<NetworkId>();
-    if(_networks.keys().contains(id)) connectToNetwork(id, v.toMap()["State"]);
-  }
-}
-
-void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
-  if(uid == user()) emit bufferInfoUpdated(bufinfo);
-}
-
-// FIXME remove
-void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) {
-  Network *net = 0;
-  foreach(Network *n, _networks.values()) {
-    if(n->networkName() == netname) {
-      net = n; break;
+    else {
+        qWarning() << "Trying to send to unconnected network:" << msg;
     }
-  }
-  if(!net) {
-    qWarning() << "Connect to unknown network requested, ignoring!";
-    return;
-  }
-  connectToNetwork(net->networkId(), previousState);
 }
 
-void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) {
-  Network *net = network(id);
-  if(!net) {
-    qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
-    return;
-  }
+// ALL messages coming pass through these functions before going to the GUI.
+// So this is the perfect place for storing the backlog and log stuff.
+void CoreSession::recvMessageFromServer(NetworkId networkId,
+                                        Message::Type type,
+                                        BufferInfo::Type bufferType,
+                                        const QString& target,
+                                        const QString& text_,
+                                        const QString& sender,
+                                        Message::Flags flags)
+{
+    // U+FDD0 and U+FDD1 are special characters for Qt's text engine, specifically they mark the boundaries of
+    // text frames in a QTextDocument. This might lead to problems in widgets displaying QTextDocuments (such as
+    // KDE's notifications), hence we remove those just to be safe.
+    QString text = text_;
+    text.remove(QChar(0xfdd0)).remove(QChar(0xfdd1));
+    RawMessage rawMsg(networkId, type, bufferType, target, text, sender, flags);
+
+    // check for HardStrictness ignore
+    CoreNetwork* currentNetwork = network(networkId);
+    QString networkName = currentNetwork ? currentNetwork->networkName() : QString("");
+    if (_ignoreListManager.match(rawMsg, networkName) == IgnoreListManager::HardStrictness)
+        return;
+
+    if (currentNetwork && _highlightRuleManager.match(rawMsg, currentNetwork->myNick(), currentNetwork->identityPtr()->nicks()))
+        rawMsg.flags |= Message::Flag::Highlight;
+
+    _messageQueue << rawMsg;
+    if (!_processMessages) {
+        _processMessages = true;
+        QCoreApplication::postEvent(this, new ProcessMessagesEvent());
+    }
+}
 
-  NetworkConnection *conn = networkConnection(id);
-  if(!conn) {
-    conn = new NetworkConnection(net, this, previousState);
-    _connections[id] = conn;
-    attachNetworkConnection(conn);
-  }
-  conn->connectToIrc();
+void CoreSession::recvStatusMsgFromServer(QString msg)
+{
+    auto* net = qobject_cast<CoreNetwork*>(sender());
+    Q_ASSERT(net);
+    emit displayStatusMsg(net->networkName(), msg);
 }
 
-void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
-  connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
-  connect(conn, SIGNAL(quitRequested(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
+void CoreSession::processMessageEvent(MessageEvent* event)
+{
+    recvMessageFromServer(event->networkId(),
+                          event->msgType(),
+                          event->bufferType(),
+                          event->target().isNull() ? "" : event->target(),
+                          event->text().isNull() ? "" : event->text(),
+                          event->sender().isNull() ? "" : event->sender(),
+                          event->msgFlags());
+}
 
-  // I guess we don't need these anymore, client-side can just connect the network's signals directly
-  //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
-  //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
+QList<BufferInfo> CoreSession::buffers() const
+{
+    return Core::requestBuffers(user());
+}
 
-  connect(conn, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
-	  this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
-  connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+void CoreSession::customEvent(QEvent* event)
+{
+    if (event->type() != QEvent::User)
+        return;
 
+    processMessages();
+    event->accept();
 }
 
-void CoreSession::disconnectFromNetwork(NetworkId id) {
-  if(!_connections.contains(id)) return;
-  _connections[id]->disconnectFromIrc();
+void CoreSession::processMessages()
+{
+    if (_messageQueue.count() == 1) {
+        const RawMessage& rawMsg = _messageQueue.first();
+        bool createBuffer = !(rawMsg.flags & Message::Redirected);
+        BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target, createBuffer);
+        if (!bufferInfo.isValid()) {
+            Q_ASSERT(!createBuffer);
+            bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, BufferInfo::StatusBuffer, "");
+        }
+        Message msg(bufferInfo,
+                    rawMsg.type,
+                    rawMsg.text,
+                    rawMsg.sender,
+                    senderPrefixes(rawMsg.sender, bufferInfo),
+                    realName(rawMsg.sender, rawMsg.networkId),
+                    avatarUrl(rawMsg.sender, rawMsg.networkId),
+                    rawMsg.flags);
+        if (Core::storeMessage(msg))
+            emit displayMsg(msg);
+    }
+    else {
+        QHash<NetworkId, QHash<QString, BufferInfo>> bufferInfoCache;
+        MessageList messages;
+        QList<RawMessage> redirectedMessages;  // list of Messages which don't enforce a buffer creation
+        BufferInfo bufferInfo;
+        for (int i = 0; i < _messageQueue.count(); i++) {
+            const RawMessage& rawMsg = _messageQueue.at(i);
+            if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
+                bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
+            }
+            else {
+                bool createBuffer = !(rawMsg.flags & Message::Redirected);
+                bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target, createBuffer);
+                if (!bufferInfo.isValid()) {
+                    Q_ASSERT(!createBuffer);
+                    redirectedMessages << rawMsg;
+                    continue;
+                }
+                bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+            }
+            Message msg(bufferInfo,
+                        rawMsg.type,
+                        rawMsg.text,
+                        rawMsg.sender,
+                        senderPrefixes(rawMsg.sender, bufferInfo),
+                        realName(rawMsg.sender, rawMsg.networkId),
+                        avatarUrl(rawMsg.sender, rawMsg.networkId),
+                        rawMsg.flags);
+            messages << msg;
+        }
+
+        // recheck if there exists a buffer to store a redirected message in
+        for (int i = 0; i < redirectedMessages.count(); i++) {
+            const RawMessage& rawMsg = redirectedMessages.at(i);
+            if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
+                bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
+            }
+            else {
+                // no luck -> we store them in the StatusBuffer
+                bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, BufferInfo::StatusBuffer, "");
+                // add the StatusBuffer to the Cache in case there are more Messages for the original target
+                bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+            }
+            Message msg(bufferInfo,
+                        rawMsg.type,
+                        rawMsg.text,
+                        rawMsg.sender,
+                        senderPrefixes(rawMsg.sender, bufferInfo),
+                        realName(rawMsg.sender, rawMsg.networkId),
+                        avatarUrl(rawMsg.sender, rawMsg.networkId),
+                        rawMsg.flags);
+            messages << msg;
+        }
+
+        if (Core::storeMessages(messages)) {
+            // FIXME: extend protocol to a displayMessages(MessageList)
+            for (int i = 0; i < messages.count(); i++) {
+                emit displayMsg(messages[i]);
+            }
+        }
+    }
+    _processMessages = false;
+    _messageQueue.clear();
 }
 
-void CoreSession::networkStateRequested() {
+QString CoreSession::senderPrefixes(const QString& sender, const BufferInfo& bufferInfo) const
+{
+    CoreNetwork* currentNetwork = network(bufferInfo.networkId());
+    if (!currentNetwork) {
+        return {};
+    }
+
+    if (bufferInfo.type() != BufferInfo::ChannelBuffer) {
+        return {};
+    }
+
+    IrcChannel* currentChannel = currentNetwork->ircChannel(bufferInfo.bufferName());
+    if (!currentChannel) {
+        return {};
+    }
+
+    const QString modes = currentChannel->userModes(nickFromMask(sender).toLower());
+    return currentNetwork->modesToPrefixes(modes);
 }
 
-void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it in signal connections
-  QIODevice *device = qobject_cast<QIODevice *>(dev);
-  if(!device) {
-    qWarning() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
-  } else {
-    signalProxy()->addPeer(device);
-    QVariantMap reply;
-    reply["MsgType"] = "SessionInit";
-    reply["SessionState"] = sessionState();
-    SignalProxy::writeDataToDevice(device, reply);
-  }
+QString CoreSession::realName(const QString& sender, NetworkId networkId) const
+{
+    CoreNetwork* currentNetwork = network(networkId);
+    if (!currentNetwork) {
+        return {};
+    }
+
+    IrcUser* currentUser = currentNetwork->ircUser(nickFromMask(sender));
+    if (!currentUser) {
+        return {};
+    }
+
+    return currentUser->realName();
 }
 
-SignalProxy *CoreSession::signalProxy() const {
-  return _signalProxy;
+QString CoreSession::avatarUrl(const QString& sender, NetworkId networkId) const
+{
+    Q_UNUSED(sender);
+    Q_UNUSED(networkId);
+    // Currently we do not have a way to retrieve this value yet.
+    //
+    // This likely will require implementing IRCv3's METADATA spec.
+    // See https://ircv3.net/irc/
+    // And https://blog.irccloud.com/avatars/
+    return "";
 }
 
-// FIXME we need a sane way for creating buffers!
-void CoreSession::networkConnected(NetworkId networkid) {
-  Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
+Protocol::SessionState CoreSession::sessionState() const
+{
+    QVariantList bufferInfos;
+    QVariantList networkIds;
+    QVariantList identities;
+
+    foreach (const BufferInfo& id, buffers())
+        bufferInfos << QVariant::fromValue(id);
+    foreach (const NetworkId& id, _networks.keys())
+        networkIds << QVariant::fromValue(id);
+    foreach (const Identity* i, _identities.values())
+        identities << QVariant::fromValue(*i);
+
+    return Protocol::SessionState(identities, bufferInfos, networkIds);
 }
 
-// called now only on /quit and requested disconnects, not on normal disconnects!
-void CoreSession::networkDisconnected(NetworkId networkid) {
-  if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater();
+void CoreSession::initScriptEngine()
+{
+    signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, &CoreSession::scriptRequest);
+    signalProxy()->attachSignal(this, &CoreSession::scriptResult);
+
+    // FIXME
+    // QScriptValue storage_ = scriptEngine->newQObject(storage);
+    // scriptEngine->globalObject().setProperty("storage", storage_);
 }
 
-// FIXME switch to BufferId
-void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
-  NetworkConnection *conn = networkConnection(bufinfo.networkId());
-  if(conn) {
-    conn->userInput(bufinfo, msg);
-  } else {
-    qWarning() << "Trying to send to unconnected network!";
-  }
+void CoreSession::scriptRequest(QString script)
+{
+    emit scriptResult(scriptEngine->evaluate(script).toString());
 }
 
-// ALL messages coming pass through these functions before going to the GUI.
-// So this is the perfect place for storing the backlog and log stuff.
-void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 flags) {
-  NetworkConnection *netCon = qobject_cast<NetworkConnection*>(this->sender());
-  Q_ASSERT(netCon);
-  
-  BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferType, target);
-  Message msg(bufferInfo, type, text, sender, flags);
-  msg.setMsgId(Core::storeMessage(msg));
-  Q_ASSERT(msg.msgId() != 0);
-  emit displayMsg(msg);
+/*** Identity Handling ***/
+void CoreSession::createIdentity(const Identity& identity, const QVariantMap& additional)
+{
+#ifndef HAVE_SSL
+    Q_UNUSED(additional)
+#endif
+
+    CoreIdentity coreIdentity(identity);
+#ifdef HAVE_SSL
+    if (additional.contains("KeyPem"))
+        coreIdentity.setSslKey(additional["KeyPem"].toByteArray());
+    if (additional.contains("CertPem"))
+        coreIdentity.setSslCert(additional["CertPem"].toByteArray());
+#endif
+    qDebug() << Q_FUNC_INFO;
+    IdentityId id = Core::createIdentity(user(), coreIdentity);
+    if (!id.isValid())
+        return;
+    else
+        createIdentity(coreIdentity);
+}
+
+const QString CoreSession::strictCompliantIdent(const CoreIdentity* identity)
+{
+    if (_strictIdentEnabled) {
+        // Strict mode enabled: only allow the user's Quassel username as an ident
+        return Core::instance()->strictSysIdent(_user);
+    }
+    else {
+        // Strict mode disabled: allow any identity specified
+        return identity->ident();
+    }
 }
 
-void CoreSession::recvStatusMsgFromServer(QString msg) {
-  NetworkConnection *s = qobject_cast<NetworkConnection*>(sender());
-  Q_ASSERT(s);
-  emit displayStatusMsg(s->networkName(), msg);
+void CoreSession::createIdentity(const CoreIdentity& identity)
+{
+    auto* coreIdentity = new CoreIdentity(identity, this);
+    _identities[identity.id()] = coreIdentity;
+    // CoreIdentity has its own synchronize method since its "private" sslManager needs to be synced as well
+    coreIdentity->synchronize(signalProxy());
+    connect(coreIdentity, &SyncableObject::updated, this, &CoreSession::updateIdentityBySender);
+    emit identityCreated(*coreIdentity);
 }
 
-QList<BufferInfo> CoreSession::buffers() const {
-  return Core::requestBuffers(user());
+void CoreSession::updateIdentityBySender()
+{
+    auto* identity = qobject_cast<CoreIdentity*>(sender());
+    if (!identity)
+        return;
+    Core::updateIdentity(user(), *identity);
 }
 
+void CoreSession::removeIdentity(IdentityId id)
+{
+    CoreIdentity* identity = _identities.take(id);
+    if (identity) {
+        emit identityRemoved(id);
+        Core::removeIdentity(user(), id);
+        identity->deleteLater();
+    }
+}
 
-QVariant CoreSession::sessionState() {
-  QVariantMap v;
+/*** Network Handling ***/
 
-  QVariantList bufs;
-  foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
-  v["BufferInfos"] = bufs;
-  QVariantList networkids;
-  foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
-  v["NetworkIds"] = networkids;
+void CoreSession::createNetwork(const NetworkInfo& info_, const QStringList& persistentChans)
+{
+    NetworkInfo info = info_;
+    int id;
 
-  quint32 ircusercount = 0;
-  quint32 ircchannelcount = 0;
-  foreach(Network *net, _networks.values()) {
-    ircusercount += net->ircUserCount();
-    ircchannelcount += net->ircChannelCount();
-  }
-  v["IrcUserCount"] = ircusercount;
-  v["IrcChannelCount"] = ircchannelcount;
+    if (!info.networkId.isValid())
+        Core::createNetwork(user(), info);
 
-  QList<QVariant> idlist;
-  foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
-  v["Identities"] = idlist;
+    if (!info.networkId.isValid()) {
+        qWarning() << qPrintable(
+            tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName));
+        return;
+    }
 
-  //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
-  return v;
+    id = info.networkId.toInt();
+    if (!_networks.contains(id)) {
+        // create persistent chans
+        QRegExp rx(R"(\s*(\S+)(?:\s*(\S+))?\s*)");
+        foreach (QString channel, persistentChans) {
+            if (!rx.exactMatch(channel)) {
+                qWarning() << QString("Invalid persistent channel declaration: %1").arg(channel);
+                continue;
+            }
+            Core::bufferInfo(user(), info.networkId, BufferInfo::ChannelBuffer, rx.cap(1), true);
+            Core::setChannelPersistent(user(), info.networkId, rx.cap(1), true);
+            if (!rx.cap(2).isEmpty())
+                Core::setPersistentChannelKey(user(), info.networkId, rx.cap(1), rx.cap(2));
+        }
+
+        CoreNetwork* net = new CoreNetwork(id, this);
+        connect(net, &CoreNetwork::displayMsg, this, &CoreSession::recvMessageFromServer);
+        connect(net, &CoreNetwork::displayStatusMsg, this, &CoreSession::recvStatusMsgFromServer);
+        connect(net, &CoreNetwork::disconnected, this, &CoreSession::networkDisconnected);
+
+        net->setNetworkInfo(info);
+        net->setProxy(signalProxy());
+        _networks[id] = net;
+        signalProxy()->synchronize(net);
+        emit networkCreated(id);
+    }
+    else {
+        qWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
+        _networks[info.networkId]->requestSetNetworkInfo(info);
+    }
 }
 
-void CoreSession::storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen) {
-  Core::setBufferLastSeen(user(), buffer, lastSeen);
+void CoreSession::removeNetwork(NetworkId id)
+{
+    // Make sure the network is disconnected!
+    CoreNetwork* net = network(id);
+    if (!net)
+        return;
+
+    if (net->connectionState() != Network::Disconnected) {
+        // make sure we no longer receive data from the tcp buffer
+        disconnect(net, &CoreNetwork::displayMsg, this, nullptr);
+        disconnect(net, &CoreNetwork::displayStatusMsg, this, nullptr);
+        connect(net, &CoreNetwork::disconnected, this, &CoreSession::destroyNetwork);
+        net->disconnectFromIrc();
+    }
+    else {
+        destroyNetwork(id);
+    }
 }
 
-void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
-  QList<QVariant> log;
-  QList<Message> msglist;
-  if(v1.type() == QVariant::DateTime) {
+void CoreSession::destroyNetwork(NetworkId id)
+{
+    QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
+    Network* net = _networks.take(id);
+    if (net && Core::removeNetwork(user(), id)) {
+        // make sure that all unprocessed RawMessages from this network are removed
+        QList<RawMessage>::iterator messageIter = _messageQueue.begin();
+        while (messageIter != _messageQueue.end()) {
+            if (messageIter->networkId == id) {
+                messageIter = _messageQueue.erase(messageIter);
+            }
+            else {
+                ++messageIter;
+            }
+        }
+        // remove buffers from syncer
+        foreach (BufferId bufferId, removedBuffers) {
+            _bufferSyncer->removeBuffer(bufferId);
+        }
+        emit networkRemoved(id);
+        net->deleteLater();
+    }
+}
 
+void CoreSession::renameBuffer(const NetworkId& networkId, const QString& newName, const QString& oldName)
+{
+    BufferInfo bufferInfo = Core::bufferInfo(user(), networkId, BufferInfo::QueryBuffer, oldName, false);
+    if (bufferInfo.isValid()) {
+        _bufferSyncer->renameBuffer(bufferInfo.bufferId(), newName);
+    }
+}
 
-  } else {
-    msglist = Core::requestMsgs(id, v1.toInt(), v2.toInt());
-  }
+void CoreSession::clientsConnected()
+{
+    QHash<NetworkId, CoreNetwork*>::iterator netIter = _networks.begin();
+    Identity* identity = nullptr;
+    CoreNetwork* net = nullptr;
+    IrcUser* me = nullptr;
+    while (netIter != _networks.end()) {
+        net = *netIter;
+        ++netIter;
+
+        if (!net->isConnected())
+            continue;
+        identity = net->identityPtr();
+        if (!identity)
+            continue;
+        me = net->me();
+        if (!me)
+            continue;
+
+        if (identity->detachAwayEnabled() && me->isAway()) {
+            net->userInputHandler()->handleAway(BufferInfo(), QString());
+        }
+    }
+}
 
-  // Send messages out in smaller packages - we don't want to make the signal data too large!
-  for(int i = 0; i < msglist.count(); i++) {
-    log.append(qVariantFromValue(msglist[i]));
-    if(log.count() >= 5) {
-      emit backlogData(id, log, i >= msglist.count() - 1);
-      log.clear();
+void CoreSession::clientsDisconnected()
+{
+    QHash<NetworkId, CoreNetwork*>::iterator netIter = _networks.begin();
+    Identity* identity = nullptr;
+    CoreNetwork* net = nullptr;
+    IrcUser* me = nullptr;
+    QString awayReason;
+    while (netIter != _networks.end()) {
+        net = *netIter;
+        ++netIter;
+
+        if (!net->isConnected())
+            continue;
+
+        identity = net->identityPtr();
+        if (!identity)
+            continue;
+        me = net->me();
+        if (!me)
+            continue;
+
+        if (identity->detachAwayEnabled() && !me->isAway()) {
+            if (!identity->detachAwayReason().isEmpty())
+                awayReason = identity->detachAwayReason();
+            net->setAutoAwayActive(true);
+            // Allow handleAway() to format the current date/time in the string.
+            net->userInputHandler()->handleAway(BufferInfo(), awayReason);
+        }
     }
-  }
-  if(log.count() > 0) emit backlogData(id, log, true);
 }
 
+void CoreSession::globalAway(const QString& msg, const bool skipFormatting)
+{
+    QHash<NetworkId, CoreNetwork*>::iterator netIter = _networks.begin();
+    CoreNetwork* net = nullptr;
+    while (netIter != _networks.end()) {
+        net = *netIter;
+        ++netIter;
 
-void CoreSession::initScriptEngine() {
-  signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
-  signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
+        if (!net->isConnected())
+            continue;
 
-  // FIXME
-  //QScriptValue storage_ = scriptEngine->newQObject(storage);
-  //scriptEngine->globalObject().setProperty("storage", storage_);
+        net->userInputHandler()->issueAway(msg, false /* no force away */, skipFormatting);
+    }
 }
 
-void CoreSession::scriptRequest(QString script) {
-  emit scriptResult(scriptEngine->evaluate(script).toString());
-}
+void CoreSession::changePassword(PeerPtr peer, const QString& userName, const QString& oldPassword, const QString& newPassword)
+{
+    Q_UNUSED(peer);
 
-/*** Identity Handling ***/
+    bool success = false;
+    UserId uid = Core::validateUser(userName, oldPassword);
+    if (uid.isValid() && uid == user())
+        success = Core::changeUserPassword(uid, newPassword);
 
-void CoreSession::createIdentity(const Identity &id) {
-  // find free ID
-  int i;
-  for(i = 1; i <= _identities.count(); i++) {
-    if(!_identities.keys().contains(i)) break;
-  }
-  //qDebug() << "found free id" << i;
-  Identity *newId = new Identity(id, this);
-  newId->setId(i);
-  _identities[i] = newId;
-  signalProxy()->synchronize(newId);
-  CoreUserSettings s(user());
-  s.storeIdentity(*newId);
-  emit identityCreated(*newId);
-}
-
-void CoreSession::updateIdentity(const Identity &id) {
-  if(!_identities.contains(id.id())) {
-    qWarning() << "Update request for unknown identity received!";
-    return;
-  }
-  _identities[id.id()]->update(id);
-
-  CoreUserSettings s(user());
-  s.storeIdentity(id);
-}
-
-void CoreSession::removeIdentity(IdentityId id) {
-  Identity *i = _identities.take(id);
-  if(i) {
-    emit identityRemoved(id);
-    CoreUserSettings s(user());
-    s.removeIdentity(id);
-    i->deleteLater();
-  }
+    signalProxy()->restrictTargetPeers(signalProxy()->sourcePeer(), [&] { emit passwordChanged(nullptr, success); });
 }
 
-/*** Network Handling ***/
-
-void CoreSession::createNetwork(const NetworkInfo &info_) {
-  NetworkInfo info = info_;
-  int id;
-
-  if(!info.networkId.isValid())
-    Core::createNetwork(user(), info);
-
-  Q_ASSERT(info.networkId.isValid());
-
-  id = info.networkId.toInt();
-  Q_ASSERT(!_networks.contains(id));
-  
-  Network *net = new Network(id, this);
-  connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId)));
-  connect(net, SIGNAL(disconnectRequested(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId)));
-  net->setNetworkInfo(info);
-  net->setProxy(signalProxy());
-  _networks[id] = net;
-  signalProxy()->synchronize(net);
-  emit networkCreated(id);
-}
-
-void CoreSession::updateNetwork(const NetworkInfo &info) {
-  if(!_networks.contains(info.networkId)) {
-    qWarning() << "Update request for unknown network received!";
-    return;
-  }
-  _networks[info.networkId]->setNetworkInfo(info);
-  Core::updateNetwork(user(), info);
-}
-
-void CoreSession::removeNetwork(NetworkId id) {
-  // Make sure the network is disconnected!
-  NetworkConnection *conn = _connections.value(id, 0);
-  if(conn) {
-    if(conn->connectionState() != Network::Disconnected) {
-      connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
-      conn->disconnectFromIrc();
-    } else {
-      _connections.take(id)->deleteLater();  // TODO make this saner
-      destroyNetwork(id);
-    }
-  } else {
-    destroyNetwork(id);
-  }
-}
-
-void CoreSession::destroyNetwork(NetworkId id) {
-  Q_ASSERT(!_connections.contains(id));
-  Network *net = _networks.take(id);
-  if(net && Core::removeNetwork(user(), id)) {
-    emit networkRemoved(id);
-    net->deleteLater();
-  }
-}
-
-void CoreSession::removeBufferRequested(BufferId bufferId) {
-  BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
-  if(!bufferInfo.isValid()) {
-    qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
-    return;
-  }
-  
-  if(bufferInfo.type() == BufferInfo::StatusBuffer) {
-    qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
-    return;
-  }
-  
-  if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
-    Network *net = network(bufferInfo.networkId());
-    Q_ASSERT(net);
-    IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
-    if(chan) {
-      qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
-      return;
+void CoreSession::kickClient(int peerId)
+{
+    auto peer = signalProxy()->peerById(peerId);
+    if (peer == nullptr) {
+        qWarning() << "Invalid peer Id: " << peerId;
+        return;
     }
-  }
-  if(Core::removeBuffer(user(), bufferId))
-    emit bufferRemoved(bufferId);
+    signalProxy()->restrictTargetPeers(peer, [&] { emit disconnectFromCore(); });
 }