X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=aecb06e38e5c8e14f39cc838b3d5b63061f2c4cd;hp=04dd3bb2742af151db863b0489bba46aa60ef58f;hb=6422c61b11d97f905b6a27f2d280e9ec0d8bb3e2;hpb=d9b17a008292b197247dca3b17814ab00dc0c586 diff --git a/src/core/core.cpp b/src/core/core.cpp index 04dd3bb2..aecb06e3 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include "core.h" @@ -88,9 +90,6 @@ void Core::destroy() Core::Core() - : QObject(), - _storage(0), - _authenticator(0) { #ifdef HAVE_UMASK umask(S_IRWXG | S_IRWXO); @@ -123,11 +122,11 @@ Core::Core() # 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..."; + 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); - qWarning() << "* Your core settings have been migrated to" << newSettings.fileName(); + 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 @@ -145,9 +144,9 @@ Core::Core() 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"; + quWarning() << "* 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(); + quWarning() << "!!! Moving your database has failed. Please move it manually into" << Quassel::configDirPath(); } } // move certificate @@ -156,12 +155,12 @@ Core::Core() 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"; + quWarning() << "* Your certificate has been moved to" << Quassel::configDirPath() + "quasselCert.pem"; else - qWarning() << "!!! Moving your certificate has failed. Please move it manually into" << Quassel::configDirPath(); + quWarning() << "!!! Moving your certificate has failed. Please move it manually into" << Quassel::configDirPath(); } #endif /* !Q_OS_MAC */ - qWarning() << "*** Migration completed.\n\n"; + quWarning() << "*** Migration completed.\n\n"; } } // MIGRATION end @@ -174,8 +173,9 @@ Core::Core() exit(EXIT_FAILURE); } + // Set up storage and authentication backends registerStorageBackends(); - registerAuthenticatorBackends(); + registerAuthenticators(); connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes @@ -190,26 +190,30 @@ void Core::init() _configured = initStorage(dbsettings.value("Backend").toString(), dbsettings.value("ConnectionProperties").toMap()); // Not entirely sure what is 'legacy' about the above, but it seems to be the way things work! - QVariantMap authSettings = cs.authSettings().toMap(); - initAuthenticator(authSettings.value("AuthBackend").toString(), authSettings.value("ConnectionProperties").toMap()); - - if (Quassel::isOptionSet("select-backend")) { - selectBackend(Quassel::optionValue("select-backend")); - exit(0); + if (_configured) { + QVariantMap authSettings = cs.authSettings().toMap(); + initAuthenticator(authSettings.value("Authenticator", "Database").toString(), authSettings.value("AuthProperties").toMap()); } - // TODO: add --select-authenticator command line option and code. + if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) { + if (Quassel::isOptionSet("select-backend")) { + selectBackend(Quassel::optionValue("select-backend")); + } + if (Quassel::isOptionSet("select-authenticator")) { + selectAuthenticator(Quassel::optionValue("select-authenticator")); + } + exit(EXIT_SUCCESS); + } 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" + if (_registeredStorageBackends.size() == 0) { + 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(1); // TODO make this less brutal (especially for mono client -> popup) + exit(EXIT_FAILURE); // 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."; + quWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; if (!cs.isWritable()) { qWarning() << "Cannot write quasselcore configuration; probably a permission problem."; @@ -232,8 +236,12 @@ void Core::init() connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); if (!startListening()) exit(1); // TODO make this less brutal - if (Quassel::isOptionSet("oidentd")) - _oidentdConfigGenerator = new OidentdConfigGenerator(this); + if (Quassel::isOptionSet("oidentd")) { + _oidentdConfigGenerator = new OidentdConfigGenerator(Quassel::isOptionSet("oidentd-strict"), this); + if (Quassel::isOptionSet("oidentd-strict")) { + cacheSysIdent(); + } + } } @@ -244,8 +252,6 @@ Core::~Core() handler->deleteLater(); // disconnect non authed clients } qDeleteAll(_sessions); - qDeleteAll(_storageBackends); - qDeleteAll(_authenticatorBackends); } @@ -267,18 +273,18 @@ void Core::saveState() void Core::restoreState() { if (!instance()->_configured) { - // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); + // quWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); return; } if (instance()->_sessions.count()) { - qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + 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(); if(statever < 1) { - qWarning() << qPrintable(tr("Core state too old, ignoring...")); + quWarning() << qPrintable(tr("Core state too old, ignoring...")); return; } */ @@ -296,13 +302,13 @@ void Core::restoreState() /*** Core Setup ***/ -QString Core::setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authBackend, const QVariantMap &authSetupData) +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, authBackend, authSetupData); + return instance()->setupCore(adminUser, adminPassword, backend, setupData, authenticator, authSetupData); } -QString Core::setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authBackend, const QVariantMap &authSetupData) +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..."); @@ -314,8 +320,8 @@ QString Core::setupCore(const QString &adminUser, const QString &adminPassword, return tr("Could not setup storage!"); } - quInfo() << "Selected authenticator: " << authBackend; - if (!(_configured = initAuthenticator(authBackend, authSetupData, true))) + quInfo() << "Selected authenticator:" << authenticator; + if (!(_configured = initAuthenticator(authenticator, authSetupData, true))) { return tr("Could not setup authenticator!"); } @@ -323,10 +329,11 @@ QString Core::setupCore(const QString &adminUser, const QString &adminPassword, if (!saveBackendSettings(backend, setupData)) { return tr("Could not save backend settings, probably a permission problem."); } - saveAuthBackendSettings(authBackend, authSetupData); + saveAuthenticatorSettings(authenticator, authSetupData); quInfo() << qPrintable(tr("Creating admin user...")); _storage->addUser(adminUser, adminPassword); + cacheSysIdent(); startListening(); // TODO check when we need this return QString(); } @@ -334,7 +341,7 @@ QString Core::setupCore(const QString &adminUser, const QString &adminPassword, QString Core::setupCoreForInternalUsage() { - Q_ASSERT(!_storageBackends.isEmpty()); + Q_ASSERT(!_registeredStorageBackends.empty()); qsrand(QDateTime::currentDateTime().toTime_t()); int pass = 0; @@ -344,101 +351,52 @@ QString Core::setupCoreForInternalUsage() } // mono client currently needs sqlite - return setupCore("AdminUser", QString::number(pass), "SQLite", QVariantMap(), "StorageAuth", 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() -{ - foreach(Storage *s, _storageBackends.values()) { - s->deleteLater(); - } - _storageBackends.clear(); -} - -void Core::unregisterStorageBackend(Storage *backend) -{ - _storageBackends.remove(backend->displayName()); - backend->deleteLater(); -} - -// Authentication handling, now independent from storage. -// Register and unregister authenticators. - -void Core::registerAuthenticatorBackends() -{ - // Register new authentication backends here! - registerAuthenticatorBackend(new SqlAuthenticator(this)); -#ifdef HAVE_LDAP - registerAuthenticatorBackend(new LdapAuthenticator(this)); -#endif - -} - -bool Core::registerAuthenticatorBackend(Authenticator *authenticator) +void Core::registerStorageBackends() { - if (authenticator->isAvailable()) - { - _authenticatorBackends[authenticator->displayName()] = authenticator; - return true; - } else { - authenticator->deleteLater(); - return false; + if (_registeredStorageBackends.empty()) { + registerStorageBackend(); + registerStorageBackend(); } } -void Core::unregisterAuthenticatorBackends() -{ - foreach(Authenticator* a, _authenticatorBackends.values()) - { - a->deleteLater(); - } - _authenticatorBackends.clear(); -} -void Core::unregisterAuthenticatorBackend(Authenticator *backend) +DeferredSharedPtr Core::storageBackend(const QString &backendId) const { - _authenticatorBackends.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) { - _storage = 0; - if (backend.isEmpty()) { + quWarning() << "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; } @@ -450,73 +408,118 @@ bool Core::initStorage(const QString &backend, const QVariantMap &settings, bool return false; // trigger setup process if (storage->setup(settings)) return initStorage(backend, settings, 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; - exit(EXIT_FAILURE); + if (!setup) + exit(EXIT_FAILURE); + 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(), SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), + this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); + break; } - _storage = storage; + _storage = std::move(storage); return true; } -// XXX: TODO: Apparently, this is legacy? -bool Core::initAuthenticator(const QString &backend, const QVariantMap &settings, bool setup) + +void Core::syncStorage() { - _authenticator = 0; + if (_storage) + _storage->sync(); +} - if (backend.isEmpty()) { - return false; + +/*** Storage Access ***/ +bool Core::createNetwork(UserId user, NetworkInfo &info) +{ + NetworkId networkId = instance()->_storage->createNetwork(user, info); + if (!networkId.isValid()) + return false; + + info.networkId = networkId; + 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; +} + - Authenticator *authenticator = 0; - if (_authenticatorBackends.contains(backend)) { - authenticator = _authenticatorBackends[backend]; +// 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, bool setup) +{ + if (backend.isEmpty()) { + quWarning() << "No authenticator selected!"; + return false; } - else { + + auto auth = authenticator(backend); + if (!auth) { qCritical() << "Selected auth backend is not available:" << backend; return false; } - Authenticator::State authState = authenticator->init(settings); + Authenticator::State authState = auth->init(settings); switch (authState) { case Authenticator::NeedsSetup: if (!setup) return false; // trigger setup process - if (authenticator->setup(settings)) + if (auth->setup(settings)) return initAuthenticator(backend, settings, 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; - exit(EXIT_FAILURE); + if (!setup) + exit(EXIT_FAILURE); + return false; + case Authenticator::IsReady: // delete all other backends - _authenticatorBackends.remove(backend); - unregisterAuthenticatorBackends(); + _registeredAuthenticators.clear(); + break; } - _authenticator = authenticator; - return true; -} - -void Core::syncStorage() -{ - if (_storage) - _storage->sync(); -} - - -/*** Storage Access ***/ -bool Core::createNetwork(UserId user, NetworkInfo &info) -{ - NetworkId networkId = instance()->_storage->createNetwork(user, info); - if (!networkId.isValid()) - return false; - - info.networkId = networkId; + _authenticator = std::move(auth); return true; } @@ -551,6 +554,34 @@ bool Core::reloadCerts() } +void Core::cacheSysIdent() +{ + if (isConfigured()) { + instance()->_authUserNames = instance()->_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! + 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() { // in mono mode we only start a local port if a port is specified in the cli call @@ -739,7 +770,7 @@ void Core::setupInternalClientSession(InternalPeer *clientPeer) uid = _storage->internalUser(); } else { - qWarning() << "Core::setupInternalClientSession(): You're trying to run monolithic Quassel with an unusable Backend! Go fix it!"; + quWarning() << "Core::setupInternalClientSession(): You're trying to run monolithic Quassel with an unusable Backend! Go fix it!"; return; } @@ -767,37 +798,55 @@ SessionThread *Core::sessionForUser(UserId uid, bool restore) void Core::socketError(QAbstractSocket::SocketError err, const QString &errorString) { - qWarning() << QString("Socket error %1: %2").arg(err).arg(errorString); + quWarning() << 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(); - v["IsDefault"] = isStorageBackendDefault(backend); - 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() { - QVariantList backends; - foreach(const Authenticator *backend, instance()->_authenticatorBackends.values()) { + instance()->registerAuthenticators(); + + QVariantList authInfos; + for(auto &&backend : instance()->_registeredAuthenticators) { 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(); + authInfos << v; } - return backends; + return authInfos; } // migration / backend selection @@ -805,14 +854,19 @@ 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(); + }); + quWarning() << qPrintable(tr("Unsupported storage backend: %1").arg(backend)); + quWarning() << 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) { @@ -820,68 +874,115 @@ bool Core::selectBackend(const QString &backend) if (!saveBackendSettings(backend, settings)) { qCritical() << qPrintable(QString("Could not save backend settings, probably a permission problem.")); } - qWarning() << "Switched backend to:" << qPrintable(backend); - qWarning() << "Backend already initialized. Skipping Migration"; + quWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); + quWarning() << 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)); + quWarning() << 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)); + quWarning() << qPrintable(tr("Unable to initialize storage backend: %1").arg(backend)); return false; } if (!saveBackendSettings(backend, settings)) { qCritical() << qPrintable(QString("Could not save backend settings, probably a permission problem.")); } - qWarning() << "Switched backend to:" << qPrintable(backend); + quWarning() << 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!"; + 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; } + quWarning() << 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."; + quWarning() << qPrintable(tr("No currently active storage backend. Skipping migration...")); } else if (!reader) { - qWarning() << "Currently active backend does not support migration:" << qPrintable(_storage->displayName()); + quWarning() << 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); + quWarning() << 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(); + }); + quWarning() << qPrintable(tr("Unsupported authenticator: %1").arg(backend)); + quWarning() << qPrintable(tr("Supported authenticators are:")) << qPrintable(authenticators.join(", ")); + return false; + } + + QVariantMap settings = promptForSettings(auther.get()); + + Authenticator::State state = auther->init(settings); + switch (state) { + case Authenticator::IsReady: + saveAuthenticatorSettings(backend, settings); + quWarning() << 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)) { + quWarning() << qPrintable(tr("Unable to setup authenticator: %1").arg(backend)); + return false; + } + + if (auther->init(settings) != Authenticator::IsReady) { + quWarning() << qPrintable(tr("Unable to initialize authenticator: %1").arg(backend)); + return false; + } + + saveAuthenticatorSettings(backend, settings); + quWarning() << qPrintable(tr("Switched authenticator to: %1").arg(backend)); + } + + _authenticator = std::move(auther); + return true; +} + bool Core::createUser() { @@ -904,11 +1005,11 @@ bool Core::createUser() enableStdInEcho(); if (password != password2) { - qWarning() << "Passwords don't match!"; + quWarning() << "Passwords don't match!"; return false; } if (password.isEmpty()) { - qWarning() << "Password is empty!"; + quWarning() << "Password is empty!"; return false; } @@ -917,7 +1018,7 @@ bool Core::createUser() return true; } else { - qWarning() << "Unable to add user:" << qPrintable(username); + quWarning() << "Unable to add user:" << qPrintable(username); return false; } } @@ -933,6 +1034,11 @@ bool Core::changeUserPass(const QString &username) 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; disableStdInEcho(); @@ -947,11 +1053,11 @@ bool Core::changeUserPass(const QString &username) enableStdInEcho(); if (password != password2) { - qWarning() << "Passwords don't match!"; + quWarning() << "Passwords don't match!"; return false; } if (password.isEmpty()) { - qWarning() << "Password is empty!"; + quWarning() << "Password is empty!"; return false; } @@ -960,7 +1066,7 @@ bool Core::changeUserPass(const QString &username) return true; } else { - qWarning() << "Failed to change password!"; + quWarning() << "Failed to change password!"; return false; } } @@ -971,34 +1077,55 @@ 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); 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); if (!sqlStorage) { qDebug() << "Core::migrateDb(): only SQL based backends can be migrated!"; - return 0; + return nullptr; } return sqlStorage->createMigrationWriter(); @@ -1015,61 +1142,55 @@ bool Core::saveBackendSettings(const QString &backend, const QVariantMap &settin return s.sync(); } -void Core::saveAuthBackendSettings(const QString &backend, const QVariantMap &settings) + +void Core::saveAuthenticatorSettings(const QString &backend, const QVariantMap &settings) { QVariantMap dbsettings; - dbsettings["AuthBackend"] = backend; - dbsettings["ConnectionProperties"] = settings; + 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; } @@ -1088,7 +1209,6 @@ void Core::stdInEcho(bool on) SetConsoleMode(hStdin, mode); } - #else void Core::stdInEcho(bool on) { @@ -1101,5 +1221,4 @@ void Core::stdInEcho(bool on) tcsetattr(STDIN_FILENO, TCSANOW, &t); } - #endif /* Q_OS_WIN */