X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=35b46b613886dd93f76b8ccb0ae19f0fd382e416;hp=4edff846c0e19c8c104e60a3dc6d17d4ab9b2f0f;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=6a63070246d89aa2a2474e3a9a1035fa889ad77e diff --git a/src/core/core.cpp b/src/core/core.cpp index 4edff846..35b46b61 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -26,18 +26,18 @@ #include "coreauthhandler.h" #include "coresession.h" #include "coresettings.h" -#include "logger.h" #include "internalpeer.h" +#include "logmessage.h" #include "network.h" #include "postgresqlstorage.h" #include "quassel.h" #include "sqlauthenticator.h" #include "sqlitestorage.h" +#include "types.h" #include "util.h" -// Currently building with LDAP bindings is optional. #ifdef HAVE_LDAP -#include "ldapauthenticator.h" +# include "ldapauthenticator.h" #endif // migration related @@ -49,11 +49,6 @@ # include #endif /* Q_OS_WIN */ -#ifdef HAVE_UMASK -# include -# include -#endif /* HAVE_UMASK */ - // ============================== // Custom Events // ============================== @@ -71,119 +66,43 @@ public: // ============================== // Core // ============================== -Core *Core::instanceptr = 0; -Core *Core::instance() +Core::Core() + : Singleton{this} { - if (instanceptr) return instanceptr; - instanceptr = new Core(); - instanceptr->init(); - return instanceptr; + Q_INIT_RESOURCE(sql); + + // Parent all QObject-derived attributes, so when the Core instance gets moved into another + // thread, they get moved with it + _server.setParent(this); + _v6server.setParent(this); + _storageSyncTimer.setParent(this); } -void Core::destroy() +Core::~Core() { - delete instanceptr; - instanceptr = 0; + qDeleteAll(_connectingClients); + qDeleteAll(_sessions); + syncStorage(); } -Core::Core() +void Core::init() { -#ifdef HAVE_UMASK - umask(S_IRWXG | S_IRWXO); -#endif _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) - Quassel::loadTranslation(QLocale::system()); - - // 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_OS_MAC - QSettings newSettings("quassel-irc.org", "quasselcore"); -#else - -# ifdef Q_OS_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_OS_MAC */ - - if (newSettings.value("Config/Version").toUInt() == 0) { -# ifdef Q_OS_MAC - QString org = "quassel-irc.org"; -# else - QString org = "Quassel Project"; -# endif - QSettings oldSettings(org, "Quassel Core"); - if (oldSettings.allKeys().count()) { - quWarning() << "\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); - quWarning() << "* Your core settings have been migrated to" << newSettings.fileName(); - -#ifndef Q_OS_MAC /* we don't need to move the db and cert for mac */ -#ifdef Q_OS_WIN - QString quasselDir = qgetenv("APPDATA") + "/quassel/"; -#elif defined Q_OS_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) - quWarning() << "* Your database has been moved to" << Quassel::configDirPath() + "quassel-storage.sqlite"; - else - quWarning() << "!!! 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) - quWarning() << "* Your certificate has been moved to" << Quassel::configDirPath() + "quasselCert.pem"; - else - quWarning() << "!!! Moving your certificate has failed. Please move it manually into" << Quassel::configDirPath(); - } -#endif /* !Q_OS_MAC */ - quWarning() << "*** Migration completed.\n\n"; - } - } - // MIGRATION end - // check settings version // so far, we only have 1 CoreSettings s; if (s.version() != 1) { - qCritical() << "Invalid core settings version, terminating!"; - exit(EXIT_FAILURE); + throw ExitException{EXIT_FAILURE, tr("Invalid core settings version!")}; } // Set up storage and authentication backends registerStorageBackends(); registerAuthenticators(); - connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); - _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes -} - - -void Core::init() -{ QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); bool config_from_environment = Quassel::isOptionSet("config-from-environment"); @@ -198,7 +117,8 @@ void Core::init() if (config_from_environment) { db_backend = environment.value("DB_BACKEND"); auth_authenticator = environment.value("AUTH_AUTHENTICATOR"); - } else { + } + else { CoreSettings cs; QVariantMap dbsettings = cs.storageSettings().toMap(); @@ -212,81 +132,160 @@ void Core::init() writeError = !cs.isWritable(); } - // legacy - _configured = initStorage(db_backend, db_connectionProperties, environment, config_from_environment); - - // Not entirely sure what is 'legacy' about the above, but it seems to be the way things work! - if (_configured) { - initAuthenticator(auth_authenticator, auth_properties, environment, config_from_environment); + try { + _configured = initStorage(db_backend, db_connectionProperties, environment, config_from_environment); + if (_configured) { + _configured = initAuthenticator(auth_authenticator, auth_properties, environment, config_from_environment); + } + } + catch (ExitException) { + // Try again later + _configured = false; } if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) { + bool success{true}; if (Quassel::isOptionSet("select-backend")) { - selectBackend(Quassel::optionValue("select-backend")); + success &= selectBackend(Quassel::optionValue("select-backend")); } if (Quassel::isOptionSet("select-authenticator")) { - selectAuthenticator(Quassel::optionValue("select-authenticator")); + success &= selectAuthenticator(Quassel::optionValue("select-authenticator")); } - exit(EXIT_SUCCESS); + throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE}; } if (!_configured) { if (config_from_environment) { - _configured = initStorage(db_backend, db_connectionProperties, environment, config_from_environment, true); - initAuthenticator(auth_authenticator, auth_properties, environment, config_from_environment, true); + try { + _configured = initStorage(db_backend, db_connectionProperties, environment, config_from_environment, true); + if (_configured) { + _configured = initAuthenticator(auth_authenticator, auth_properties, environment, config_from_environment, true); + } + } + catch (ExitException e) { + throw ExitException{EXIT_FAILURE, tr("Cannot configure from environment: %1").arg(e.errorString)}; + } if (!_configured) { - qWarning() << "Cannot configure from environment"; - exit(EXIT_FAILURE); + throw ExitException{EXIT_FAILURE, tr("Cannot configure from environment!")}; } - } else { + } + else { if (_registeredStorageBackends.empty()) { - quWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); - quWarning() - << 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(EXIT_FAILURE); // TODO make this less brutal (especially for mono client -> popup) + throw ExitException{EXIT_FAILURE, + tr("Could not initialize any storage backend! Exiting...\n" + "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.")}; } - quWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; if (writeError) { - qWarning() << "Cannot write quasselcore configuration; probably a permission problem."; - exit(EXIT_FAILURE); + throw ExitException{EXIT_FAILURE, tr("Cannot write quasselcore configuration; probably a permission problem.")}; } + + quInfo() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; } } + else { + if (Quassel::isOptionSet("add-user")) { + bool success = createUser(); + throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE}; + } - if (Quassel::isOptionSet("add-user")) { - exit(createUser() ? EXIT_SUCCESS : EXIT_FAILURE); + if (Quassel::isOptionSet("change-userpass")) { + bool success = changeUserPass(Quassel::optionValue("change-userpass")); + throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE}; + } + + _strictIdentEnabled = Quassel::isOptionSet("strict-ident"); + if (_strictIdentEnabled) { + cacheSysIdent(); + } + + if (Quassel::isOptionSet("oidentd")) { + _oidentdConfigGenerator = new OidentdConfigGenerator(this); + } - } - if (Quassel::isOptionSet("change-userpass")) { - exit(changeUserPass(Quassel::optionValue("change-userpass")) ? - EXIT_SUCCESS : EXIT_FAILURE); + if (Quassel::isOptionSet("ident-daemon")) { + _identServer = new IdentServer(this); + } + + Quassel::registerReloadHandler([]() { + // Currently, only reloading SSL certificates and the sysident cache is supported + if (Core::instance()) { + Core::instance()->cacheSysIdent(); + Core::instance()->reloadCerts(); + return true; + } + return false; + }); + + connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); + _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } 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(Quassel::isOptionSet("oidentd-strict"), this); - if (Quassel::isOptionSet("oidentd-strict")) { - cacheSysIdent(); - } + if (!startListening()) { + throw ExitException{EXIT_FAILURE, tr("Cannot open port for listening!")}; + } + + if (_configured && !Quassel::isOptionSet("norestore")) { + Core::restoreState(); + } + + _initialized = true; + + if (_pendingInternalConnection) { + connectInternalPeer(_pendingInternalConnection); + _pendingInternalConnection = {}; } } -Core::~Core() +void Core::initAsync() { - // FIXME do we need more cleanup for handlers? - foreach(CoreAuthHandler *handler, _connectingClients) { - handler->deleteLater(); // disconnect non authed clients + try { + init(); + } + catch (ExitException e) { + emit exitRequested(e.exitCode, e.errorString); + } +} + + +void Core::shutdown() +{ + quInfo() << "Core shutting down..."; + + saveState(); + + for (auto &&client : _connectingClients) { + client->deleteLater(); + } + _connectingClients.clear(); + + if (_sessions.isEmpty()) { + emit shutdownComplete(); + return; + } + + for (auto &&session : _sessions) { + connect(session, SIGNAL(shutdownComplete(SessionThread*)), this, SLOT(onSessionShutdown(SessionThread*))); + session->shutdown(); + } +} + + +void Core::onSessionShutdown(SessionThread *session) +{ + _sessions.take(_sessions.key(session))->deleteLater(); + if (_sessions.isEmpty()) { + quInfo() << "Core shutdown complete!"; + emit shutdownComplete(); } - qDeleteAll(_sessions); } @@ -294,23 +293,26 @@ Core::~Core() void Core::saveState() { - QVariantList activeSessions; - foreach(UserId user, instance()->_sessions.keys()) - activeSessions << QVariant::fromValue(user); - instance()->_storage->setCoreState(activeSessions); + if (_storage) { + QVariantList activeSessions; + for (auto &&user : instance()->_sessions.keys()) + activeSessions << QVariant::fromValue(user); + _storage->setCoreState(activeSessions); + } } void Core::restoreState() { - if (!instance()->_configured) { - // quWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); + if (!_configured) { + quWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); return; } - if (instance()->_sessions.count()) { + if (_sessions.count()) { quWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); return; } + CoreSettings s; /* We don't check, since we are at the first version since switching to Git uint statever = s.coreState().toMap()["CoreStateVersion"].toUInt(); @@ -325,9 +327,9 @@ void Core::restoreState() if (activeSessions.count() > 0) { quInfo() << "Restoring previous core state..."; - foreach(QVariant v, activeSessions) { + for(auto &&v : activeSessions) { UserId user = v.value(); - instance()->sessionForUser(user, true); + sessionForUser(user, true); } } } @@ -349,14 +351,21 @@ QString Core::setupCore(const QString &adminUser, const QString &adminPassword, if (adminUser.isEmpty() || adminPassword.isEmpty()) { return tr("Admin user or password not set."); } - if (!(_configured = initStorage(backend, setupData, {}, false, true))) { - return tr("Could not setup storage!"); - } + try { + if (!(_configured = initStorage(backend, setupData, {}, false, true))) { + return tr("Could not setup storage!"); + } - quInfo() << "Selected authenticator:" << authenticator; - if (!(_configured = initAuthenticator(authenticator, authSetupData, {}, false, true))) - { - return tr("Could not setup authenticator!"); + quInfo() << "Selected authenticator:" << authenticator; + if (!(_configured = initAuthenticator(authenticator, authSetupData, {}, false, true))) + { + return tr("Could not setup authenticator!"); + } + } + catch (ExitException e) { + // Event loop is running, so trigger an exit rather than throwing an exception + QCoreApplication::exit(e.exitCode); + return e.errorString.isEmpty() ? tr("Fatal failure while trying to setup, terminating") : e.errorString; } if (!saveBackendSettings(backend, setupData)) { @@ -419,8 +428,7 @@ DeferredSharedPtr Core::storageBackend(const QString &backendId) const return it != _registeredStorageBackends.end() ? *it : nullptr; } -// old db settings: -// "Type" => "sqlite" + bool Core::initStorage(const QString &backend, const QVariantMap &settings, const QProcessEnvironment &environment, bool loadFromEnvironment, bool setup) { @@ -435,6 +443,8 @@ bool Core::initStorage(const QString &backend, const QVariantMap &settings, return false; } + connect(storage.get(), SIGNAL(dbUpgradeInProgress(bool)), this, SIGNAL(dbUpgradeInProgress(bool))); + Storage::State storageState = storage->init(settings, environment, loadFromEnvironment); switch (storageState) { case Storage::NeedsSetup: @@ -444,11 +454,12 @@ bool Core::initStorage(const QString &backend, const QVariantMap &settings, return initStorage(backend, settings, environment, loadFromEnvironment, false); return false; - // if initialization wasn't successful, we quit to keep from coming up unconfigured case Storage::NotAvailable: - qCritical() << "FATAL: Selected storage backend is not available:" << backend; - if (!setup) - exit(EXIT_FAILURE); + if (!setup) { + // If initialization wasn't successful, we quit to keep from coming up unconfigured + throw ExitException{EXIT_FAILURE, tr("Selected storage backend %1 is not available.").arg(backend)}; + } + qCritical() << "Selected storage backend is not available:" << backend; return false; case Storage::IsReady: @@ -543,11 +554,12 @@ bool Core::initAuthenticator(const QString &backend, const QVariantMap &settings return initAuthenticator(backend, settings, environment, loadFromEnvironment, false); return false; - // if initialization wasn't successful, we quit to keep from coming up unconfigured case Authenticator::NotAvailable: - qCritical() << "FATAL: Selected auth backend is not available:" << backend; - if (!setup) - exit(EXIT_FAILURE); + if (!setup) { + // If initialization wasn't successful, we quit to keep from coming up unconfigured + throw ExitException{EXIT_FAILURE, tr("Selected auth backend %1 is not available.").arg(backend)}; + } + qCritical() << "Selected auth backend is not available:" << backend; return false; case Authenticator::IsReady: @@ -565,7 +577,7 @@ bool Core::initAuthenticator(const QString &backend, const QVariantMap &settings bool Core::sslSupported() { #ifdef HAVE_SSL - SslServer *sslServer = qobject_cast(&instance()->_server); + auto *sslServer = qobject_cast(&instance()->_server); return sslServer && sslServer->isCertValid(); #else return false; @@ -576,10 +588,10 @@ bool Core::sslSupported() bool Core::reloadCerts() { #ifdef HAVE_SSL - SslServer *sslServerv4 = qobject_cast(&instance()->_server); + auto *sslServerv4 = qobject_cast(&_server); bool retv4 = sslServerv4->reloadCerts(); - SslServer *sslServerv6 = qobject_cast(&instance()->_v6server); + auto *sslServerv6 = qobject_cast(&_v6server); bool retv6 = sslServerv6->reloadCerts(); return retv4 && retv6; @@ -593,7 +605,7 @@ bool Core::reloadCerts() void Core::cacheSysIdent() { if (isConfigured()) { - instance()->_authUserNames = instance()->_storage->getAllAuthUserNames(); + _authUserNames = _storage->getAllAuthUserNames(); } } @@ -606,7 +618,7 @@ QString Core::strictSysIdent(UserId user) const // A new user got added since we last pulled our cache from the database. // There's no way to avoid a database hit - we don't even know the authname! - cacheSysIdent(); + instance()->cacheSysIdent(); if (_authUserNames.contains(user)) { return _authUserNames[user]; @@ -690,12 +702,20 @@ bool Core::startListening() if (!success) quError() << qPrintable(tr("Could not open any network interfaces to listen on!")); + if (_identServer) { + _identServer->startListening(); + } + return success; } void Core::stopListening(const QString &reason) { + if (_identServer) { + _identServer->stopListening(reason); + } + bool wasListening = false; if (_server.isListening()) { wasListening = true; @@ -716,12 +736,12 @@ void Core::stopListening(const QString &reason) void Core::incomingConnection() { - QTcpServer *server = qobject_cast(sender()); + auto *server = qobject_cast(sender()); Q_ASSERT(server); while (server->hasPendingConnections()) { QTcpSocket *socket = server->nextPendingConnection(); - CoreAuthHandler *handler = new CoreAuthHandler(socket, this); + auto *handler = new CoreAuthHandler(socket, this); _connectingClients.insert(handler); connect(handler, SIGNAL(disconnected()), SLOT(clientDisconnected())); @@ -740,7 +760,7 @@ void Core::incomingConnection() // Potentially called during the initialization phase (before handing the connection off to the session) void Core::clientDisconnected() { - CoreAuthHandler *handler = qobject_cast(sender()); + auto *handler = qobject_cast(sender()); Q_ASSERT(handler); quInfo() << qPrintable(tr("Non-authed client disconnected:")) << qPrintable(handler->socket()->peerAddress().toString()); @@ -759,11 +779,11 @@ void Core::clientDisconnected() void Core::setupClientSession(RemotePeer *peer, UserId uid) { - CoreAuthHandler *handler = qobject_cast(sender()); + auto *handler = qobject_cast(sender()); Q_ASSERT(handler); // From now on everything is handled by the client session - disconnect(handler, 0, this, 0); + disconnect(handler, nullptr, this, nullptr); _connectingClients.remove(handler); handler->deleteLater(); @@ -779,7 +799,7 @@ void Core::setupClientSession(RemotePeer *peer, UserId uid) void Core::customEvent(QEvent *event) { if (event->type() == AddClientEventId) { - AddClientEvent *addClientEvent = static_cast(event); + auto *addClientEvent = static_cast(event); addClientHelper(addClientEvent->peer, addClientEvent->userId); return; } @@ -794,11 +814,26 @@ void Core::addClientHelper(RemotePeer *peer, UserId uid) } -void Core::setupInternalClientSession(InternalPeer *clientPeer) +void Core::connectInternalPeer(QPointer peer) +{ + if (_initialized && peer) { + setupInternalClientSession(peer); + } + else { + _pendingInternalConnection = peer; + } +} + + +void Core::setupInternalClientSession(QPointer clientPeer) { if (!_configured) { stopListening(); - setupCoreForInternalUsage(); + auto errorString = setupCoreForInternalUsage(); + if (!errorString.isEmpty()) { + emit exitRequested(EXIT_FAILURE, errorString); + return; + } } UserId uid; @@ -807,10 +842,16 @@ void Core::setupInternalClientSession(InternalPeer *clientPeer) } else { quWarning() << "Core::setupInternalClientSession(): You're trying to run monolithic Quassel with an unusable Backend! Go fix it!"; + emit exitRequested(EXIT_FAILURE, tr("Cannot setup storage backend.")); + return; + } + + if (!clientPeer) { + quWarning() << "Client peer went away, not starting a session"; return; } - InternalPeer *corePeer = new InternalPeer(this); + auto *corePeer = new InternalPeer(this); corePeer->setPeer(clientPeer); clientPeer->setPeer(corePeer); @@ -825,10 +866,7 @@ SessionThread *Core::sessionForUser(UserId uid, bool restore) if (_sessions.contains(uid)) return _sessions[uid]; - SessionThread *session = new SessionThread(uid, restore, this); - _sessions[uid] = session; - session->start(); - return session; + return (_sessions[uid] = new SessionThread(uid, restore, strictIdentEnabled(), this)); } @@ -1143,7 +1181,7 @@ std::unique_ptr Core::getMigrationReader(Storage *st if (!storage) return nullptr; - AbstractSqlStorage *sqlStorage = qobject_cast(storage); + auto *sqlStorage = qobject_cast(storage); if (!sqlStorage) { qDebug() << "Core::migrateDb(): only SQL based backends can be migrated!"; return nullptr; @@ -1158,7 +1196,7 @@ std::unique_ptr Core::getMigrationWriter(Storage *st if (!storage) return nullptr; - AbstractSqlStorage *sqlStorage = qobject_cast(storage); + auto *sqlStorage = qobject_cast(storage); if (!sqlStorage) { qDebug() << "Core::migrateDb(): only SQL based backends can be migrated!"; return nullptr;