X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=0f007d35fa3a4278a6fbc0d20339b47c98c31bb9;hp=dfaa1b723b263bd6ef3a47896406442e1c6c5cb6;hb=1989f165c2b754a42d3f06dfb5c33afd6111d820;hpb=06a03c2c69ee934aaeec83512bae2fffee83a340 diff --git a/src/core/core.cpp b/src/core/core.cpp index dfaa1b72..0f007d35 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 * @@ -20,12 +20,18 @@ #include "core.h" #include "coresession.h" +#include "coresettings.h" +#include "signalproxy.h" #include "sqlitestorage.h" -#include "util.h" + +#include +#include + +#include Core *Core::instanceptr = 0; -Core * Core::instance() { +Core *Core::instance() { if(instanceptr) return instanceptr; instanceptr = new Core(); instanceptr->init(); @@ -33,32 +39,142 @@ Core * Core::instance() { } void Core::destroy() { - //instanceptr->deleteLater(); delete instanceptr; instanceptr = 0; } -Core::Core() { - +Core::Core() + : storage(0) +{ } void Core::init() { - if(!SqliteStorage::isAvailable()) { - qFatal("Sqlite is currently required! Please make sure your Qt library has sqlite support enabled."); + // TODO: Remove this again at some point + // Check if old core settings need to be migrated in order to make the switch to the + // new location less painful. + CoreSettings cs; + QVariant foo = cs.databaseSettings(); + + if(!foo.isValid()) { + // ok, no settings stored yet. check for old ones. +#ifdef Q_WS_MAC + QSettings os("quassel-irc.org", "Quassel IRC", this); +#else + QSettings os("Quassel IRC Development Team", "Quassel IRC"); +#endif + QVariant bar = os.value("Core/DatabaseSettings"); + if(bar.isValid()) { + // old settings available -- migrate! + qWarning() << "\n\nOld settings detected. Will migrate core settings to the new location...\nNOTE: GUI style settings won't be migrated!\n"; +#ifdef Q_WS_MAC + QSettings ncs("quassel-irc.org", "Quassel Core"); +#else + QSettings ncs("Quassel Project", "Quassel Core"); +#endif + ncs.setValue("Core/CoreState", os.value("Core/CoreState")); + ncs.setValue("Core/DatabaseSettings", os.value("Core/DatabaseSettings")); + os.beginGroup("SessionData"); + foreach(QString group, os.childGroups()) { + ncs.setValue(QString("CoreUser/%1/SessionData/Identities").arg(group), os.value(QString("%1/Identities").arg(group))); + ncs.setValue(QString("CoreUser/%1/SessionData/Networks").arg(group), os.value(QString("%1/Networks").arg(group))); + } + os.endGroup(); +#ifdef Q_WS_MAC + QSettings ngs("quassel-irc.org", "Quassel Client"); +#else + QSettings ngs("Quassel Project", "Quassel Client"); +#endif + os.beginGroup("Accounts"); + foreach(QString key, os.childKeys()) { + ngs.setValue(QString("Accounts/%1").arg(key), os.value(key)); + } + foreach(QString group, os.childGroups()) { + ngs.setValue(QString("Accounts/%1/AccountData").arg(group), os.value(QString("%1/AccountData").arg(group))); + } + os.endGroup(); + os.beginGroup("Geometry"); + foreach(QString key, os.childKeys()) { + ngs.setValue(QString("UI/%1").arg(key), os.value(key)); + } + os.endGroup(); + + ncs.sync(); + ngs.sync(); + qWarning() << "Migration successfully finished. You may now delete $HOME/.config/Quassel IRC Development Team/ (on Linux).\n\n"; + } + } + // END + + configured = false; + + if(!(configured = initStorage(cs.databaseSettings().toMap()))) { + qWarning("Core is currently not configured!"); } - //SqliteStorage::init(); - storage = new SqliteStorage(); + connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - startListening(); // FIXME make configurable + startListening(cs.port()); guiUser = 0; + +} + +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); + } else { + qWarning() << "Selected StorageBackend is not available:" << dbSettings["Type"].toString(); + return configured = false; + } + + if(setup && !storage->setup(dbSettings)) { + return configured = false; + } + + return configured = storage->init(dbSettings); +} + +bool Core::initStorage(QVariantMap dbSettings) { + return initStorage(dbSettings, false); } Core::~Core() { - //foreach(QTcpSocket *sock, validClients.keys()) { - // delete sock; - //} qDeleteAll(sessions); - delete storage; +} + +void Core::restoreState() { + Q_ASSERT(!instance()->sessions.count()); + CoreSettings s; + QList users = s.coreState().toList(); + if(users.count() > 0) { + qDebug() << "Restoring previous core state..."; + foreach(QVariant v, users) { + QVariantMap m = v.toMap(); + if(m.contains("UserId")) { + CoreSession *sess = createSession(m["UserId"].toUInt()); + sess->restoreState(m["State"]); + } + } + } +} + +void Core::saveState() { + CoreSettings s; + QList users; + foreach(CoreSession *sess, instance()->sessions.values()) { + QVariantMap m; + m["UserId"] = sess->userId(); + m["State"] = sess->state(); + users << m; + } + s.setCoreState(users); } CoreSession *Core::session(UserId uid) { @@ -78,11 +194,9 @@ CoreSession *Core::createSession(UserId uid) { 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; } - bool Core::startListening(uint port) { if(!server.listen(QHostAddress::Any, port)) { qWarning(QString(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())).toAscii()); @@ -99,11 +213,18 @@ 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())); + blockSizes.insert(socket, (quint32)0); + qDebug() << "Client connected from " << socket->peerAddress().toString(); + + if (!configured) { + server.close(); + qDebug() << "Closing server for basic setup."; + } + } } void Core::clientHasData() { @@ -111,36 +232,43 @@ void Core::clientHasData() { Q_ASSERT(socket && blockSizes.contains(socket)); quint32 bsize = blockSizes.value(socket); QVariant item; - if(readDataFromDevice(socket, bsize, item)) { - /* this is probably obsolete now */ - if(validClients.contains(socket)) { - Q_ASSERT(false); - //QList sigdata = item.toList(); - //sessions[validClients[socket]]->processSignal((ClientSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]); - } 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; + if(SignalProxy::readDataFromDevice(socket, bsize, item)) { + // 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 = 0; // FIXME blockSizes aufräum0rn! } - blockSizes[socket] = bsize; + blockSizes[socket] = bsize = 0; // FIXME blockSizes aufräum0rn! } +// FIXME: no longer called, since connection handling is now in SignalProxy +// No, it is called as long as core is not configured. (kaffeedoktor) void Core::clientDisconnected() { QTcpSocket *socket = dynamic_cast(sender()); blockSizes.remove(socket); - validClients.remove(socket); qDebug() << "Client disconnected."; + + // make server listen again if still not configured + if (!configured) { + startListening(); + } + // TODO remove unneeded sessions - if necessary/possible... } @@ -157,46 +285,72 @@ void Core::disconnectLocalClient() { instance()->guiUser = 0; } -void Core::processClientInit(QTcpSocket *socket, const QVariant &v) { - QVariantMap msg = v.toMap(); - if(msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) { - //qWarning() << "Client version mismatch."; - throw Exception("GUI client version mismatch"); - } - // Auth - UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); // throws exception if this failed - QVariant reply = initSession(uid); - validClients[socket] = uid; // still needed? FIXME - //QList sigdata; - //sigdata.append(CS_CORE_STATE); sigdata.append(reply); sigdata.append(QVariant()); sigdata.append(QVariant()); +void Core::processClientInit(QTcpSocket *socket, const QVariantMap &msg) { + // Auth + QVariantMap reply; + UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); // throws exception if this failed + reply["StartWizard"] = false; + reply["Reply"] = initSession(uid); disconnect(socket, 0, this, 0); sessions[uid]->addClient(socket); - writeDataToDevice(socket, reply); + qDebug() << "Client initialized successfully."; + SignalProxy::writeDataToDevice(socket, reply); +} + +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); + } } QVariant Core::initSession(UserId uid) { // Find or create session for validated user CoreSession *sess; - if(sessions.contains(uid)) sess = sessions[uid]; - else { + if(sessions.contains(uid)) + sess = sessions[uid]; + else sess = createSession(uid); - //validClients[socket] = uid; - } QVariantMap reply; reply["SessionState"] = sess->sessionState(); return reply; } -/* -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; } -*/