X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=11563fd5f59ec423e505b99854538b716fb40890;hp=008c5b0a37cde56205c1c061ec4e9ed493874d43;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=84cd3561e97167ffb98ecab0fd2b884ba1d13ada diff --git a/src/core/core.cpp b/src/core/core.cpp index 008c5b0a..11563fd5 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,34 +18,37 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "core.h" + +#include + #include -#include "core.h" #include "coreauthhandler.h" #include "coresession.h" #include "coresettings.h" -#include "logger.h" #include "internalpeer.h" #include "network.h" #include "postgresqlstorage.h" #include "quassel.h" +#include "sqlauthenticator.h" #include "sqlitestorage.h" +#include "types.h" #include "util.h" +#ifdef HAVE_LDAP +# include "ldapauthenticator.h" +#endif + // migration related #include #ifdef Q_OS_WIN -# include +# include #else -# include -# include +# include +# include #endif /* Q_OS_WIN */ -#ifdef HAVE_UMASK -# include -# include -#endif /* HAVE_UMASK */ - // ============================== // Custom Events // ============================== @@ -54,203 +57,265 @@ const int Core::AddClientEventId = QEvent::registerEventType(); class AddClientEvent : public QEvent { public: - AddClientEvent(RemotePeer *p, UserId uid) : QEvent(QEvent::Type(Core::AddClientEventId)), peer(p), userId(uid) {} - RemotePeer *peer; + AddClientEvent(RemotePeer* p, UserId uid) + : QEvent(QEvent::Type(Core::AddClientEventId)) + , peer(p) + , userId(uid) + {} + RemotePeer* peer; UserId userId; }; - // ============================== // 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() - : QObject(), - _storage(0) +void Core::init() { -#ifdef HAVE_UMASK - umask(S_IRWXG | S_IRWXO); -#endif - _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) + _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) - Quassel::loadTranslation(QLocale::system()); + // check settings version + // so far, we only have 1 + CoreSettings s; + if (s.version() != 1) { + throw ExitException{EXIT_FAILURE, tr("Invalid core settings version!")}; + } - // 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 + // Set up storage and authentication backends + registerStorageBackends(); + registerAuthenticators(); -# 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()) { - 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_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 + QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); + bool config_from_environment = Quassel::isOptionSet("config-from-environment"); - 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(); + QString db_backend; + QVariantMap db_connectionProperties; + + QString auth_authenticator; + QVariantMap auth_properties; + + bool writeError = false; + + if (config_from_environment) { + db_backend = environment.value("DB_BACKEND"); + auth_authenticator = environment.value("AUTH_AUTHENTICATOR"); + } + else { + CoreSettings cs; + + QVariantMap dbsettings = cs.storageSettings().toMap(); + db_backend = dbsettings.value("Backend").toString(); + db_connectionProperties = dbsettings.value("ConnectionProperties").toMap(); + + QVariantMap authSettings = cs.authSettings().toMap(); + auth_authenticator = authSettings.value("Authenticator", "Database").toString(); + auth_properties = authSettings.value("AuthProperties").toMap(); + + writeError = !cs.isWritable(); + } + + 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")) { + success &= selectBackend(Quassel::optionValue("select-backend")); + } + if (Quassel::isOptionSet("select-authenticator")) { + success &= selectAuthenticator(Quassel::optionValue("select-authenticator")); + } + throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE}; + } + + if (!_configured) { + if (config_from_environment) { + 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); } } - // 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(); + catch (ExitException e) { + throw ExitException{EXIT_FAILURE, tr("Cannot configure from environment: %1").arg(e.errorString)}; + } + + if (!_configured) { + throw ExitException{EXIT_FAILURE, tr("Cannot configure from environment!")}; } -#endif /* !Q_OS_MAC */ - qWarning() << "*** Migration completed.\n\n"; } - } - // MIGRATION end + else { + if (_registeredStorageBackends.empty()) { + 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.")}; + } - // check settings version - // so far, we only have 1 - CoreSettings s; - if (s.version() != 1) { - qCritical() << "Invalid core settings version, terminating!"; - exit(EXIT_FAILURE); + if (writeError) { + throw ExitException{EXIT_FAILURE, tr("Cannot write quasselcore configuration; probably a permission problem.")}; + } + + qInfo() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; + } } - registerStorageBackends(); + // This checks separately because config-from-environment might have only configured the core just now + if (_configured) { + if (Quassel::isOptionSet("add-user")) { + bool success = createUser(); + throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE}; + } - connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); - _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes -} + 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(); + } -void Core::init() -{ - CoreSettings cs; - // legacy - QVariantMap dbsettings = cs.storageSettings().toMap(); - _configured = initStorage(dbsettings.value("Backend").toString(), dbsettings.value("ConnectionProperties").toMap()); + if (Quassel::isOptionSet("oidentd")) { + _oidentdConfigGenerator = new OidentdConfigGenerator(this); + } - if (Quassel::isOptionSet("select-backend")) { - selectBackend(Quassel::optionValue("select-backend")); - exit(0); - } + if (Quassel::isOptionSet("ident-daemon")) { + _identServer = new IdentServer(this); + } - 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) + if (Quassel::isOptionSet("metrics-daemon")) { + _metricsServer = new MetricsServer(this); + _server.setMetricsServer(_metricsServer); + _v6server.setMetricsServer(_metricsServer); } - qWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; + + 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, &QTimer::timeout, this, &Core::syncStorage); + _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } - if (Quassel::isOptionSet("add-user")) { - createUser(); - exit(0); + connect(&_server, &QTcpServer::newConnection, this, &Core::incomingConnection); + connect(&_v6server, &QTcpServer::newConnection, this, &Core::incomingConnection); + + if (!startListening()) { + throw ExitException{EXIT_FAILURE, tr("Cannot open port for listening!")}; } - if (Quassel::isOptionSet("change-userpass")) { - changeUserPass(Quassel::optionValue("change-userpass")); - exit(0); + if (_configured && !Quassel::isOptionSet("norestore")) { + Core::restoreState(); } - connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - if (!startListening()) exit(1); // TODO make this less brutal + _initialized = true; - if (Quassel::isOptionSet("oidentd")) - _oidentdConfigGenerator = new OidentdConfigGenerator(this); + if (_pendingInternalConnection) { + connectInternalPeer(_pendingInternalConnection); + _pendingInternalConnection = {}; + } } +void Core::initAsync() +{ + try { + init(); + } + catch (ExitException e) { + emit exitRequested(e.exitCode, e.errorString); + } +} -Core::~Core() +void Core::shutdown() { - // FIXME do we need more cleanup for handlers? - foreach(CoreAuthHandler *handler, _connectingClients) { - handler->deleteLater(); // disconnect non authed clients + qInfo() << "Core shutting down..."; + + saveState(); + + for (auto&& client : _connectingClients) { + client->deleteLater(); + } + _connectingClients.clear(); + + if (_sessions.isEmpty()) { + emit shutdownComplete(); + return; + } + + for (auto&& session : _sessions) { + connect(session, &SessionThread::shutdownComplete, this, &Core::onSessionShutdown); + session->shutdown(); } - qDeleteAll(sessions); - qDeleteAll(_storageBackends); } +void Core::onSessionShutdown(SessionThread* session) +{ + _sessions.take(_sessions.key(session))->deleteLater(); + if (_sessions.isEmpty()) { + qInfo() << "Core shutdown complete!"; + emit shutdownComplete(); + } +} /*** Session Restore ***/ void Core::saveState() { - CoreSettings s; - QVariantMap state; - QVariantList activeSessions; - foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue(user); - state["CoreStateVersion"] = 1; - state["ActiveSessions"] = activeSessions; - s.setCoreState(state); + if (_storage) { + QVariantList activeSessions; + for (auto&& user : instance()->_sessions.keys()) + activeSessions << QVariant::fromValue(user); + _storage->setCoreState(activeSessions); + } } - void Core::restoreState() { - if (!instance()->_configured) { - // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); + if (!_configured) { + qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); return; } - if (instance()->sessions.count()) { + if (_sessions.count()) { qWarning() << 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(); @@ -260,26 +325,36 @@ void Core::restoreState() } */ - QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList(); + const QList& activeSessionsFallback = s.coreState().toMap()["ActiveSessions"].toList(); + QVariantList activeSessions = instance()->_storage->getCoreState(activeSessionsFallback); + if (activeSessions.count() > 0) { - quInfo() << "Restoring previous core state..."; - foreach(QVariant v, activeSessions) { + qInfo() << "Restoring previous core state..."; + for (auto&& v : activeSessions) { UserId user = v.value(); - instance()->createSession(user, true); + sessionForUser(user, true); } } } - /*** Core Setup ***/ -QString Core::setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData) +QString Core::setup(const QString& adminUser, + const QString& adminPassword, + const QString& backend, + const QVariantMap& setupData, + const QString& authenticator, + const QVariantMap& authSetupData) { - return instance()->setupCore(adminUser, adminPassword, backend, setupData); + return instance()->setupCore(adminUser, adminPassword, backend, setupData, authenticator, authSetupData); } - -QString Core::setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData) +QString Core::setupCore(const QString& adminUser, + const QString& adminPassword, + const QString& backend, + const QVariantMap& setupData, + const QString& authenticator, + const QVariantMap& authSetupData) { if (_configured) return tr("Core is already configured! Not configuring again..."); @@ -287,24 +362,39 @@ 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, true))) { - return tr("Could not setup storage!"); + try { + if (!(_configured = initStorage(backend, setupData, {}, false, true))) { + return tr("Could not setup storage!"); + } + + qInfo() << "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; } - saveBackendSettings(backend, setupData); + if (!saveBackendSettings(backend, setupData)) { + return tr("Could not save backend settings, probably a permission problem."); + } + saveAuthenticatorSettings(authenticator, authSetupData); - quInfo() << qPrintable(tr("Creating admin user...")); + qInfo() << qPrintable(tr("Creating admin user...")); _storage->addUser(adminUser, adminPassword); - startListening(); // TODO check when we need this + cacheSysIdent(); + startListening(); // TODO check when we need this return QString(); } - QString Core::setupCoreForInternalUsage() { - Q_ASSERT(!_storageBackends.isEmpty()); + Q_ASSERT(!_registeredStorageBackends.empty()); - qsrand(QDateTime::currentDateTime().toTime_t()); + qsrand(QDateTime::currentDateTime().toMSecsSinceEpoch()); int pass = 0; for (int i = 0; i < 10; i++) { pass *= 10; @@ -312,101 +402,88 @@ QString Core::setupCoreForInternalUsage() } // mono client currently needs sqlite - return setupCore("AdminUser", QString::number(pass), "SQLite", QVariantMap()); + return setupCore("AdminUser", QString::number(pass), "SQLite", QVariantMap(), "Database", QVariantMap()); } - /*** Storage Handling ***/ -void Core::registerStorageBackends() -{ - // Register storage backends here! - registerStorageBackend(new SqliteStorage(this)); - registerStorageBackend(new PostgreSqlStorage(this)); -} - -bool Core::registerStorageBackend(Storage *backend) +template +void Core::registerStorageBackend() { - if (backend->isAvailable()) { - _storageBackends[backend->displayName()] = backend; - return true; - } - else { + auto backend = makeDeferredShared(this); + if (backend->isAvailable()) + _registeredStorageBackends.emplace_back(std::move(backend)); + else backend->deleteLater(); - return false; - } } - -void Core::unregisterStorageBackends() +void Core::registerStorageBackends() { - foreach(Storage *s, _storageBackends.values()) { - s->deleteLater(); + if (_registeredStorageBackends.empty()) { + registerStorageBackend(); + registerStorageBackend(); } - _storageBackends.clear(); } - -void Core::unregisterStorageBackend(Storage *backend) +DeferredSharedPtr Core::storageBackend(const QString& backendId) const { - _storageBackends.remove(backend->displayName()); - backend->deleteLater(); + auto it = std::find_if(_registeredStorageBackends.begin(), + _registeredStorageBackends.end(), + [backendId](const DeferredSharedPtr& backend) { return backend->displayName() == backendId; }); + return it != _registeredStorageBackends.end() ? *it : nullptr; } - -// old db settings: -// "Type" => "sqlite" -bool Core::initStorage(const QString &backend, const QVariantMap &settings, bool setup) +bool Core::initStorage( + const QString& backend, const QVariantMap& settings, const QProcessEnvironment& environment, bool loadFromEnvironment, bool setup) { - _storage = 0; - if (backend.isEmpty()) { + qWarning() << "No storage backend selected!"; return false; } - Storage *storage = 0; - if (_storageBackends.contains(backend)) { - storage = _storageBackends[backend]; - } - else { + auto storage = storageBackend(backend); + if (!storage) { qCritical() << "Selected storage backend is not available:" << backend; return false; } - Storage::State storageState = storage->init(settings); + connect(storage.get(), &Storage::dbUpgradeInProgress, this, &Core::dbUpgradeInProgress); + + Storage::State storageState = storage->init(settings, environment, loadFromEnvironment); 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 + if (storage->setup(settings, environment, loadFromEnvironment)) + return initStorage(backend, settings, environment, loadFromEnvironment, false); + return false; + case Storage::NotAvailable: + 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; - 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 &))); + _registeredStorageBackends.clear(); + connect(storage.get(), &Storage::bufferInfoUpdated, this, &Core::bufferInfoUpdated); + break; } - _storage = storage; + _storage = std::move(storage); return true; } - void Core::syncStorage() { if (_storage) _storage->sync(); } - /*** Storage Access ***/ -bool Core::createNetwork(UserId user, NetworkInfo &info) +bool Core::createNetwork(UserId user, NetworkInfo& info) { NetworkId networkId = instance()->_storage->createNetwork(user, info); if (!networkId.isValid()) @@ -416,19 +493,121 @@ bool Core::createNetwork(UserId user, NetworkInfo &info) return true; } +/*** Authenticators ***/ + +// Authentication handling, now independent from storage. +template +void Core::registerAuthenticator() +{ + auto authenticator = makeDeferredShared(this); + if (authenticator->isAvailable()) + _registeredAuthenticators.emplace_back(std::move(authenticator)); + else + authenticator->deleteLater(); +} + +void Core::registerAuthenticators() +{ + if (_registeredAuthenticators.empty()) { + registerAuthenticator(); +#ifdef HAVE_LDAP + registerAuthenticator(); +#endif + } +} + +DeferredSharedPtr Core::authenticator(const QString& backendId) const +{ + auto it = std::find_if(_registeredAuthenticators.begin(), + _registeredAuthenticators.end(), + [backendId](const DeferredSharedPtr& authenticator) { + return authenticator->backendId() == backendId; + }); + return it != _registeredAuthenticators.end() ? *it : nullptr; +} + +// FIXME: Apparently, this is the legacy way of initting storage backends? +// If there's a not-legacy way, it should be used here +bool Core::initAuthenticator( + const QString& backend, const QVariantMap& settings, const QProcessEnvironment& environment, bool loadFromEnvironment, bool setup) +{ + if (backend.isEmpty()) { + qWarning() << "No authenticator selected!"; + return false; + } + + auto auth = authenticator(backend); + if (!auth) { + qCritical() << "Selected auth backend is not available:" << backend; + return false; + } + + Authenticator::State authState = auth->init(settings, environment, loadFromEnvironment); + switch (authState) { + case Authenticator::NeedsSetup: + if (!setup) + return false; // trigger setup process + if (auth->setup(settings, environment, loadFromEnvironment)) + return initAuthenticator(backend, settings, environment, loadFromEnvironment, false); + return false; + + case Authenticator::NotAvailable: + 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: + // delete all other backends + _registeredAuthenticators.clear(); + break; + } + _authenticator = std::move(auth); + return true; +} /*** Network Management ***/ bool Core::sslSupported() { -#ifdef HAVE_SSL - SslServer *sslServer = qobject_cast(&instance()->_server); - return sslServer && sslServer->isCertValid(); -#else - return false; -#endif + return instance()->_server.isCertValid() && instance()->_v6server.isCertValid(); } +bool Core::reloadCerts() +{ + bool retv4 = _server.reloadCerts(); + bool retv6 = _v6server.reloadCerts(); + + return retv4 && retv6; +} + +void Core::cacheSysIdent() +{ + if (isConfigured()) { + _authUserNames = _storage->getAllAuthUserNames(); + } +} + +QString Core::strictSysIdent(UserId user) const +{ + if (_authUserNames.contains(user)) { + return _authUserNames[user]; + } + + // 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! + instance()->cacheSysIdent(); + + if (_authUserNames.contains(user)) { + return _authUserNames[user]; + } + + // ...something very weird is going on if we ended up here (an active CoreSession without a corresponding database entry?) + qWarning().nospace() << "Unable to find authusername for UserId " << user << ", this should never happen!"; + return "unknown"; // Should we just terminate the program instead? +} bool Core::startListening() { @@ -442,72 +621,69 @@ bool Core::startListening() const QString listen = Quassel::optionValue("listen"); const QStringList listen_list = listen.split(",", QString::SkipEmptyParts); if (listen_list.size() > 0) { - foreach(const QString listen_term, listen_list) { // TODO: handle multiple interfaces for same TCP version gracefully + foreach (const QString listen_term, listen_list) { // TODO: handle multiple interfaces for same TCP version gracefully QHostAddress addr; if (!addr.setAddress(listen_term)) { - qCritical() << qPrintable( - tr("Invalid listen address %1") - .arg(listen_term) - ); + qCritical() << qPrintable(tr("Invalid listen address %1").arg(listen_term)); } else { switch (addr.protocol()) { case QAbstractSocket::IPv6Protocol: if (_v6server.listen(addr, port)) { - quInfo() << qPrintable( - tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3") - .arg(addr.toString()) - .arg(_v6server.serverPort()) - .arg(Quassel::buildInfo().protocolVersion) - ); + qInfo() << qPrintable(tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3") + .arg(addr.toString()) + .arg(_v6server.serverPort()) + .arg(Quassel::buildInfo().protocolVersion)); success = true; } else - quWarning() << qPrintable( - tr("Could not open IPv6 interface %1:%2: %3") - .arg(addr.toString()) - .arg(port) - .arg(_v6server.errorString())); + qWarning() << qPrintable(tr("Could not open IPv6 interface %1:%2: %3").arg(addr.toString()).arg(port).arg(_v6server.errorString())); break; case QAbstractSocket::IPv4Protocol: if (_server.listen(addr, port)) { - quInfo() << qPrintable( - tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3") - .arg(addr.toString()) - .arg(_server.serverPort()) - .arg(Quassel::buildInfo().protocolVersion) - ); + qInfo() << qPrintable(tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3") + .arg(addr.toString()) + .arg(_server.serverPort()) + .arg(Quassel::buildInfo().protocolVersion)); success = true; } else { // 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 IPv4 interface %1:%2: %3") - .arg(addr.toString()) - .arg(port) - .arg(_server.errorString())); + qWarning() << qPrintable(tr("Could not open IPv4 interface %1:%2: %3").arg(addr.toString()).arg(port).arg(_server.errorString())); } break; default: - qCritical() << qPrintable( - tr("Invalid listen address %1, unknown network protocol") - .arg(listen_term) - ); + qCritical() << qPrintable(tr("Invalid listen address %1, unknown network protocol").arg(listen_term)); break; } } } } if (!success) - quError() << qPrintable(tr("Could not open any network interfaces to listen on!")); + qCritical() << qPrintable(tr("Could not open any network interfaces to listen on!")); + + if (_identServer) { + _identServer->startListening(); + } + + if (_metricsServer) { + _metricsServer->startListening(); + } return success; } - -void Core::stopListening(const QString &reason) +void Core::stopListening(const QString& reason) { + if (_identServer) { + _identServer->stopListening(reason); + } + + if (_metricsServer) { + _metricsServer->stopListening(reason); + } + bool wasListening = false; if (_server.isListening()) { wasListening = true; @@ -519,28 +695,28 @@ void Core::stopListening(const QString &reason) } if (wasListening) { if (reason.isEmpty()) - quInfo() << "No longer listening for GUI clients."; + qInfo() << "No longer listening for GUI clients."; else - quInfo() << qPrintable(reason); + qInfo() << qPrintable(reason); } } - void Core::incomingConnection() { - QTcpServer *server = qobject_cast(sender()); + auto* server = qobject_cast(sender()); Q_ASSERT(server); while (server->hasPendingConnections()) { - QTcpSocket *socket = server->nextPendingConnection(); + auto socket = qobject_cast(server->nextPendingConnection()); + Q_ASSERT(socket); - CoreAuthHandler *handler = new CoreAuthHandler(socket, this); + auto* handler = new CoreAuthHandler(socket, this); _connectingClients.insert(handler); - connect(handler, SIGNAL(disconnected()), SLOT(clientDisconnected())); - connect(handler, SIGNAL(socketError(QAbstractSocket::SocketError,QString)), SLOT(socketError(QAbstractSocket::SocketError,QString))); - connect(handler, SIGNAL(handshakeComplete(RemotePeer*,UserId)), SLOT(setupClientSession(RemotePeer*,UserId))); + connect(handler, &AuthHandler::disconnected, this, &Core::clientDisconnected); + connect(handler, &AuthHandler::socketError, this, &Core::socketError); + connect(handler, &CoreAuthHandler::handshakeComplete, this, &Core::setupClientSession); - quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString()); + qInfo() << qPrintable(tr("Client connected from")) << qPrintable(handler->hostAddress().toString()); if (!_configured) { stopListening(tr("Closing server for basic setup.")); @@ -548,14 +724,13 @@ 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()); + qInfo() << qPrintable(tr("Non-authed client disconnected:")) << qPrintable(handler->hostAddress().toString()); _connectingClients.remove(handler); handler->deleteLater(); @@ -568,68 +743,59 @@ void Core::clientDisconnected() // Suggestion: kill sessions if they are not connected to any network and client. } - -void Core::setupClientSession(RemotePeer *peer, UserId uid) +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(); // 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(peer->description()); - peer->close(); - peer->deleteLater(); - return; - } - } + sessionForUser(uid); // 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(peer, uid)); } - -void Core::customEvent(QEvent *event) +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; } } - -void Core::addClientHelper(RemotePeer *peer, UserId uid) +void Core::addClientHelper(RemotePeer* peer, UserId uid) { // Find or create session for validated user - if (!sessions.contains(uid)) { - qWarning() << qPrintable(tr("Could not find a session for client:")) << qPrintable(peer->description()); - peer->close(); - peer->deleteLater(); - return; - } - - SessionThread *session = sessions[uid]; + SessionThread* session = sessionForUser(uid); session->addClient(peer); } +void Core::connectInternalPeer(QPointer peer) +{ + if (_initialized && peer) { + setupInternalClientSession(peer); + } + else { + _pendingInternalConnection = peer; + } +} -void Core::setupInternalClientSession(InternalPeer *clientPeer) +void Core::setupInternalClientSession(QPointer clientPeer) { if (!_configured) { stopListening(); - setupCoreForInternalUsage(); + auto errorString = setupCoreForInternalUsage(); + if (!errorString.isEmpty()) { + emit exitRequested(EXIT_FAILURE, errorString); + return; + } } UserId uid; @@ -638,135 +804,218 @@ void Core::setupInternalClientSession(InternalPeer *clientPeer) } else { qWarning() << "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) { + qWarning() << "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); // Find or create session for validated user - SessionThread *sessionThread; - if (sessions.contains(uid)) - sessionThread = sessions[uid]; - else - sessionThread = createSession(uid); - + SessionThread* sessionThread = sessionForUser(uid); sessionThread->addClient(corePeer); } - -SessionThread *Core::createSession(UserId uid, bool restore) +SessionThread* Core::sessionForUser(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; -} + if (_sessions.contains(uid)) + return _sessions[uid]; + return (_sessions[uid] = new SessionThread(uid, restore, strictIdentEnabled(), this)); +} -void Core::socketError(QAbstractSocket::SocketError err, const QString &errorString) +void Core::socketError(QAbstractSocket::SocketError err, const QString& errorString) { qWarning() << QString("Socket error %1: %2").arg(err).arg(errorString); } - QVariantList Core::backendInfo() { - QVariantList backends; - foreach(const Storage *backend, instance()->_storageBackends.values()) { + instance()->registerStorageBackends(); + + QVariantList backendInfos; + for (auto&& backend : instance()->_registeredStorageBackends) { QVariantMap v; + v["BackendId"] = backend->backendId(); v["DisplayName"] = backend->displayName(); v["Description"] = backend->description(); - v["SetupKeys"] = backend->setupKeys(); - v["SetupDefaults"] = backend->setupDefaults(); - backends.append(v); + v["SetupData"] = backend->setupData(); // ignored by legacy clients + + // TODO Protocol Break: Remove legacy (cf. authenticatorInfo()) + const auto& setupData = backend->setupData(); + QStringList setupKeys; + QVariantMap setupDefaults; + for (int i = 0; i + 2 < setupData.size(); i += 3) { + setupKeys << setupData[i].toString(); + setupDefaults[setupData[i].toString()] = setupData[i + 2]; + } + v["SetupKeys"] = setupKeys; + v["SetupDefaults"] = setupDefaults; + // TODO Protocol Break: Remove + v["IsDefault"] = (backend->backendId() == "SQLite"); // newer clients will just use the first in the list + + backendInfos << v; } - return backends; + return backendInfos; } +QVariantList Core::authenticatorInfo() +{ + instance()->registerAuthenticators(); + + QVariantList authInfos; + for (auto&& backend : instance()->_registeredAuthenticators) { + QVariantMap v; + v["BackendId"] = backend->backendId(); + v["DisplayName"] = backend->displayName(); + v["Description"] = backend->description(); + v["SetupData"] = backend->setupData(); + authInfos << v; + } + return authInfos; +} // migration / backend selection -bool Core::selectBackend(const QString &backend) +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(", ")); + auto storage = storageBackend(backend); + if (!storage) { + QStringList backends; + std::transform(_registeredStorageBackends.begin(), + _registeredStorageBackends.end(), + std::back_inserter(backends), + [](const DeferredSharedPtr& backend) { return backend->displayName(); }); + qWarning() << qPrintable(tr("Unsupported storage backend: %1").arg(backend)); + qWarning() << qPrintable(tr("Supported backends are:")) << qPrintable(backends.join(", ")); return false; } - Storage *storage = _storageBackends[backend]; - QVariantMap settings = promptForSettings(storage); + QVariantMap settings = promptForSettings(storage.get()); 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"; + if (!saveBackendSettings(backend, settings)) { + qCritical() << qPrintable(QString("Could not save backend settings, probably a permission problem.")); + } + qWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); + qWarning() << qPrintable(tr("Backend already initialized. Skipping Migration...")); return true; case Storage::NotAvailable: - qCritical() << "Backend is not available:" << qPrintable(backend); + qCritical() << qPrintable(tr("Storage backend is not available: %1").arg(backend)); return false; case Storage::NeedsSetup: if (!storage->setup(settings)) { - qWarning() << qPrintable(QString("Core::selectBackend(): unable to setup backend: %1").arg(backend)); + qWarning() << qPrintable(tr("Unable to setup storage backend: %1").arg(backend)); return false; } if (storage->init(settings) != Storage::IsReady) { - qWarning() << qPrintable(QString("Core::migrateBackend(): unable to initialize backend: %1").arg(backend)); + qWarning() << qPrintable(tr("Unable to initialize storage backend: %1").arg(backend)); return false; } - saveBackendSettings(backend, settings); - qWarning() << "Switched backend to:" << qPrintable(backend); + if (!saveBackendSettings(backend, settings)) { + qCritical() << qPrintable(QString("Could not save backend settings, probably a permission problem.")); + } + qWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); break; } // let's see if we have a current storage object we can migrate from - AbstractSqlMigrationReader *reader = getMigrationReader(_storage); - AbstractSqlMigrationWriter *writer = getMigrationWriter(storage); + auto reader = getMigrationReader(_storage.get()); + auto writer = getMigrationWriter(storage.get()); 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() << qPrintable(tr("Migrating storage backend %1 to %2...").arg(_storage->displayName(), storage->displayName())); + _storage.reset(); + storage.reset(); + if (reader->migrateTo(writer.get())) { qDebug() << "Migration finished!"; - saveBackendSettings(backend, settings); + qDebug() << qPrintable(tr("Migration finished!")); + if (!saveBackendSettings(backend, settings)) { + qCritical() << qPrintable(QString("Could not save backend settings, probably a permission problem.")); + return false; + } return true; } + qWarning() << qPrintable(tr("Unable to migrate storage backend! (No migration writer for %1)").arg(backend)); 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."; + qWarning() << qPrintable(tr("No currently active storage backend. Skipping migration...")); } else if (!reader) { - qWarning() << "Currently active backend does not support migration:" << qPrintable(_storage->displayName()); + qWarning() << qPrintable(tr("Currently active storage backend does not support migration: %1").arg(_storage->displayName())); } if (writer) { - qWarning() << "New backend does not support migration:" << qPrintable(backend); + qWarning() << qPrintable(tr("New storage backend does not support migration: %1").arg(backend)); } // so we were unable to merge, but let's create a user \o/ - _storage = storage; + _storage = std::move(storage); createUser(); return true; } +// TODO: I am not sure if this function is implemented correctly. +// There is currently no concept of migraiton between auth backends. +bool Core::selectAuthenticator(const QString& backend) +{ + // Register all authentication backends. + registerAuthenticators(); + auto auther = authenticator(backend); + if (!auther) { + QStringList authenticators; + std::transform(_registeredAuthenticators.begin(), + _registeredAuthenticators.end(), + std::back_inserter(authenticators), + [](const DeferredSharedPtr& authenticator) { return authenticator->displayName(); }); + qWarning() << qPrintable(tr("Unsupported authenticator: %1").arg(backend)); + qWarning() << qPrintable(tr("Supported authenticators are:")) << qPrintable(authenticators.join(", ")); + return false; + } + + QVariantMap settings = promptForSettings(auther.get()); -void Core::createUser() + Authenticator::State state = auther->init(settings); + switch (state) { + case Authenticator::IsReady: + saveAuthenticatorSettings(backend, settings); + qWarning() << qPrintable(tr("Switched authenticator to: %1").arg(backend)); + return true; + case Authenticator::NotAvailable: + qCritical() << qPrintable(tr("Authenticator is not available: %1").arg(backend)); + return false; + case Authenticator::NeedsSetup: + if (!auther->setup(settings)) { + qWarning() << qPrintable(tr("Unable to setup authenticator: %1").arg(backend)); + return false; + } + + if (auther->init(settings) != Authenticator::IsReady) { + qWarning() << qPrintable(tr("Unable to initialize authenticator: %1").arg(backend)); + return false; + } + + saveAuthenticatorSettings(backend, settings); + qWarning() << qPrintable(tr("Switched authenticator to: %1").arg(backend)); + } + + _authenticator = std::move(auther); + return true; +} + +bool Core::createUser() { QTextStream out(stdout); QTextStream in(stdin); @@ -788,30 +1037,36 @@ void Core::createUser() if (password != password2) { qWarning() << "Passwords don't match!"; - return; + return false; } if (password.isEmpty()) { qWarning() << "Password is empty!"; - return; + return false; } if (_configured && _storage->addUser(username, password).isValid()) { out << "Added user " << username << " successfully!" << endl; + return true; } else { qWarning() << "Unable to add user:" << qPrintable(username); + return false; } } - -void Core::changeUserPass(const QString &username) +bool 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; + return false; + } + + if (!canChangeUserPassword(userId)) { + out << "User " << username << " is configured through an auth provider that has forbidden manual password changing." << endl; + return false; } out << "Change password for user: " << username << endl; @@ -829,112 +1084,142 @@ void Core::changeUserPass(const QString &username) if (password != password2) { qWarning() << "Passwords don't match!"; - return; + return false; } if (password.isEmpty()) { qWarning() << "Password is empty!"; - return; + return false; } if (_configured && _storage->updateUser(userId, password)) { out << "Password changed successfully!" << endl; + return true; } else { qWarning() << "Failed to change password!"; + return false; } } +bool Core::changeUserPassword(UserId userId, const QString& password) +{ + if (!isConfigured() || !userId.isValid()) + return false; + + if (!canChangeUserPassword(userId)) + return false; + + return instance()->_storage->updateUser(userId, password); +} + +// TODO: this code isn't currently 100% optimal because the core +// doesn't know it can have multiple auth providers configured (there aren't +// multiple auth providers at the moment anyway) and we have hardcoded the +// Database provider to be always allowed. +bool Core::canChangeUserPassword(UserId userId) +{ + QString authProvider = instance()->_storage->getUserAuthenticator(userId); + if (authProvider != "Database") { + if (authProvider != instance()->_authenticator->backendId()) { + return false; + } + else if (instance()->_authenticator->canChangePassword()) { + return false; + } + } + return true; +} -AbstractSqlMigrationReader *Core::getMigrationReader(Storage *storage) +std::unique_ptr Core::getMigrationReader(Storage* storage) { if (!storage) - return 0; + 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 0; + return nullptr; } return sqlStorage->createMigrationReader(); } - -AbstractSqlMigrationWriter *Core::getMigrationWriter(Storage *storage) +std::unique_ptr Core::getMigrationWriter(Storage* storage) { if (!storage) - return 0; + 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 0; + return nullptr; } return sqlStorage->createMigrationWriter(); } - -void Core::saveBackendSettings(const QString &backend, const QVariantMap &settings) +bool Core::saveBackendSettings(const QString& backend, const QVariantMap& settings) { QVariantMap dbsettings; dbsettings["Backend"] = backend; dbsettings["ConnectionProperties"] = settings; - CoreSettings().setStorageSettings(dbsettings); + CoreSettings s = CoreSettings(); + s.setStorageSettings(dbsettings); + return s.sync(); } +void Core::saveAuthenticatorSettings(const QString& backend, const QVariantMap& settings) +{ + QVariantMap dbsettings; + dbsettings["Authenticator"] = backend; + dbsettings["AuthProperties"] = settings; + CoreSettings().setAuthSettings(dbsettings); +} -QVariantMap Core::promptForSettings(const Storage *storage) +// Generic version of promptForSettings that doesn't care what *type* of +// backend it runs over. +template +QVariantMap Core::promptForSettings(const Backend* backend) { QVariantMap settings; + const QVariantList& setupData = backend->setupData(); - QStringList keys = storage->setupKeys(); - if (keys.isEmpty()) + if (setupData.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(); + for (int i = 0; i + 2 < setupData.size(); i += 3) { + QString key = setupData[i].toString(); + out << setupData[i + 1].toString() << " [" << setupData[i + 2].toString() << "]: " << flush; - bool noEcho = QString("password").toLower().startsWith(key.toLower()); + bool noEcho = key.toLower().contains("password"); if (noEcho) { disableStdInEcho(); } - value = in.readLine().trimmed(); + QString input = in.readLine().trimmed(); if (noEcho) { out << endl; enableStdInEcho(); } - if (!value.isEmpty()) { - switch (defaults[key].type()) { + QVariant value{setupData[i + 2]}; + if (!input.isEmpty()) { + switch (value.type()) { case QVariant::Int: - val = QVariant(value.toInt()); + value = input.toInt(); break; default: - val = QVariant(value); + value = input; } } - settings[key] = val; + settings[key] = value; } return settings; } - #ifdef Q_OS_WIN void Core::stdInEcho(bool on) { @@ -948,7 +1233,6 @@ void Core::stdInEcho(bool on) SetConsoleMode(hStdin, mode); } - #else void Core::stdInEcho(bool on) { @@ -961,5 +1245,4 @@ void Core::stdInEcho(bool on) tcsetattr(STDIN_FILENO, TCSANOW, &t); } - #endif /* Q_OS_WIN */