X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fprotocols%2Fdatastream%2Fdatastreampeer.cpp;h=1027c405c44d82f36b5a6c40bfcd622262cf3749;hp=baecba70cdd1b328220a25671308209bf74109ec;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hpb=db9bba48e1674f169d1ed3cf184e5fa56dbe3a80 diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp index baecba70..1027c405 100644 --- a/src/common/protocols/datastream/datastreampeer.cpp +++ b/src/common/protocols/datastream/datastreampeer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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 * @@ -18,166 +18,83 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "datastreampeer.h" + +#include #include #include +#include -#include "datastreampeer.h" #include "quassel.h" -/* version.inc is no longer used for this */ -const uint protocolVersion = 10; -const uint coreNeedsProtocol = protocolVersion; -const uint clientNeedsProtocol = protocolVersion; +#include "serializers/serializers.h" using namespace Protocol; -DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent) - : RemotePeer(authHandler, socket, parent), - _blockSize(0), - _useCompression(false) +DataStreamPeer::DataStreamPeer( + ::AuthHandler* authHandler, QTcpSocket* socket, quint16 features, Compressor::CompressionLevel level, QObject* parent) + : RemotePeer(authHandler, socket, level, parent) { Q_UNUSED(features); - - _stream.setDevice(socket); - _stream.setVersion(QDataStream::Qt_4_2); } - -void DataStreamPeer::setSignalProxy(::SignalProxy *proxy) -{ - RemotePeer::setSignalProxy(proxy); - - // FIXME only in compat mode - if (proxy) { - // enable compression now if requested - the initial handshake is uncompressed in the legacy protocol! - _useCompression = socket()->property("UseCompression").toBool(); - if (_useCompression) - qDebug() << "Using compression for peer:" << qPrintable(socket()->peerAddress().toString()); - } - -} - - quint16 DataStreamPeer::supportedFeatures() { return 0; } - bool DataStreamPeer::acceptsFeatures(quint16 peerFeatures) { Q_UNUSED(peerFeatures); return true; } - quint16 DataStreamPeer::enabledFeatures() const { return 0; } - -void DataStreamPeer::onSocketDataAvailable() +void DataStreamPeer::processMessage(const QByteArray& msg) { - QVariant item; - while (readSocketData(item)) { - // if no sigproxy is set, we're in handshake mode and let the data be handled elsewhere - if (!signalProxy()) - handleHandshakeMessage(item); - else - handlePackedFunc(item); + QDataStream stream(msg); + stream.setVersion(QDataStream::Qt_4_2); + QVariantList list; + if (!Serializers::deserialize(stream, features(), list)) + close("Peer sent corrupt data, closing down!"); + if (stream.status() != QDataStream::Ok) { + close("Peer sent corrupt data, closing down!"); + return; } -} + // if no sigproxy is set, we're in handshake mode + if (!signalProxy()) + handleHandshakeMessage(list); + else + handlePackedFunc(list); +} -bool DataStreamPeer::readSocketData(QVariant &item) +void DataStreamPeer::writeMessage(const QVariantMap& handshakeMsg) { - if (_blockSize == 0) { - if (socket()->bytesAvailable() < 4) - return false; - _stream >> _blockSize; + QVariantList list; + QVariantMap::const_iterator it = handshakeMsg.begin(); + while (it != handshakeMsg.end()) { + list << it.key().toUtf8() << it.value(); + ++it; } - if (_blockSize > 1 << 22) { - close("Peer tried to send package larger than max package size!"); - return false; - } - - if (_blockSize == 0) { - close("Peer tried to send 0 byte package!"); - return false; - } - - if (socket()->bytesAvailable() < _blockSize) { - emit transferProgress(socket()->bytesAvailable(), _blockSize); - return false; - } - - emit transferProgress(_blockSize, _blockSize); - - _blockSize = 0; - - if (_useCompression) { - QByteArray rawItem; - _stream >> rawItem; - - int nbytes = rawItem.size(); - if (nbytes <= 4) { - const char *data = rawItem.constData(); - if (nbytes < 4 || (data[0] != 0 || data[1] != 0 || data[2] != 0 || data[3] != 0)) { - close("Peer sent corrupted compressed data!"); - return false; - } - } - - rawItem = qUncompress(rawItem); - - QDataStream itemStream(&rawItem, QIODevice::ReadOnly); - itemStream.setVersion(QDataStream::Qt_4_2); - itemStream >> item; - } - else { - _stream >> item; - } - - if (!item.isValid()) { - close("Peer sent corrupt data: unable to load QVariant!"); - return false; - } - - return true; + writeMessage(list); } - -void DataStreamPeer::writeSocketData(const QVariant &item) +void DataStreamPeer::writeMessage(const QVariantList& sigProxyMsg) { - if (!socket()->isOpen()) { - qWarning() << Q_FUNC_INFO << "Can't write to a closed socket!"; - return; - } + QByteArray data; + QDataStream msgStream(&data, QIODevice::WriteOnly); + msgStream.setVersion(QDataStream::Qt_4_2); + msgStream << sigProxyMsg; - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_4_2); - - if (_useCompression) { - QByteArray rawItem; - QDataStream itemStream(&rawItem, QIODevice::WriteOnly); - itemStream.setVersion(QDataStream::Qt_4_2); - itemStream << item; - - rawItem = qCompress(rawItem); - - out << rawItem; - } - else { - out << item; - } - - _stream << block; // also writes the length as part of the serialization format + writeMessage(data); } - /*** Handshake messages ***/ /* These messages are transmitted during handshake phase, which in case of the legacy protocol means they have @@ -185,9 +102,11 @@ void DataStreamPeer::writeSocketData(const QVariant &item) * Also, the legacy handshake does not fully match the redesigned one, so we'll have to do various mappings here. */ -void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) +void DataStreamPeer::handleHandshakeMessage(const QVariantList& mapData) { - QVariantMap m = msg.toMap(); + QVariantMap m; + for (int i = 0; i < mapData.count() / 2; ++i) + m[QString::fromUtf8(mapData[2 * i].toByteArray())] = mapData[2 * i + 1]; QString msgType = m["MsgType"].toString(); if (msgType.isEmpty()) { @@ -196,20 +115,12 @@ void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) } if (msgType == "ClientInit") { - // FIXME only in compat mode - uint ver = m["ProtocolVersion"].toUInt(); - if (ver < coreNeedsProtocol) { - emit protocolVersionMismatch((int)ver, (int)coreNeedsProtocol); - return; - } - -#ifndef QT_NO_COMPRESS - // FIXME only in compat mode - if (m["UseCompression"].toBool()) { - socket()->setProperty("UseCompression", true); - } -#endif - handle(RegisterClient(m["ClientVersion"].toString(), m["UseSsl"].toBool())); + handle(RegisterClient{ + Quassel::Features{m["FeatureList"].toStringList(), Quassel::LegacyFeatures(m["Features"].toUInt())}, + m["ClientVersion"].toString(), + m["ClientDate"].toString(), + false // UseSsl obsolete + }); } else if (msgType == "ClientInitReject") { @@ -217,23 +128,23 @@ void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) } else if (msgType == "ClientInitAck") { - // FIXME only in compat mode - uint ver = m["ProtocolVersion"].toUInt(); // actually an UInt - if (ver < clientNeedsProtocol) { - emit protocolVersionMismatch((int)ver, (int)clientNeedsProtocol); - return; - } -#ifndef QT_NO_COMPRESS - if (m["SupportsCompression"].toBool()) - socket()->setProperty("UseCompression", true); -#endif - - handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QDateTime())); + handle(ClientRegistered{ + Quassel::Features{m["FeatureList"].toStringList(), Quassel::LegacyFeatures(m["CoreFeatures"].toUInt())}, + m["Configured"].toBool(), + m["StorageBackends"].toList(), + m["Authenticators"].toList(), + false // SupportsSsl obsolete + }); } else if (msgType == "CoreSetupData") { QVariantMap map = m["SetupData"].toMap(); - handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap())); + handle(SetupData(map["AdminUser"].toString(), + map["AdminPasswd"].toString(), + map["Backend"].toString(), + map["ConnectionProperties"].toMap(), + map["Authenticator"].toString(), + map["AuthProperties"].toMap())); } else if (msgType == "CoreSetupReject") { @@ -266,64 +177,47 @@ void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) } } - -void DataStreamPeer::dispatch(const RegisterClient &msg) { +void DataStreamPeer::dispatch(const RegisterClient& msg) +{ QVariantMap m; m["MsgType"] = "ClientInit"; + m["Features"] = static_cast(msg.features.toLegacyFeatures()); + m["FeatureList"] = msg.features.toStringList(); m["ClientVersion"] = msg.clientVersion; - m["ClientDate"] = Quassel::buildInfo().buildDate; - - // FIXME only in compat mode - m["ProtocolVersion"] = protocolVersion; - m["UseSsl"] = msg.sslSupported; -#ifndef QT_NO_COMPRESS - m["UseCompression"] = true; -#else - m["UseCompression"] = false; -#endif - - writeSocketData(m); -} + m["ClientDate"] = msg.buildDate; + writeMessage(m); +} -void DataStreamPeer::dispatch(const ClientDenied &msg) { +void DataStreamPeer::dispatch(const ClientDenied& msg) +{ QVariantMap m; m["MsgType"] = "ClientInitReject"; m["Error"] = msg.errorString; - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const ClientRegistered &msg) { +void DataStreamPeer::dispatch(const ClientRegistered& msg) +{ QVariantMap m; m["MsgType"] = "ClientInitAck"; - m["CoreFeatures"] = msg.coreFeatures; - m["StorageBackends"] = msg.backendInfo; - - // FIXME only in compat mode - m["ProtocolVersion"] = protocolVersion; - m["SupportSsl"] = msg.sslSupported; - m["SupportsCompression"] = socket()->property("UseCompression").toBool(); // this property gets already set in the ClientInit handler - - // This is only used for old v10 clients (pre-0.5) - int uptime = msg.coreStartTime.secsTo(QDateTime::currentDateTime().toUTC()); - int updays = uptime / 86400; uptime %= 86400; - int uphours = uptime / 3600; uptime %= 3600; - int upmins = uptime / 60; - m["CoreInfo"] = tr("Quassel Core Version %1
" - "Built: %2
" - "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(msg.coreStartTime.toString(Qt::TextDate)); - + if (hasFeature(Quassel::Feature::ExtendedFeatures)) { + m["FeatureList"] = msg.features.toStringList(); + } + else { + m["CoreFeatures"] = static_cast(msg.features.toLegacyFeatures()); + } m["LoginEnabled"] = m["Configured"] = msg.coreConfigured; + m["StorageBackends"] = msg.backendInfo; + if (hasFeature(Quassel::Feature::Authenticators)) { + m["Authenticators"] = msg.authenticatorInfo; + } - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const SetupData &msg) +void DataStreamPeer::dispatch(const SetupData& msg) { QVariantMap map; map["AdminUser"] = msg.adminUser; @@ -331,67 +225,66 @@ void DataStreamPeer::dispatch(const SetupData &msg) map["Backend"] = msg.backend; map["ConnectionProperties"] = msg.setupData; + // Auth backend properties. + map["Authenticator"] = msg.authenticator; + map["AuthProperties"] = msg.authSetupData; + QVariantMap m; m["MsgType"] = "CoreSetupData"; m["SetupData"] = map; - writeSocketData(m); -} + writeMessage(m); +} -void DataStreamPeer::dispatch(const SetupFailed &msg) +void DataStreamPeer::dispatch(const SetupFailed& msg) { QVariantMap m; m["MsgType"] = "CoreSetupReject"; m["Error"] = msg.errorString; - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const SetupDone &msg) +void DataStreamPeer::dispatch(const SetupDone& msg) { Q_UNUSED(msg) QVariantMap m; m["MsgType"] = "CoreSetupAck"; - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const Login &msg) +void DataStreamPeer::dispatch(const Login& msg) { QVariantMap m; m["MsgType"] = "ClientLogin"; m["User"] = msg.user; m["Password"] = msg.password; - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const LoginFailed &msg) +void DataStreamPeer::dispatch(const LoginFailed& msg) { QVariantMap m; m["MsgType"] = "ClientLoginReject"; m["Error"] = msg.errorString; - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const LoginSuccess &msg) +void DataStreamPeer::dispatch(const LoginSuccess& msg) { Q_UNUSED(msg) QVariantMap m; m["MsgType"] = "ClientLoginAck"; - writeSocketData(m); + writeMessage(m); } - -void DataStreamPeer::dispatch(const SessionState &msg) +void DataStreamPeer::dispatch(const SessionState& msg) { QVariantMap m; m["MsgType"] = "SessionInit"; @@ -402,15 +295,14 @@ void DataStreamPeer::dispatch(const SessionState &msg) map["Identities"] = msg.identities; m["SessionState"] = map; - writeSocketData(m); + writeMessage(m); } - /*** Standard messages ***/ -void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) +void DataStreamPeer::handlePackedFunc(const QVariantList& packedFunc) { - QVariantList params(packedFunc.toList()); + QVariantList params(packedFunc); if (params.isEmpty()) { qWarning() << Q_FUNC_INFO << "Received incompatible data:" << packedFunc; @@ -418,115 +310,109 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) } // TODO: make sure that this is a valid request type - RequestType requestType = (RequestType)params.takeFirst().value(); + RequestType requestType = (RequestType)params.takeFirst().value(); switch (requestType) { - case Sync: { - if (params.count() < 3) { - qWarning() << Q_FUNC_INFO << "Received invalid sync call:" << params; - return; - } - QByteArray className = params.takeFirst().toByteArray(); - QString objectName = params.takeFirst().toString(); - QByteArray slotName = params.takeFirst().toByteArray(); - handle(Protocol::SyncMessage(className, objectName, slotName, params)); - break; + case Sync: { + if (params.count() < 3) { + qWarning() << Q_FUNC_INFO << "Received invalid sync call:" << params; + return; } - case RpcCall: { - if (params.empty()) { - qWarning() << Q_FUNC_INFO << "Received empty RPC call!"; - return; - } - QByteArray slotName = params.takeFirst().toByteArray(); - handle(Protocol::RpcCall(slotName, params)); - break; + QByteArray className = params.takeFirst().toByteArray(); + QString objectName = QString::fromUtf8(params.takeFirst().toByteArray()); + QByteArray slotName = params.takeFirst().toByteArray(); + handle(Protocol::SyncMessage(className, objectName, slotName, params)); + break; + } + case RpcCall: { + if (params.empty()) { + qWarning() << Q_FUNC_INFO << "Received empty RPC call!"; + return; } - case InitRequest: { - if (params.count() != 2) { - qWarning() << Q_FUNC_INFO << "Received invalid InitRequest:" << params; - return; - } - QByteArray className = params[0].toByteArray(); - QString objectName = params[1].toString(); - handle(Protocol::InitRequest(className, objectName)); - break; + QByteArray signalName = params.takeFirst().toByteArray(); + handle(Protocol::RpcCall(signalName, params)); + break; + } + case InitRequest: { + if (params.count() != 2) { + qWarning() << Q_FUNC_INFO << "Received invalid InitRequest:" << params; + return; } - case InitData: { - if (params.count() != 3) { - qWarning() << Q_FUNC_INFO << "Received invalid InitData:" << params; - return; - } - QByteArray className = params[0].toByteArray(); - QString objectName = params[1].toString(); - QVariantMap initData = params[2].toMap(); - handle(Protocol::InitData(className, objectName, initData)); - break; + QByteArray className = params[0].toByteArray(); + QString objectName = QString::fromUtf8(params[1].toByteArray()); + handle(Protocol::InitRequest(className, objectName)); + break; + } + case InitData: { + if (params.count() < 2) { + qWarning() << Q_FUNC_INFO << "Received invalid InitData:" << params; + return; } - case HeartBeat: { - if (params.count() != 1) { - qWarning() << Q_FUNC_INFO << "Received invalid HeartBeat:" << params; - return; - } - // The legacy protocol would only send a QTime, no QDateTime - // so we assume it's sent today, which works in exactly the same cases as it did in the old implementation - QDateTime dateTime = QDateTime::currentDateTime().toUTC(); - dateTime.setTime(params[0].toTime()); - handle(Protocol::HeartBeat(dateTime)); - break; + QByteArray className = params.takeFirst().toByteArray(); + QString objectName = QString::fromUtf8(params.takeFirst().toByteArray()); + QVariantMap initData; + for (int i = 0; i < params.count() / 2; ++i) + initData[QString::fromUtf8(params[2 * i].toByteArray())] = params[2 * i + 1]; + handle(Protocol::InitData(className, objectName, initData)); + break; + } + case HeartBeat: { + if (params.count() != 1) { + qWarning() << Q_FUNC_INFO << "Received invalid HeartBeat:" << params; + return; } - case HeartBeatReply: { - if (params.count() != 1) { - qWarning() << Q_FUNC_INFO << "Received invalid HeartBeat:" << params; - return; - } - // The legacy protocol would only send a QTime, no QDateTime - // so we assume it's sent today, which works in exactly the same cases as it did in the old implementation - QDateTime dateTime = QDateTime::currentDateTime().toUTC(); - dateTime.setTime(params[0].toTime()); - handle(Protocol::HeartBeatReply(dateTime)); - break; + // Note: QDateTime instead of QTime as in the legacy protocol! + handle(Protocol::HeartBeat(params[0].toDateTime())); + break; + } + case HeartBeatReply: { + if (params.count() != 1) { + qWarning() << Q_FUNC_INFO << "Received invalid HeartBeat:" << params; + return; } - + // Note: QDateTime instead of QTime as in the legacy protocol! + handle(Protocol::HeartBeatReply(params[0].toDateTime())); + break; + } } } - -void DataStreamPeer::dispatch(const Protocol::SyncMessage &msg) +void DataStreamPeer::dispatch(const Protocol::SyncMessage& msg) { - dispatchPackedFunc(QVariantList() << (qint16)Sync << msg.className << msg.objectName << msg.slotName << msg.params); + dispatchPackedFunc(QVariantList() << (qint16)Sync << msg.className << msg.objectName.toUtf8() << msg.slotName << msg.params); } - -void DataStreamPeer::dispatch(const Protocol::RpcCall &msg) +void DataStreamPeer::dispatch(const Protocol::RpcCall& msg) { - dispatchPackedFunc(QVariantList() << (qint16)RpcCall << msg.slotName << msg.params); + dispatchPackedFunc(QVariantList() << (qint16)RpcCall << msg.signalName << msg.params); } - -void DataStreamPeer::dispatch(const Protocol::InitRequest &msg) +void DataStreamPeer::dispatch(const Protocol::InitRequest& msg) { - dispatchPackedFunc(QVariantList() << (qint16)InitRequest << msg.className << msg.objectName); + dispatchPackedFunc(QVariantList() << (qint16)InitRequest << msg.className << msg.objectName.toUtf8()); } - -void DataStreamPeer::dispatch(const Protocol::InitData &msg) +void DataStreamPeer::dispatch(const Protocol::InitData& msg) { - dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName << msg.initData); + QVariantList initData; + QVariantMap::const_iterator it = msg.initData.begin(); + while (it != msg.initData.end()) { + initData << it.key().toUtf8() << it.value(); + ++it; + } + dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName.toUtf8() << initData); } - -void DataStreamPeer::dispatch(const Protocol::HeartBeat &msg) +void DataStreamPeer::dispatch(const Protocol::HeartBeat& msg) { - dispatchPackedFunc(QVariantList() << (qint16)HeartBeat << msg.timestamp.time()); + dispatchPackedFunc(QVariantList() << (qint16)HeartBeat << msg.timestamp); } - -void DataStreamPeer::dispatch(const Protocol::HeartBeatReply &msg) +void DataStreamPeer::dispatch(const Protocol::HeartBeatReply& msg) { - dispatchPackedFunc(QVariantList() << (qint16)HeartBeatReply << msg.timestamp.time()); + dispatchPackedFunc(QVariantList() << (qint16)HeartBeatReply << msg.timestamp); } - -void DataStreamPeer::dispatchPackedFunc(const QVariantList &packedFunc) +void DataStreamPeer::dispatchPackedFunc(const QVariantList& packedFunc) { - writeSocketData(QVariant(packedFunc)); + writeMessage(packedFunc); }