X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=b2e3ee431c10aa74d590ce5bf95571120ec3abe6;hp=46a0d6c0a23919bdce1f8e4bc1065e874a7adad4;hb=e049ffc61b5e260a49d73102a74c3821af827e77;hpb=fe654bfe2e86149b18de76111ddb38985d505dd3 diff --git a/src/core/core.cpp b/src/core/core.cpp index 46a0d6c0..b2e3ee43 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -18,13 +18,12 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include #include #include "core.h" #include "coresession.h" #include "coresettings.h" +#include "postgresqlstorage.h" #include "quassel.h" #include "signalproxy.h" #include "sqlitestorage.h" @@ -33,6 +32,30 @@ #include "util.h" +// migration related +#include +#ifdef Q_OS_WIN32 +# include +#else +# include +#endif /* Q_OS_WIN32 */ + +// ============================== +// Custom Events +// ============================== +const int Core::AddClientEventId = QEvent::registerEventType(); + +class AddClientEvent : public QEvent { +public: + AddClientEvent(QTcpSocket *socket, UserId uid) : QEvent(QEvent::Type(Core::AddClientEventId)), socket(socket), userId(uid) {} + QTcpSocket *socket; + UserId userId; +}; + + +// ============================== +// Core +// ============================== Core *Core::instanceptr = 0; Core *Core::instance() { @@ -47,43 +70,122 @@ void Core::destroy() { instanceptr = 0; } -Core::Core() : storage(0) { +Core::Core() + : _storage(0) +{ _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) - loadTranslation(QLocale::system()); + Quassel::loadTranslation(QLocale::system()); - // Register storage backends here! - registerStorageBackend(new SqliteStorage(this)); + // FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location + // Move settings, note this does not delete the old files +#ifdef Q_WS_MAC + QSettings newSettings("quassel-irc.org", "quasselcore"); +#else + +# ifdef Q_WS_WIN + QSettings::Format format = QSettings::IniFormat; +# else + QSettings::Format format = QSettings::NativeFormat; +# endif + QString newFilePath = Quassel::configDirPath() + "quasselcore" + + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); + QSettings newSettings(newFilePath, format); +#endif /* Q_WS_MAC */ + + if(newSettings.value("Config/Version").toUInt() == 0) { +# ifdef Q_WS_MAC + QString org = "quassel-irc.org"; +# else + QString org = "Quassel Project"; +# endif + QSettings oldSettings(org, "Quassel Core"); + if(oldSettings.allKeys().count()) { + qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your core settings..."; + foreach(QString key, oldSettings.allKeys()) + newSettings.setValue(key, oldSettings.value(key)); + newSettings.setValue("Config/Version", 1); + qWarning() << "* Your core settings have been migrated to" << newSettings.fileName(); + +#ifndef Q_WS_MAC /* we don't need to move the db and cert for mac */ +#ifdef Q_OS_WIN32 + QString quasselDir = qgetenv("APPDATA") + "/quassel/"; +#elif defined Q_WS_MAC + QString quasselDir = QDir::homePath() + "/Library/Application Support/Quassel/"; +#else + QString quasselDir = QDir::homePath() + "/.quassel/"; +#endif + + QFileInfo info(Quassel::configDirPath() + "quassel-storage.sqlite"); + if(!info.exists()) { + // move database, if we found it + QFile oldDb(quasselDir + "quassel-storage.sqlite"); + if(oldDb.exists()) { + bool success = oldDb.rename(Quassel::configDirPath() + "quassel-storage.sqlite"); + if(success) + qWarning() << "* Your database has been moved to" << Quassel::configDirPath() + "quassel-storage.sqlite"; + else + qWarning() << "!!! Moving your database has failed. Please move it manually into" << Quassel::configDirPath(); + } + } + // move certificate + QFileInfo certInfo(quasselDir + "quasselCert.pem"); + if(certInfo.exists()) { + QFile cert(quasselDir + "quasselCert.pem"); + bool success = cert.rename(Quassel::configDirPath() + "quasselCert.pem"); + if(success) + qWarning() << "* Your certificate has been moved to" << Quassel::configDirPath() + "quasselCert.pem"; + else + qWarning() << "!!! Moving your certificate has failed. Please move it manually into" << Quassel::configDirPath(); + } +#endif /* !Q_WS_MAC */ + qWarning() << "*** Migration completed.\n\n"; + } + } + // MIGRATION end - if(!_storageBackends.count()) { - qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); - qWarning() << 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) + // check settings version + // so far, we only have 1 + CoreSettings s; + if(s.version() != 1) { + qCritical() << "Invalid core settings version, terminating!"; + exit(EXIT_FAILURE); } + + registerStorageBackends(); + connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } void Core::init() { - configured = false; - CoreSettings cs; + _configured = initStorage(cs.storageSettings().toMap()); - if(!(configured = initStorage(cs.storageSettings().toMap()))) { - qWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; + if(Quassel::isOptionSet("select-backend")) { + selectBackend(Quassel::optionValue("select-backend")); + exit(0); + } - // try to migrate old settings - QVariantMap old = cs.oldDbSettings().toMap(); - 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!"; - cs.setStorageSettings(newSettings); - } + if(!_configured) { + if(!_storageBackends.count()) { + qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); + qWarning() << qPrintable(tr("Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n" + "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n" + "to work.")); + exit(1); // TODO make this less brutal (especially for mono client -> popup) } + qWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; + } + + if(Quassel::isOptionSet("add-user")) { + createUser(); + exit(0); + } + + if(Quassel::isOptionSet("change-userpass")) { + changeUserPass(Quassel::optionValue("change-userpass")); + exit(0); } connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); @@ -112,7 +214,7 @@ void Core::saveState() { } void Core::restoreState() { - if(!instance()->configured) { + if(!instance()->_configured) { // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); return; } @@ -160,18 +262,24 @@ QString Core::setupCore(QVariantMap setupData) { if(user.isEmpty() || password.isEmpty()) { return tr("Admin user or password not set."); } - if(!initStorage(setupData, true)) { + _configured = initStorage(setupData, true); + if(!_configured) { return tr("Could not setup storage!"); } CoreSettings s; s.setStorageSettings(setupData); quInfo() << qPrintable(tr("Creating admin user...")); - storage->addUser(user, password); + _storage->addUser(user, password); startListening(); // TODO check when we need this return QString(); } /*** Storage Handling ***/ +void Core::registerStorageBackends() { + // Register storage backends here! + registerStorageBackend(new SqliteStorage(this)); + registerStorageBackend(new PostgreSqlStorage(this)); +} bool Core::registerStorageBackend(Storage *backend) { if(backend->isAvailable()) { @@ -183,6 +291,13 @@ bool Core::registerStorageBackend(Storage *backend) { } } +void Core::unregisterStorageBackends() { + foreach(Storage *s, _storageBackends.values()) { + s->deleteLater(); + } + _storageBackends.clear(); +} + void Core::unregisterStorageBackend(Storage *backend) { _storageBackends.remove(backend->displayName()); backend->deleteLater(); @@ -190,43 +305,58 @@ void Core::unregisterStorageBackend(Storage *backend) { // old db settings: // "Type" => "sqlite" -bool Core::initStorage(QVariantMap dbSettings, bool setup) { - QString backend = dbSettings["Backend"].toString(); +bool Core::initStorage(const QString &backend, QVariantMap settings, bool setup) { + _storage = 0; + if(backend.isEmpty()) { - //qWarning() << "No storage backend selected!"; - return configured = false; + return false; } + Storage *storage = 0; if(_storageBackends.contains(backend)) { storage = _storageBackends[backend]; } else { qCritical() << "Selected storage backend is not available:" << backend; - return configured = false; - } - if(!storage->init(dbSettings)) { - if(!setup || !(storage->setup(dbSettings) && storage->init(dbSettings))) { - qCritical() << "Could not init storage!"; - storage = 0; - return configured = false; - } + return false; } - // delete all other backends - foreach(Storage *s, _storageBackends.values()) { - if(s != storage) s->deleteLater(); + + Storage::State storageState = storage->init(settings); + switch(storageState) { + case Storage::NeedsSetup: + if(!setup) + return false; // trigger setup process + if(storage->setup(settings)) + return initStorage(backend, settings, false); + // if setup wasn't successfull we mark the backend as unavailable + case Storage::NotAvailable: + qCritical() << "Selected storage backend is not available:" << backend; + storage->deleteLater(); + _storageBackends.remove(backend); + storage = 0; + return false; + case Storage::IsReady: + // delete all other backends + _storageBackends.remove(backend); + unregisterStorageBackends(); + connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); } - _storageBackends.clear(); + _storage = storage; + return true; +} - connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); - return configured = true; +bool Core::initStorage(QVariantMap dbSettings, bool setup) { + return initStorage(dbSettings["Backend"].toString(), dbSettings["ConnectionProperties"].toMap(), setup); } + void Core::syncStorage() { - if(storage) storage->sync(); + if(_storage) + _storage->sync(); } /*** Storage Access ***/ bool Core::createNetwork(UserId user, NetworkInfo &info) { - NetworkId networkId = instance()->storage->createNetwork(user, info); + NetworkId networkId = instance()->_storage->createNetwork(user, info); if(!networkId.isValid()) return false; @@ -339,7 +469,7 @@ void Core::incomingConnection() { blocksizes.insert(socket, (quint32)0); quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString()); - if(!configured) { + if(!_configured) { stopListening(tr("Closing server for basic setup.")); } } @@ -414,13 +544,15 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["LoginEnabled"] = true; // check if we are configured, start wizard otherwise - if(!configured) { + if(!_configured) { reply["Configured"] = false; QList backends; foreach(Storage *backend, _storageBackends.values()) { QVariantMap v; v["DisplayName"] = backend->displayName(); v["Description"] = backend->description(); + v["SetupKeys"] = backend->setupKeys(); + v["SetupDefaults"] = backend->setupDefaults(); backends.append(v); } reply["StorageBackends"] = backends; @@ -431,6 +563,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { clientInfo[socket] = msg; // store for future reference reply["MsgType"] = "ClientInitAck"; SignalProxy::writeDataToDevice(socket, reply); + socket->flush(); // ensure that the write cache is flushed before we switch to ssl #ifdef HAVE_SSL // after we told the client that we are ssl capable we switch to ssl mode @@ -470,7 +603,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { SignalProxy::writeDataToDevice(socket, reply); } else if(msg["MsgType"] == "ClientLogin") { QVariantMap reply; - UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); + UserId uid = _storage->validateUser(msg["User"].toString(), msg["Password"].toString()); 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."); @@ -522,7 +655,7 @@ void Core::clientDisconnected() { // make server listen again if still not configured - if (!configured) { + if (!_configured) { startListening(); } @@ -531,28 +664,63 @@ void Core::clientDisconnected() { } void Core::setupClientSession(QTcpSocket *socket, UserId uid) { - // Find or create session for validated user - SessionThread *sess; - if(sessions.contains(uid)) sess = sessions[uid]; - else sess = createSession(uid); - // Hand over socket, session then sends state itself + // From now on everything is handled by the client session disconnect(socket, 0, this, 0); + socket->flush(); blocksizes.remove(socket); clientInfo.remove(socket); - if(!sess) { - qWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString()); + + // Find or create session for validated user + SessionThread *session; + if(sessions.contains(uid)) { + session = sessions[uid]; + } else { + session = createSession(uid); + if(!session) { + qWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString()); + socket->close(); + return; + } + } + + // as we are currently handling an event triggered by incoming data on this socket + // it is unsafe to directly move the socket to the client thread. + QCoreApplication::postEvent(this, new AddClientEvent(socket, uid)); +} + +void Core::customEvent(QEvent *event) { + if(event->type() == AddClientEventId) { + AddClientEvent *addClientEvent = static_cast(event); + addClientHelper(addClientEvent->socket, addClientEvent->userId); + return; + } +} + +void Core::addClientHelper(QTcpSocket *socket, UserId uid) { + // Find or create session for validated user + if(!sessions.contains(uid)) { + qWarning() << qPrintable(tr("Could not find a session for client:")) << qPrintable(socket->peerAddress().toString()); socket->close(); + return; } - sess->addClient(socket); + + SessionThread *session = sessions[uid]; + session->addClient(socket); } void Core::setupInternalClientSession(SignalProxy *proxy) { - if(!configured) { + if(!_configured) { stopListening(); setupCoreForInternalUsage(); } - UserId uid = storage->internalUser(); + UserId uid; + if(_storage) { + uid = _storage->internalUser(); + } else { + qWarning() << "Core::setupInternalClientSession(): You're trying to run monolithic Quassel with an unusable Backend! Go fix it!"; + return; + } // Find or create session for validated user SessionThread *sess; @@ -588,3 +756,255 @@ void Core::socketError(QAbstractSocket::SocketError err) { if(socket && err != QAbstractSocket::RemoteHostClosedError) qWarning() << "Core::socketError()" << socket << err << socket->errorString(); } + +// migration / backend selection +bool Core::selectBackend(const QString &backend) { + // reregister all storage backends + registerStorageBackends(); + if(!_storageBackends.contains(backend)) { + qWarning() << qPrintable(QString("Core::selectBackend(): unsupported backend: %1").arg(backend)); + qWarning() << " supported backends are:" << qPrintable(QStringList(_storageBackends.keys()).join(", ")); + return false; + } + + Storage *storage = _storageBackends[backend]; + QVariantMap settings = promptForSettings(storage); + + Storage::State storageState = storage->init(settings); + switch(storageState) { + case Storage::IsReady: + saveBackendSettings(backend, settings); + qWarning() << "Switched backend to:" << qPrintable(backend); + qWarning() << "Backend already initialized. Skipping Migration"; + return true; + case Storage::NotAvailable: + qCritical() << "Backend is not available:" << qPrintable(backend); + return false; + case Storage::NeedsSetup: + if(!storage->setup(settings)) { + qWarning() << qPrintable(QString("Core::selectBackend(): unable to setup backend: %1").arg(backend)); + return false; + } + + if(storage->init(settings) != Storage::IsReady) { + qWarning() << qPrintable(QString("Core::migrateBackend(): unable to initialize backend: %1").arg(backend)); + return false; + } + + saveBackendSettings(backend, settings); + qWarning() << "Switched backend to:" << qPrintable(backend); + break; + } + + // let's see if we have a current storage object we can migrate from + AbstractSqlMigrationReader *reader = getMigrationReader(_storage); + AbstractSqlMigrationWriter *writer = getMigrationWriter(storage); + if(reader && writer) { + qDebug() << qPrintable(QString("Migrating Storage backend %1 to %2...").arg(_storage->displayName(), storage->displayName())); + delete _storage; + _storage = 0; + delete storage; + storage = 0; + if(reader->migrateTo(writer)) { + qDebug() << "Migration finished!"; + saveBackendSettings(backend, settings); + return true; + } + return false; + qWarning() << qPrintable(QString("Core::migrateDb(): unable to migrate storage backend! (No migration writer for %1)").arg(backend)); + } + + // inform the user why we cannot merge + if(!_storage) { + qWarning() << "No currently active backend. Skipping migration."; + } else if(!reader) { + qWarning() << "Currently active backend does not support migration:" << qPrintable(_storage->displayName()); + } + if(writer) { + qWarning() << "New backend does not support migration:" << qPrintable(backend); + } + + // so we were unable to merge, but let's create a user \o/ + _storage = storage; + createUser(); + return true; +} + +void Core::createUser() { + QTextStream out(stdout); + QTextStream in(stdin); + out << "Add a new user:" << endl; + out << "Username: "; + out.flush(); + QString username = in.readLine().trimmed(); + + disableStdInEcho(); + out << "Password: "; + out.flush(); + QString password = in.readLine().trimmed(); + out << endl; + out << "Repeat Password: "; + out.flush(); + QString password2 = in.readLine().trimmed(); + out << endl; + enableStdInEcho(); + + if(password != password2) { + qWarning() << "Passwords don't match!"; + return; + } + if(password.isEmpty()) { + qWarning() << "Password is empty!"; + return; + } + + if(_storage->addUser(username, password).isValid()) { + out << "Added user " << username << " successfully!" << endl; + } else { + qWarning() << "Unable to add user:" << qPrintable(username); + } +} + +void Core::changeUserPass(const QString &username) { + QTextStream out(stdout); + QTextStream in(stdin); + UserId userId = _storage->getUserId(username); + if(!userId.isValid()) { + out << "User " << username << " does not exist." << endl; + return; + } + + out << "Change password for user: " << username << endl; + + disableStdInEcho(); + out << "New Password: "; + out.flush(); + QString password = in.readLine().trimmed(); + out << endl; + out << "Repeat Password: "; + out.flush(); + QString password2 = in.readLine().trimmed(); + out << endl; + enableStdInEcho(); + + if(password != password2) { + qWarning() << "Passwords don't match!"; + return; + } + if(password.isEmpty()) { + qWarning() << "Password is empty!"; + return; + } + + if(_storage->updateUser(userId, password)) { + out << "Password changed successfuly!" << endl; + } else { + qWarning() << "Failed to change password!"; + } +} + +AbstractSqlMigrationReader *Core::getMigrationReader(Storage *storage) { + if(!storage) + return 0; + + AbstractSqlStorage *sqlStorage = qobject_cast(storage); + if(!sqlStorage) { + qDebug() << "Core::migrateDb(): only SQL based backends can be migrated!"; + return 0; + } + + return sqlStorage->createMigrationReader(); +} + +AbstractSqlMigrationWriter *Core::getMigrationWriter(Storage *storage) { + if(!storage) + return 0; + + AbstractSqlStorage *sqlStorage = qobject_cast(storage); + if(!sqlStorage) { + qDebug() << "Core::migrateDb(): only SQL based backends can be migrated!"; + return 0; + } + + return sqlStorage->createMigrationWriter(); +} + +void Core::saveBackendSettings(const QString &backend, const QVariantMap &settings) { + QVariantMap dbsettings; + dbsettings["Backend"] = backend; + dbsettings["ConnectionProperties"] = settings; + CoreSettings().setStorageSettings(dbsettings); +} + +QVariantMap Core::promptForSettings(const Storage *storage) { + QVariantMap settings; + + QStringList keys = storage->setupKeys(); + if(keys.isEmpty()) + return settings; + + QTextStream out(stdout); + QTextStream in(stdin); + out << "Default values are in brackets" << endl; + + QVariantMap defaults = storage->setupDefaults(); + QString value; + foreach(QString key, keys) { + QVariant val; + if(defaults.contains(key)) { + val = defaults[key]; + } + out << key; + if(!val.toString().isEmpty()) { + out << " (" << val.toString() << ")"; + } + out << ": "; + out.flush(); + + bool noEcho = QString("password").toLower().startsWith(key.toLower()); + if(noEcho) { + disableStdInEcho(); + } + value = in.readLine().trimmed(); + if(noEcho) { + out << endl; + enableStdInEcho(); + } + + if(!value.isEmpty()) { + switch(defaults[key].type()) { + case QVariant::Int: + val = QVariant(value.toInt()); + break; + default: + val = QVariant(value); + } + } + settings[key] = val; + } + return settings; +} + + +#ifdef Q_OS_WIN32 +void Core::stdInEcho(bool on) { + HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); + DWORD mode = 0; + GetConsoleMode(hStdin, &mode); + if(on) + mode |= ENABLE_ECHO_INPUT; + else + mode &= ~ENABLE_ECHO_INPUT; + SetConsoleMode(hStdin, mode); +} +#else +void Core::stdInEcho(bool on) { + termios t; + tcgetattr(STDIN_FILENO, &t); + if(on) + t.c_lflag |= ECHO; + else + t.c_lflag &= ~ECHO; + tcsetattr(STDIN_FILENO, TCSANOW, &t); +} +#endif /* Q_OS_WIN32 */