X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=c92c4f157f70a9a3a7d6c57c2273a101f5feb8a7;hp=407eac8ff0bac2ae67e4a5212ab70a1b9dd5af06;hb=52a7b4d0f289f075aa386445a47d876743bcb6d0;hpb=d3ea803d8977692f95bbe31fbaba3686fc2ce5a9 diff --git a/src/core/core.cpp b/src/core/core.cpp index 407eac8f..c92c4f15 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -30,6 +30,8 @@ #include "sqlitestorage.h" #include "network.h" +#include "util.h" + Core *Core::instanceptr = 0; QMutex Core::mutex; @@ -65,7 +67,7 @@ void Core::init() { CoreSettings cs; if(!(configured = initStorage(cs.storageSettings().toMap()))) { - qWarning("Core is currently not configured!"); + 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(); @@ -84,7 +86,7 @@ void Core::init() { } Core::~Core() { - foreach(QTcpSocket *socket, blocksizes.keys()) { + foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys(); socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients } qDeleteAll(sessions); @@ -98,14 +100,14 @@ void Core::saveState() { QVariantMap state; QVariantList activeSessions; foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue(user); - state["CoreBuild"] = Global::quasselBuild; + state["CoreStateVersion"] = 1; state["ActiveSessions"] = activeSessions; s.setCoreState(state); } void Core::restoreState() { if(!instance()->configured) { - qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); + // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); return; } if(instance()->sessions.count()) { @@ -113,11 +115,13 @@ void Core::restoreState() { return; } CoreSettings s; - uint build = s.coreState().toMap()["CoreBuild"].toUInt(); - if(build < 362) { + /* 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) { qDebug() << "Restoring previous core state..."; @@ -141,7 +145,7 @@ QString Core::setupCore(const QVariant &setupData_) { return tr("Could not setup storage!"); } CoreSettings s; - //s.setStorageSettings(msg); + s.setStorageSettings(setupData); qDebug() << qPrintable(tr("Creating admin user...")); mutex.lock(); storage->addUser(user, password); @@ -205,6 +209,16 @@ void Core::syncStorage() { } /*** Storage Access ***/ +void Core::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) { + QMutexLocker locker(&mutex); + instance()->storage->setUserSetting(userId, settingName, data); +} + +QVariant Core::getUserSetting(UserId userId, const QString &settingName, const QVariant &data) { + QMutexLocker locker(&mutex); + return instance()->storage->getUserSetting(userId, settingName, data); +} + bool Core::createNetwork(UserId user, NetworkInfo &info) { QMutexLocker locker(&mutex); NetworkId networkId = instance()->storage->createNetwork(user, info); @@ -235,9 +249,39 @@ NetworkId Core::networkId(UserId user, const QString &network) { return instance()->storage->getNetworkId(user, network); } -BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, const QString &buffer) { +QList Core::connectedNetworks(UserId user) { + QMutexLocker locker(&mutex); + return instance()->storage->connectedNetworks(user); +} + +void Core::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) { + QMutexLocker locker(&mutex); + return instance()->storage->setNetworkConnected(user, networkId, isConnected); +} + +QHash Core::persistentChannels(UserId user, const NetworkId &networkId) { + QMutexLocker locker(&mutex); + return instance()->storage->persistentChannels(user, networkId); +} + +void Core::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) { + QMutexLocker locker(&mutex); + return instance()->storage->setChannelPersistent(user, networkId, channel, isJoined); +} + +void Core::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) { + QMutexLocker locker(&mutex); + return instance()->storage->setPersistentChannelKey(user, networkId, channel, key); +} + +BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) { QMutexLocker locker(&mutex); - return instance()->storage->getBufferInfo(user, networkId, buffer); + return instance()->storage->getBufferInfo(user, networkId, type, buffer); +} + +BufferInfo Core::getBufferInfo(UserId user, const BufferId &bufferId) { + QMutexLocker locker(&mutex); + return instance()->storage->getBufferInfo(user, bufferId); } MsgId Core::storeMessage(const Message &message) { @@ -245,31 +289,56 @@ MsgId Core::storeMessage(const Message &message) { return instance()->storage->logMessage(message); } -QList Core::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) { +QList Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset); +} + +QList Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgs(user, buffer, since, offset); +} + +QList Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgRange(user, buffer, first, last); +} + +QList Core::requestBuffers(UserId user) { QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(buffer, lastmsgs, offset); + return instance()->storage->requestBuffers(user); } -QList Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) { +QList Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) { QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(buffer, since, offset); + return instance()->storage->requestBufferIdsForNetwork(user, networkId); } -QList Core::requestMsgRange(BufferInfo buffer, int first, int last) { +bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) { QMutexLocker locker(&mutex); - return instance()->storage->requestMsgRange(buffer, first, last); + return instance()->storage->removeBuffer(user, bufferId); } -QList Core::requestBuffers(UserId user, QDateTime since) { +BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) { QMutexLocker locker(&mutex); - return instance()->storage->requestBuffers(user, since); + return instance()->storage->renameBuffer(user, networkId, newName, oldName); +} + +void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) { + QMutexLocker locker(&mutex); + return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId); +} + +QHash Core::bufferLastSeenMsgIds(UserId user) { + QMutexLocker locker(&mutex); + return instance()->storage->bufferLastSeenMsgIds(user); } /*** Network Management ***/ bool Core::startListening(uint port) { if(!server.listen(QHostAddress::Any, port)) { - qWarning(qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); + qWarning("%s", qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); return false; } qDebug() << "Listening for GUI clients on port" << server.serverPort(); @@ -282,11 +351,12 @@ void Core::stopListening() { } void Core::incomingConnection() { - // TODO implement SSL while(server.hasPendingConnections()) { QTcpSocket *socket = server.nextPendingConnection(); connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); + connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); + QVariantMap clientInfo; blocksizes.insert(socket, (quint32)0); qDebug() << "Client connected from" << qPrintable(socket->peerAddress().toString()); @@ -305,6 +375,7 @@ void Core::clientHasData() { 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! } } @@ -318,31 +389,53 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { // OK, so we have at least an init message format we can understand if(msg["MsgType"] == "ClientInit") { QVariantMap reply; + + // Just version information -- check it! + if((msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732) + || (!msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol)) { + reply["MsgType"] = "ClientInitReject"; + reply["Error"] = tr("Your Quassel Client is too old!
" + "This core needs at least client/core protocol version %1.
" + "Please consider upgrading your client.").arg(Global::coreNeedsProtocol); + SignalProxy::writeDataToDevice(socket, reply); + qWarning() << qPrintable(tr("Client %1 too old, rejecting.").arg(socket->peerAddress().toString())); + socket->close(); return; + } + reply["CoreVersion"] = Global::quasselVersion; - reply["CoreDate"] = Global::quasselDate; - reply["CoreBuild"] = Global::quasselBuild; + reply["CoreDate"] = Global::quasselBuildDate; + reply["CoreBuild"] = 860; // FIXME legacy + reply["ProtocolVersion"] = Global::protocolVersion; // TODO: Make the core info configurable int uptime = startTime.secsTo(QDateTime::currentDateTime()); int updays = uptime / 86400; uptime %= 86400; int uphours = uptime / 3600; uptime %= 3600; int upmins = uptime / 60; - reply["CoreInfo"] = tr("Quassel Core Version %1 (Build >= %2)
" - "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild) + reply["CoreInfo"] = tr("Quassel Core Version %1
" + "Built: %2
" + "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate) .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate)); - reply["SupportSsl"] = false; +#ifndef QT_NO_OPENSSL + SslServer *sslServer = qobject_cast(&server); + QSslSocket *sslSocket = qobject_cast(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; - // Just version information -- check it! - if(msg["ClientBuild"].toUInt() < Global::clientBuildNeeded) { - reply["MsgType"] = "ClientInitReject"; - reply["Error"] = tr("Your Quassel Client is too old!
" - "This core needs at least client version %1 (Build >= %2).
" - "Please consider upgrading your client.").arg(Global::quasselVersion).arg(Global::quasselBuild); - SignalProxy::writeDataToDevice(socket, reply); - qWarning() << qPrintable(tr("Client %1 too old, rejecting.").arg(socket->peerAddress().toString())); - socket->close(); return; - } // check if we are configured, start wizard otherwise if(!configured) { reply["Configured"] = false; @@ -361,6 +454,23 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { clientInfo[socket] = msg; // store for future reference reply["MsgType"] = "ClientInitAck"; SignalProxy::writeDataToDevice(socket, reply); + +#ifndef QT_NO_OPENSSL + // after we told the client that we are ssl capable we switch to ssl mode + if(supportSsl && msg["UseSsl"].toBool()) { + qDebug() << "Starting TLS for Client:" << qPrintable(socket->peerAddress().toString()); + connect(sslSocket, SIGNAL(sslErrors(const QList &)), this, SLOT(sslErrors(const QList &))); + 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)) { @@ -394,7 +504,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { } reply["MsgType"] = "ClientLoginAck"; SignalProxy::writeDataToDevice(socket, reply); - qDebug() << qPrintable(tr("Client %1 initialized and authentificated successfully as \"%2\".").arg(socket->peerAddress().toString(), msg["User"].toString())); + qDebug() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt())); setupClientSession(socket, uid); } } @@ -445,3 +555,18 @@ SessionThread *Core::createSession(UserId uid, bool restore) { sess->start(); return sess; } + +#ifndef QT_NO_OPENSSL +void Core::sslErrors(const QList &errors) { + Q_UNUSED(errors); + QSslSocket *socket = qobject_cast(sender()); + if(socket) + socket->ignoreSslErrors(); +} +#endif + +void Core::socketError(QAbstractSocket::SocketError err) { + QAbstractSocket *socket = qobject_cast(sender()); + if(socket && err != QAbstractSocket::RemoteHostClosedError) + qDebug() << "Core::socketError()" << socket << err << socket->errorString(); +}