X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=2b4b6a3edf5bfd94df516da8253e0a45bc46b22e;hp=5dd9721030564d2eab55af658452dca3301d1fa6;hb=f9a73e3ad8142212028a39b26ced62456e575b7a;hpb=5e5714fb2abf8feaf9cc4a27a26e86f2f9c45b30 diff --git a/src/core/core.cpp b/src/core/core.cpp index 5dd97210..2b4b6a3e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -34,7 +34,35 @@ // migration related #include - +#ifdef Q_OS_WIN32 +# include +#else +# include +# include +#endif /* Q_OS_WIN32 */ + +// umask +#ifndef Q_OS_WIN32 +# include +# 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() { @@ -52,6 +80,9 @@ void Core::destroy() { Core::Core() : _storage(0) { +#ifndef Q_OS_WIN32 + umask(S_IRWXG | S_IRWXO); +#endif /* Q_OS_WIN32 */ _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) Quassel::loadTranslation(QLocale::system()); @@ -131,54 +162,48 @@ Core::Core() exit(EXIT_FAILURE); } - // Register storage backends here! - registerStorageBackend(new SqliteStorage(this)); - registerStorageBackend(new PostgreSqlStorage(this)); + registerStorageBackends(); connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } void Core::init() { - CoreSettings cs2; - QVariantMap connectionProperties = cs2.storageSettings().toMap()["ConnectionProperties"].toMap(); - qDebug() << connectionProperties; - SqliteMigrationReader *reader = new SqliteMigrationReader(); - qDebug() << "reader:" << reader->init(); - PostgreSqlMigrationWriter *writer = new PostgreSqlMigrationWriter(); - qDebug() << "writer:" << writer->init(connectionProperties); - qDebug() << qPrintable(QString("Migrating Storage backend %1 to %2...").arg(reader->displayName(), writer->displayName())); - if(reader->migrateTo(writer)) - qDebug() << "Migration finished!"; - return; - - - - - - - - - - - CoreSettings cs; _configured = initStorage(cs.storageSettings().toMap()); + if(Quassel::isOptionSet("select-backend")) { + selectBackend(Quassel::optionValue("select-backend")); + exit(0); + } + if(!_configured) { 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" + 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())); connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); if(!startListening()) exit(1); // TODO make this less brutal + + if(Quassel::isOptionSet("oidentd")) + _oidentdConfigGenerator = new OidentdConfigGenerator(this); } Core::~Core() { @@ -218,6 +243,7 @@ void Core::restoreState() { return; } */ + QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList(); if(activeSessions.count() > 0) { quInfo() << "Restoring previous core state..."; @@ -240,7 +266,7 @@ QString Core::setupCoreForInternalUsage() { } setupData["AdminUser"] = "AdminUser"; setupData["AdminPasswd"] = QString::number(pass); - setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName(); + setupData["Backend"] = QString("SQLite"); // mono client currently needs sqlite return setupCore(setupData); } @@ -250,8 +276,7 @@ QString Core::setupCore(QVariantMap setupData) { if(user.isEmpty() || password.isEmpty()) { return tr("Admin user or password not set."); } - _configured = initStorage(setupData, true); - if(!_configured) { + if(_configured || !(_configured = initStorage(setupData, true))) { return tr("Could not setup storage!"); } CoreSettings s; @@ -263,6 +288,11 @@ QString Core::setupCore(QVariantMap setupData) { } /*** 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()) { @@ -274,6 +304,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(); @@ -281,10 +318,9 @@ void Core::unregisterStorageBackend(Storage *backend) { // old db settings: // "Type" => "sqlite" -bool Core::initStorage(QVariantMap dbSettings, bool setup) { +bool Core::initStorage(const QString &backend, QVariantMap settings, bool setup) { _storage = 0; - QString backend = dbSettings["Backend"].toString(); if(backend.isEmpty()) { return false; } @@ -297,15 +333,13 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { return false; } - QVariantMap connectionProperties = dbSettings["ConnectionProperties"].toMap(); - - Storage::State storageState = storage->init(connectionProperties); + Storage::State storageState = storage->init(settings); switch(storageState) { case Storage::NeedsSetup: if(!setup) return false; // trigger setup process - if(storage->setup(connectionProperties)) - return initStorage(dbSettings, false); + 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; @@ -315,16 +349,19 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { return false; case Storage::IsReady: // delete all other backends - foreach(Storage *s, _storageBackends.values()) { - if(s != storage) s->deleteLater(); - } - _storageBackends.clear(); + _storageBackends.remove(backend); + unregisterStorageBackends(); connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); } _storage = storage; return true; } +bool Core::initStorage(QVariantMap dbSettings, bool setup) { + return initStorage(dbSettings["Backend"].toString(), dbSettings["ConnectionProperties"].toMap(), setup); +} + + void Core::syncStorage() { if(_storage) _storage->sync(); @@ -362,40 +399,39 @@ bool Core::startListening() { ); } else { switch(addr.protocol()) { - case QAbstractSocket::IPv4Protocol: - if(_server.listen(addr, port)) { + case QAbstractSocket::IPv6Protocol: + if(_v6server.listen(addr, port)) { quInfo() << qPrintable( - tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3") + tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3") .arg(addr.toString()) - .arg(_server.serverPort()) + .arg(_v6server.serverPort()) .arg(Quassel::buildInfo().protocolVersion) ); success = true; } else quWarning() << qPrintable( - tr("Could not open IPv4 interface %1:%2: %3") + tr("Could not open IPv6 interface %1:%2: %3") .arg(addr.toString()) .arg(port) - .arg(_server.errorString())); + .arg(_v6server.errorString())); break; - case QAbstractSocket::IPv6Protocol: - if(_v6server.listen(addr, port)) { + case QAbstractSocket::IPv4Protocol: + if(_server.listen(addr, port)) { quInfo() << qPrintable( - tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3") + tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3") .arg(addr.toString()) - .arg(_v6server.serverPort()) + .arg(_server.serverPort()) .arg(Quassel::buildInfo().protocolVersion) ); success = true; } else { - // if v4 succeeded on Any, the port will be already in use - don't display the error then - // FIXME: handle this more sanely, make sure we can listen to both v4 and v6 by default! - if(!success || _v6server.serverError() != QAbstractSocket::AddressInUseError) + // if v6 succeeded on Any, the port will be already in use - don't display the error then + if(!success || _server.serverError() != QAbstractSocket::AddressInUseError) quWarning() << qPrintable( - tr("Could not open IPv6 interface %1:%2: %3") + tr("Could not open IPv4 interface %1:%2: %3") .arg(addr.toString()) .arg(port) - .arg(_v6server.errorString())); + .arg(_server.errorString())); } break; default: @@ -485,10 +521,15 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { socket->close(); return; } + reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion; reply["CoreVersion"] = Quassel::buildInfo().fancyVersionString; reply["CoreDate"] = Quassel::buildInfo().buildDate; - reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion; - // TODO: Make the core info configurable + reply["CoreStartTime"] = startTime(); // v10 clients don't necessarily parse this, see below + + // FIXME: newer clients no longer use the hardcoded CoreInfo (for now), since it gets the + // time zone wrong. With the next protocol bump (10 -> 11), we should remove this + // or make it properly configurable. + int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC()); int updays = uptime / 86400; uptime %= 86400; int uphours = uptime / 3600; uptime %= 3600; @@ -499,6 +540,8 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { .arg(Quassel::buildInfo().buildDate) .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate)); + reply["CoreFeatures"] = (int)Quassel::features(); + #ifdef HAVE_SSL SslServer *sslServer = qobject_cast(&_server); QSslSocket *sslSocket = qobject_cast(socket); @@ -527,8 +570,8 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { QVariantMap v; v["DisplayName"] = backend->displayName(); v["Description"] = backend->description(); - v["ConnectionProperties"] = backend->setupKeys(); - qDebug() << backend->setupKeys(); + v["SetupKeys"] = backend->setupKeys(); + v["SetupDefaults"] = backend->setupDefaults(); backends.append(v); } reply["StorageBackends"] = backends; @@ -539,6 +582,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 @@ -639,19 +683,48 @@ 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) { @@ -660,7 +733,13 @@ void Core::setupInternalClientSession(SignalProxy *proxy) { 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; @@ -696,3 +775,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(_configured && _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(_configured && _storage->updateUser(userId, password)) { + out << "Password changed successfully!" << 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 */