X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=dd33cec542f80c163da4522f59f198afb19e231d;hp=32b34f53c08e48698b01865b574d10fc6d342457;hb=50680e8d8548a9b856faa7c5d3d5d4ae4a6be2bd;hpb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67 diff --git a/src/core/core.cpp b/src/core/core.cpp index 32b34f53..dd33cec5 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -29,6 +29,9 @@ #include "signalproxy.h" #include "sqlitestorage.h" #include "network.h" +#include "logger.h" + +#include "util.h" Core *Core::instanceptr = 0; QMutex Core::mutex; @@ -46,13 +49,16 @@ void Core::destroy() { } Core::Core() : storage(0) { - startTime = QDateTime::currentDateTime(); // for uptime :) + _startTime = QDateTime::currentDateTime(); // for uptime :) // Register storage backends here! registerStorageBackend(new SqliteStorage(this)); if(!_storageBackends.count()) { - qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); + quWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); + quWarning() << 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())); @@ -64,18 +70,16 @@ void Core::init() { CoreSettings cs; - // TODO migrate old db settings - if(!(configured = initStorage(cs.storageSettings().toMap()))) { - qWarning("Core is currently not configured!"); + quWarning() << "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() == "SQlite") { + 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!"); + quWarning() << "...but thankfully I found some old settings to migrate!"; cs.setStorageSettings(newSettings); } } @@ -87,7 +91,7 @@ void Core::init() { Core::~Core() { foreach(QTcpSocket *socket, blocksizes.keys()) { - socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients + socket->disconnectFromHost(); // disconnect non authed clients } qDeleteAll(sessions); qDeleteAll(_storageBackends); @@ -100,25 +104,31 @@ 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!")); + return; + } if(instance()->sessions.count()) { - qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + quWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); 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..."; + quInfo() << "Restoring previous core state..."; foreach(QVariant v, activeSessions) { UserId user = v.value(); instance()->createSession(user, true); @@ -139,8 +149,8 @@ QString Core::setupCore(const QVariant &setupData_) { return tr("Could not setup storage!"); } CoreSettings s; - //s.setStorageSettings(msg); - qDebug() << qPrintable(tr("Creating admin user...")); + s.setStorageSettings(setupData); + quInfo() << qPrintable(tr("Creating admin user...")); mutex.lock(); storage->addUser(user, password); mutex.unlock(); @@ -177,12 +187,12 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { if(_storageBackends.contains(backend)) { storage = _storageBackends[backend]; } else { - qWarning() << "Selected storage backend is not available:" << backend; + quError() << "Selected storage backend is not available:" << backend; return configured = false; } if(!storage->init(dbSettings)) { if(!setup || !(storage->setup(dbSettings) && storage->init(dbSettings))) { - qWarning() << "Could not init storage!"; + quError() << "Could not init storage!"; storage = 0; return configured = false; } @@ -203,9 +213,19 @@ void Core::syncStorage() { } /*** Storage Access ***/ -bool Core::createNetworkId(UserId user, NetworkInfo &info) { +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); - NetworkId networkId = instance()->storage->createNetworkId(user, info); + return instance()->storage->getUserSetting(userId, settingName, data); +} + +bool Core::createNetwork(UserId user, NetworkInfo &info) { + QMutexLocker locker(&mutex); + NetworkId networkId = instance()->storage->createNetwork(user, info); if(!networkId.isValid()) return false; @@ -213,14 +233,59 @@ bool Core::createNetworkId(UserId user, NetworkInfo &info) { return true; } +bool Core::updateNetwork(UserId user, const NetworkInfo &info) { + QMutexLocker locker(&mutex); + return instance()->storage->updateNetwork(user, info); +} + +bool Core::removeNetwork(UserId user, const NetworkId &networkId) { + QMutexLocker locker(&mutex); + return instance()->storage->removeNetwork(user, networkId); +} + +QList Core::networks(UserId user) { + QMutexLocker locker(&mutex); + return instance()->storage->networks(user); +} + NetworkId Core::networkId(UserId user, const QString &network) { QMutexLocker locker(&mutex); 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->getBufferInfo(user, networkId, buffer); + 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, 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) { @@ -228,55 +293,92 @@ 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->requestBuffers(user); +} + +QList Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) { + QMutexLocker locker(&mutex); + return instance()->storage->requestBufferIdsForNetwork(user, networkId); +} + +bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) { QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(buffer, lastmsgs, offset); + return instance()->storage->removeBuffer(user, bufferId); } -QList Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) { +BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) { QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(buffer, since, offset); + return instance()->storage->renameBuffer(user, networkId, newName, oldName); } -QList Core::requestMsgRange(BufferInfo buffer, int first, int last) { +void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) { QMutexLocker locker(&mutex); - return instance()->storage->requestMsgRange(buffer, first, last); + return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId); } -QList Core::requestBuffers(UserId user, QDateTime since) { +QHash Core::bufferLastSeenMsgIds(UserId user) { QMutexLocker locker(&mutex); - return instance()->storage->requestBuffers(user, since); + 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()))); - return false; + bool success = false; + + // let's see if ipv6 is available + success = server.listen(QHostAddress::AnyIPv6, port); + + if(!success && server.serverError() == QAbstractSocket::UnsupportedSocketOperationError) { + // fall back to v4 + success = server.listen(QHostAddress::Any, port); } - qDebug() << "Listening for GUI clients on port" << server.serverPort(); - return true; + + if(!success) { + quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())); + } else { + quInfo() << "Listening for GUI clients on port" << server.serverPort() << "using protocol version" << Global::protocolVersion; + } + + return success; } void Core::stopListening() { server.close(); - qDebug() << "No longer listening for GUI clients."; + quInfo() << "No longer listening for GUI clients."; } 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()); + quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString()); if (!configured) { server.close(); - qDebug() << "Closing server for basic setup."; + quDebug() << "Closing server for basic setup."; } } } @@ -288,44 +390,69 @@ 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! } } 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.")); + quWarning() << 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 = 0; + if(!msg.contains("ProtocolVersion") && msg["ClientBuild"].toUInt() >= 732) ver = 1; // FIXME legacy + if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt(); + if(ver < 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); + quWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting.")); + 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 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) - .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate)); + 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)); + +#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["SupportSsl"] = false; 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; @@ -344,6 +471,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()) { + quDebug() << qPrintable(tr("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); + quDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString()); + } +#endif + } else { // for the rest, we need an initialized connection if(!clientInfo.contains(socket)) { @@ -351,7 +495,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["MsgType"] = "ClientLoginReject"; reply["Error"] = tr("Client not initialized!
You need to send an init message before trying to login."); SignalProxy::writeDataToDevice(socket, reply); - qWarning() << qPrintable(tr("Client %1 did not send an init message before trying to login, rejecting.").arg(socket->peerAddress().toString())); + quWarning() << 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") { @@ -377,7 +521,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())); + 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); } } @@ -385,13 +529,37 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { // Potentially called during the initialization phase (before handing the connection off to the session) void Core::clientDisconnected() { - QTcpSocket *socket = dynamic_cast(sender()); // Note: This might be a QObject* already (if called by ~Core())! - Q_ASSERT(socket); - blocksizes.remove(socket); - clientInfo.remove(socket); - qDebug() << qPrintable(tr("Non-authed client disconnected.")); - socket->deleteLater(); - socket = 0; + QTcpSocket *socket = qobject_cast(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 + quDebug() << qPrintable(tr("Non-authed client disconnected. (socket allready destroyed)")); + + // DO NOT CALL ANY METHODS ON socket!! + socket = static_cast(sender()); + + QHash::iterator blockSizeIter = blocksizes.begin(); + while(blockSizeIter != blocksizes.end()) { + if(blockSizeIter.key() == socket) { + blocksizes.erase(blockSizeIter); + } + blockSizeIter++; + } + + QHash::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) { @@ -402,43 +570,6 @@ void Core::clientDisconnected() { // Suggestion: kill sessions if they are not connected to any network and client. } -/* -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::setupClientSession(QTcpSocket *socket, UserId uid) { // Find or create session for validated user SessionThread *sess; @@ -449,7 +580,7 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { blocksizes.remove(socket); clientInfo.remove(socket); if(!sess) { - qWarning() << qPrintable(tr("Could not initialize session for client %1!").arg(socket->peerAddress().toString())); + quWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString()); socket->close(); } sess->addClient(socket); @@ -457,7 +588,7 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { SessionThread *Core::createSession(UserId uid, bool restore) { if(sessions.contains(uid)) { - qWarning() << "Calling createSession() when a session for the user already exists!"; + quWarning() << "Calling createSession() when a session for the user already exists!"; return 0; } SessionThread *sess = new SessionThread(uid, restore, this); @@ -465,3 +596,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) + quWarning() << "Core::socketError()" << socket << err << socket->errorString(); +}