X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=2e3da6d9f4395cf2b9a9382d37d2d21b0ba938aa;hp=9385c64e2848609f928f61a2f5f3f313fbbde350;hb=9d4aff06284de98df1eed1179b958833221f5f85;hpb=44b22c4419f478a20f6324f9f3a700a2dec56302 diff --git a/src/core/core.cpp b/src/core/core.cpp index 9385c64e..2e3da6d9 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -18,14 +18,22 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include +#include +#include +#include + #include "core.h" #include "coresession.h" +#include "coresettings.h" +#include "signalproxy.h" #include "sqlitestorage.h" -#include "util.h" +#include "network.h" Core *Core::instanceptr = 0; +QMutex Core::mutex; -Core * Core::instance() { +Core *Core::instance() { if(instanceptr) return instanceptr; instanceptr = new Core(); instanceptr->init(); @@ -37,75 +45,144 @@ void Core::destroy() { instanceptr = 0; } -Core::Core() { +Core::Core() + : storage(0) +{ + startTime = QDateTime::currentDateTime(); // for uptime :) + connect(&_storageSyncTimer, SIGNAL(timeout()), + this, SLOT(syncStorage())); + _storageSyncTimer.start(10 * 60 * 1000); // in msecs } void Core::init() { - if(!SqliteStorage::isAvailable()) { - qFatal("Sqlite is currently required! Please make sure your Qt library has sqlite support enabled."); + configured = false; + + CoreSettings cs; + if(!(configured = initStorage(cs.databaseSettings().toMap()))) { + qWarning("Core is currently not configured!"); } - //SqliteStorage::init(); - storage = new SqliteStorage(); - connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateGlobalData(UserId, QString))); + connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - //startListening(); // FIXME + startListening(cs.port()); guiUser = 0; - /* - if(Global::runMode == Global::Monolithic) { // TODO Make GUI user configurable - try { - guiUser = storage->validateUser("Default", "password"); - } catch(Storage::AuthError) { - guiUser = storage->addUser("Default", "password"); - } - Q_ASSERT(guiUser); - Global::setGuiUser(guiUser); - createSession(guiUser); - } else guiUser = 0; - */ - // Read global settings from config file - QSettings s; - s.beginGroup("Global"); - foreach(QString unum, s.childGroups()) { - UserId uid = unum.toUInt(); - s.beginGroup(unum); - foreach(QString key, s.childKeys()) { - Global::updateData(uid, key, s.value(key)); - } - s.endGroup(); + +} + +bool Core::initStorage(QVariantMap dbSettings, bool setup) { + QString engine = dbSettings["Type"].toString().toLower(); + + if(storage) { + qDebug() << "Deleting old storage object."; + storage->deleteLater(); + storage = 0; + } + + // FIXME register new storageProviders here + if(engine == "sqlite" && SqliteStorage::isAvailable()) { + storage = new SqliteStorage(this); + connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); + } else { + qWarning() << "Selected StorageBackend is not available:" << dbSettings["Type"].toString(); + return configured = false; } - s.endGroup(); + + if(setup && !storage->setup(dbSettings)) { + return configured = false; + } + + return configured = storage->init(dbSettings); } Core::~Core() { - foreach(QTcpSocket *sock, validClients.keys()) { - delete sock; - } + // FIXME properly shutdown the sessions qDeleteAll(sessions); - delete storage; } -CoreSession *Core::session(UserId uid) { - Core *core = instance(); - if(core->sessions.contains(uid)) return core->sessions[uid]; - else return 0; +void Core::syncStorage() { + QMutexLocker locker(&mutex); + return instance()->storage->sync(); } -CoreSession *Core::localSession() { - Core *core = instance(); - if(core->guiUser && core->sessions.contains(core->guiUser)) return core->sessions[core->guiUser]; - else return 0; +void Core::restoreState() { + if(instance()->sessions.count()) { + qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + return; + } + CoreSettings s; + uint build = s.coreState().toMap()["CoreBuild"].toUInt(); + if(build < 362) { + 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..."; + foreach(QVariant v, activeSessions) { + UserId user = v.value(); + instance()->createSession(user, true); + } + qDebug() << "...done."; + } } -CoreSession *Core::createSession(UserId uid) { - Core *core = instance(); - Q_ASSERT(!core->sessions.contains(uid)); - CoreSession *sess = new CoreSession(uid, core->storage); - core->sessions[uid] = sess; - connect(sess, SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), core, SLOT(recvProxySignal(CoreSignal, QVariant, QVariant, QVariant))); - return sess; +void Core::saveState() { + CoreSettings s; + QVariantMap state; + QVariantList activeSessions; + foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue(user); + state["CoreBuild"] = Global::quasselBuild; + state["ActiveSessions"] = activeSessions; + s.setCoreState(state); +} + +/*** Storage Access ***/ +bool Core::createNetworkId(UserId user, NetworkInfo &info) { + QMutexLocker locker(&mutex); + NetworkId networkId = instance()->storage->createNetworkId(user, info); + if(!networkId.isValid()) + return false; + + info.networkId = networkId; + return true; +} + +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) { + QMutexLocker locker(&mutex); + return instance()->storage->getBufferInfo(user, networkId, buffer); +} + +MsgId Core::storeMessage(const Message &message) { + QMutexLocker locker(&mutex); + return instance()->storage->logMessage(message); } +QList Core::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgs(buffer, lastmsgs, offset); +} + +QList Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgs(buffer, since, offset); +} + +QList Core::requestMsgRange(BufferInfo buffer, int first, int last) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgRange(buffer, first, last); +} + +QList Core::requestBuffers(UserId user, QDateTime since) { + QMutexLocker locker(&mutex); + return instance()->storage->requestBuffers(user, since); +} + +/*** Network Management ***/ bool Core::startListening(uint port) { if(!server.listen(QHostAddress::Any, port)) { @@ -123,129 +200,198 @@ void Core::stopListening() { void Core::incomingConnection() { // TODO implement SSL - QTcpSocket *socket = server.nextPendingConnection(); - connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); - connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); - blockSizes.insert(socket, (quint32)0); - qDebug() << "Client connected from " << socket->peerAddress().toString(); + while (server.hasPendingConnections()) { + QTcpSocket *socket = server.nextPendingConnection(); + connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); + connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); + QVariantMap clientInfo; + blocksizes.insert(socket, (quint32)0); + qDebug() << "Client connected from" << qPrintable(socket->peerAddress().toString()); + + if (!configured) { + server.close(); + qDebug() << "Closing server for basic setup."; + } + } } void Core::clientHasData() { QTcpSocket *socket = dynamic_cast(sender()); - Q_ASSERT(socket && blockSizes.contains(socket)); - quint32 bsize = blockSizes.value(socket); + Q_ASSERT(socket && blocksizes.contains(socket)); QVariant item; - while(readDataFromDevice(socket, bsize, item)) { - if(validClients.contains(socket)) { - QList sigdata = item.toList(); - if((ClientSignal)sigdata[0].toInt() == GS_UPDATE_GLOBAL_DATA) { - processClientUpdate(socket, sigdata[1].toString(), sigdata[2]); - } else { - sessions[validClients[socket]]->processSignal((ClientSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]); + while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) { + QVariantMap msg = item.toMap(); + if(!msg.contains("MsgType")) { + // Client is way too old, does not even use the current init format + qWarning() << qPrintable(tr("Antique client trying to connect... refusing.")); + socket->close(); + return; + } + // OK, so we have at least an init message format we can understand + if(msg["MsgType"] == "ClientInit") { + QVariantMap reply; + reply["CoreVersion"] = Global::quasselVersion; + reply["CoreDate"] = Global::quasselDate; + reply["CoreBuild"] = Global::quasselBuild; + // 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) + .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate)); + + reply["SupportSsl"] = false; + reply["LoginEnabled"] = true; + // TODO: check if we are configured, start wizard otherwise + + // 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; } - } else { - // we need to auth the client - try { - processClientInit(socket, item); - } catch(Storage::AuthError) { - qWarning() << "Authentification error!"; // FIXME - socket->close(); - return; - } catch(Exception e) { - qWarning() << "Client init error:" << e.msg(); - socket->close(); - return; + clientInfo[socket] = msg; // store for future reference + reply["MsgType"] = "ClientInitAck"; + SignalProxy::writeDataToDevice(socket, reply); + } else if(msg["MsgType"] == "ClientLogin") { + QVariantMap reply; + if(!clientInfo.contains(socket)) { + 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())); + socket->close(); return; + } + mutex.lock(); + UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); + mutex.unlock(); + if(uid == 0) { + reply["MsgType"] = "ClientLoginReject"; + reply["Error"] = tr("Invalid username or password!
The username/password combination you supplied could not be found in the database."); + SignalProxy::writeDataToDevice(socket, reply); + continue; } + 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())); + setupClientSession(socket, uid); } - blockSizes[socket] = bsize = 0; + //socket->close(); return; + /* + // we need to auth the client + try { + QVariantMap msg = item.toMap(); + if (msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) { + throw Exception("GUI client version mismatch"); + } + if (configured) { + processClientInit(socket, msg); + } else { + processCoreSetup(socket, msg); + } + } catch(Storage::AuthError) { + qWarning() << "Authentification error!"; // FIXME: send auth error to client + socket->close(); + return; + } catch(Exception e) { + qWarning() << "Client init error:" << e.msg(); + socket->close(); + return; + } */ } - blockSizes[socket] = bsize; } +// Potentially called during the initialization phase (before handing the connection off to the session) void Core::clientDisconnected() { QTcpSocket *socket = dynamic_cast(sender()); - blockSizes.remove(socket); - validClients.remove(socket); - qDebug() << "Client disconnected."; - // TODO remove unneeded sessions - if necessary/possible... -} + blocksizes.remove(socket); + clientInfo.remove(socket); + qDebug() << qPrintable(tr("Client %1 disconnected.").arg(socket->peerAddress().toString())); + socket->deleteLater(); + socket = 0; -QVariant Core::connectLocalClient(QString user, QString passwd) { - UserId uid = instance()->storage->validateUser(user, passwd); - QVariant reply = instance()->initSession(uid); - instance()->guiUser = uid; - Global::setGuiUser(uid); - qDebug() << "Local client connected."; - return reply; -} + // make server listen again if still not configured FIXME + if (!configured) { + startListening(); + } -void Core::disconnectLocalClient() { - qDebug() << "Local client disconnected."; - instance()->guiUser = 0; - Global::setGuiUser(0); + // TODO remove unneeded sessions - if necessary/possible... + // Suggestion: kill sessions if they are not connected to any network and client. } -void Core::processClientInit(QTcpSocket *socket, const QVariant &v) { - VarMap msg = v.toMap(); - if(msg["GUIProtocol"].toUInt() != GUI_PROTOCOL) { - //qWarning() << "Client version mismatch."; - throw Exception("GUI client version mismatch"); +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); } - // Auth - UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); // throws exception if this failed - VarMap reply = initSession(uid).toMap(); - validClients[socket] = uid; - QList sigdata; - sigdata.append(CS_CORE_STATE); sigdata.append(QVariant(reply)); sigdata.append(QVariant()); sigdata.append(QVariant()); - writeDataToDevice(socket, QVariant(sigdata)); } -QVariant Core::initSession(UserId uid) { +void Core::setupClientSession(QTcpSocket *socket, UserId uid) { // Find or create session for validated user - CoreSession *sess; + SessionThread *sess; if(sessions.contains(uid)) sess = sessions[uid]; - else { - sess = createSession(uid); - //validClients[socket] = uid; - } - VarMap reply; - VarMap coreData; - QStringList dataKeys = Global::keys(uid); - foreach(QString key, dataKeys) { - coreData[key] = Global::data(uid, key); - } - reply["CoreData"] = coreData; - reply["SessionState"] = sess->sessionState(); - return reply; -} - -void Core::processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data) { - UserId uid = validClients[socket]; - Global::updateData(uid, key, data); - QList sigdata; - sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant()); - foreach(QTcpSocket *s, validClients.keys()) { - if(validClients[s] == uid && s != socket) writeDataToDevice(s, QVariant(sigdata)); + else sess = createSession(uid); + // Hand over socket, session then sends state itself + disconnect(socket, 0, this, 0); + if(!sess) { + qWarning() << qPrintable(tr("Could not initialize session for client %1!").arg(socket->peerAddress().toString())); + socket->close(); } + sess->addClient(socket); } -void Core::updateGlobalData(UserId uid, QString key) { - QVariant data = Global::data(uid, key); - QList sigdata; - sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant()); - foreach(QTcpSocket *socket, validClients.keys()) { - if(validClients[socket] == uid) writeDataToDevice(socket, QVariant(sigdata)); +SessionThread *Core::createSession(UserId uid, bool restore) { + if(sessions.contains(uid)) { + qWarning() << "Calling createSession() when a session for the user already exists!"; + return 0; } + SessionThread *sess = new SessionThread(uid, restore, this); + sessions[uid] = sess; + sess->start(); + return sess; } -void Core::recvProxySignal(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) { - CoreSession *sess = qobject_cast(sender()); - Q_ASSERT(sess); - UserId uid = sess->userId(); - QList sigdata; - sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3); - //qDebug() << "Sending signal: " << sigdata; - foreach(QTcpSocket *socket, validClients.keys()) { - if(validClients[socket] == uid) writeDataToDevice(socket, QVariant(sigdata)); +QStringList Core::availableStorageProviders() { + QStringList storageProviders; + if (SqliteStorage::isAvailable()) { + storageProviders.append(SqliteStorage::displayName()); } + // TODO: temporary + // storageProviders.append("MySQL"); + + return storageProviders; }