X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=11563fd5f59ec423e505b99854538b716fb40890;hp=2634dd2852fb8e04ba240601f6579b7f095d042b;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=ddfb1d2574c4bffd180361a80df9b1cd584bb040 diff --git a/src/core/core.cpp b/src/core/core.cpp index 2634dd28..11563fd5 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 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,16 +18,16 @@ * 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 "internalpeer.h" -#include "logmessage.h" #include "network.h" #include "postgresqlstorage.h" #include "quassel.h" @@ -36,18 +36,17 @@ #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 #include #ifdef Q_OS_WIN -# include +# include #else -# include -# include +# include +# include #endif /* Q_OS_WIN */ // ============================== @@ -58,12 +57,15 @@ 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 // ============================== @@ -71,6 +73,8 @@ public: Core::Core() : Singleton{this} { + 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); @@ -78,7 +82,6 @@ Core::Core() _storageSyncTimer.setParent(this); } - Core::~Core() { qDeleteAll(_connectingClients); @@ -86,14 +89,9 @@ Core::~Core() syncStorage(); } - void Core::init() { - _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) - - if (Quassel::runMode() == Quassel::RunMode::CoreOnly) { - Quassel::loadTranslation(QLocale::system()); - } + _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) // check settings version // so far, we only have 1 @@ -186,10 +184,12 @@ void Core::init() 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."; + qInfo() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; } } - else { + + // 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}; @@ -209,11 +209,16 @@ void Core::init() _oidentdConfigGenerator = new OidentdConfigGenerator(this); } - if (Quassel::isOptionSet("ident-daemon")) { _identServer = new IdentServer(this); } + if (Quassel::isOptionSet("metrics-daemon")) { + _metricsServer = new MetricsServer(this); + _server.setMetricsServer(_metricsServer); + _v6server.setMetricsServer(_metricsServer); + } + Quassel::registerReloadHandler([]() { // Currently, only reloading SSL certificates and the sysident cache is supported if (Core::instance()) { @@ -224,12 +229,12 @@ void Core::init() return false; }); - connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); - _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes + connect(&_storageSyncTimer, &QTimer::timeout, this, &Core::syncStorage); + _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } - connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); + 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!")}; @@ -247,7 +252,6 @@ void Core::init() } } - void Core::initAsync() { try { @@ -258,14 +262,13 @@ void Core::initAsync() } } - void Core::shutdown() { - quInfo() << "Core shutting down..."; + qInfo() << "Core shutting down..."; saveState(); - for (auto &&client : _connectingClients) { + for (auto&& client : _connectingClients) { client->deleteLater(); } _connectingClients.clear(); @@ -275,44 +278,41 @@ void Core::shutdown() return; } - for (auto &&session : _sessions) { - connect(session, SIGNAL(shutdownComplete(SessionThread*)), this, SLOT(onSessionShutdown(SessionThread*))); + for (auto&& session : _sessions) { + connect(session, &SessionThread::shutdownComplete, this, &Core::onSessionShutdown); session->shutdown(); } } - -void Core::onSessionShutdown(SessionThread *session) +void Core::onSessionShutdown(SessionThread* session) { _sessions.take(_sessions.key(session))->deleteLater(); if (_sessions.isEmpty()) { - quInfo() << "Core shutdown complete!"; + qInfo() << "Core shutdown complete!"; emit shutdownComplete(); } } - /*** Session Restore ***/ void Core::saveState() { if (_storage) { QVariantList activeSessions; - for (auto &&user : instance()->_sessions.keys()) - activeSessions << QVariant::fromValue(user); + for (auto&& user : instance()->_sessions.keys()) + activeSessions << QVariant::fromValue(user); _storage->setCoreState(activeSessions); } } - void Core::restoreState() { if (!_configured) { - quWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); + qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!")); return; } if (_sessions.count()) { - quWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); return; } @@ -320,33 +320,41 @@ void Core::restoreState() /* 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) { - quWarning() << qPrintable(tr("Core state too old, ignoring...")); + qWarning() << qPrintable(tr("Core state too old, ignoring...")); return; } */ - const QList &activeSessionsFallback = 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..."; - for(auto &&v : activeSessions) { + qInfo() << "Restoring previous core state..."; + for (auto&& v : activeSessions) { UserId user = v.value(); sessionForUser(user, true); } } } - /*** Core Setup ***/ -QString Core::setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, 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, authenticator, authSetupData); } - -QString Core::setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, 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..."); @@ -359,9 +367,8 @@ QString Core::setupCore(const QString &adminUser, const QString &adminPassword, return tr("Could not setup storage!"); } - quInfo() << "Selected authenticator:" << authenticator; - if (!(_configured = initAuthenticator(authenticator, authSetupData, {}, false, true))) - { + qInfo() << "Selected authenticator:" << authenticator; + if (!(_configured = initAuthenticator(authenticator, authSetupData, {}, false, true))) { return tr("Could not setup authenticator!"); } } @@ -376,14 +383,13 @@ QString Core::setupCore(const QString &adminUser, const QString &adminPassword, } saveAuthenticatorSettings(authenticator, authSetupData); - quInfo() << qPrintable(tr("Creating admin user...")); + qInfo() << qPrintable(tr("Creating admin user...")); _storage->addUser(adminUser, adminPassword); cacheSysIdent(); - startListening(); // TODO check when we need this + startListening(); // TODO check when we need this return QString(); } - QString Core::setupCoreForInternalUsage() { Q_ASSERT(!_registeredStorageBackends.empty()); @@ -399,7 +405,6 @@ QString Core::setupCoreForInternalUsage() return setupCore("AdminUser", QString::number(pass), "SQLite", QVariantMap(), "Database", QVariantMap()); } - /*** Storage Handling ***/ template @@ -412,7 +417,6 @@ void Core::registerStorageBackend() backend->deleteLater(); } - void Core::registerStorageBackends() { if (_registeredStorageBackends.empty()) { @@ -421,22 +425,19 @@ void Core::registerStorageBackends() } } - -DeferredSharedPtr Core::storageBackend(const QString &backendId) const +DeferredSharedPtr Core::storageBackend(const QString& backendId) const { - auto it = std::find_if(_registeredStorageBackends.begin(), _registeredStorageBackends.end(), - [backendId](const DeferredSharedPtr &backend) { - return backend->displayName() == backendId; - }); + auto it = std::find_if(_registeredStorageBackends.begin(), + _registeredStorageBackends.end(), + [backendId](const DeferredSharedPtr& backend) { return backend->displayName() == backendId; }); return it != _registeredStorageBackends.end() ? *it : nullptr; } - -bool Core::initStorage(const QString &backend, const QVariantMap &settings, - const QProcessEnvironment &environment, bool loadFromEnvironment, bool setup) +bool Core::initStorage( + const QString& backend, const QVariantMap& settings, const QProcessEnvironment& environment, bool loadFromEnvironment, bool setup) { if (backend.isEmpty()) { - quWarning() << "No storage backend selected!"; + qWarning() << "No storage backend selected!"; return false; } @@ -446,7 +447,7 @@ bool Core::initStorage(const QString &backend, const QVariantMap &settings, return false; } - connect(storage.get(), SIGNAL(dbUpgradeInProgress(bool)), this, SIGNAL(dbUpgradeInProgress(bool))); + connect(storage.get(), &Storage::dbUpgradeInProgress, this, &Core::dbUpgradeInProgress); Storage::State storageState = storage->init(settings, environment, loadFromEnvironment); switch (storageState) { @@ -468,24 +469,21 @@ bool Core::initStorage(const QString &backend, const QVariantMap &settings, case Storage::IsReady: // delete all other backends _registeredStorageBackends.clear(); - connect(storage.get(), SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), - this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); + connect(storage.get(), &Storage::bufferInfoUpdated, this, &Core::bufferInfoUpdated); break; } _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()) @@ -495,7 +493,6 @@ bool Core::createNetwork(UserId user, NetworkInfo &info) return true; } - /*** Authenticators ***/ // Authentication handling, now independent from storage. @@ -509,7 +506,6 @@ void Core::registerAuthenticator() authenticator->deleteLater(); } - void Core::registerAuthenticators() { if (_registeredAuthenticators.empty()) { @@ -520,25 +516,23 @@ void Core::registerAuthenticators() } } - -DeferredSharedPtr Core::authenticator(const QString &backendId) const +DeferredSharedPtr Core::authenticator(const QString& backendId) const { - auto it = std::find_if(_registeredAuthenticators.begin(), _registeredAuthenticators.end(), - [backendId](const DeferredSharedPtr &authenticator) { + 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) +bool Core::initAuthenticator( + const QString& backend, const QVariantMap& settings, const QProcessEnvironment& environment, bool loadFromEnvironment, bool setup) { if (backend.isEmpty()) { - quWarning() << "No authenticator selected!"; + qWarning() << "No authenticator selected!"; return false; } @@ -574,37 +568,21 @@ bool Core::initAuthenticator(const QString &backend, const QVariantMap &settings 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() { -#ifdef HAVE_SSL - SslServer *sslServerv4 = qobject_cast(&_server); - bool retv4 = sslServerv4->reloadCerts(); - - SslServer *sslServerv6 = qobject_cast(&_v6server); - bool retv6 = sslServerv6->reloadCerts(); + bool retv4 = _server.reloadCerts(); + bool retv6 = _v6server.reloadCerts(); return retv4 && retv6; -#else - // SSL not supported, don't mark configuration reload as failed - return true; -#endif } - void Core::cacheSysIdent() { if (isConfigured()) { @@ -612,7 +590,6 @@ void Core::cacheSysIdent() } } - QString Core::strictSysIdent(UserId user) const { if (_authUserNames.contains(user)) { @@ -629,10 +606,9 @@ QString Core::strictSysIdent(UserId user) const // ...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? + 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 @@ -645,80 +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; @@ -730,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.")); @@ -759,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(); @@ -779,14 +743,13 @@ 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(); @@ -798,25 +761,22 @@ void Core::setupClientSession(RemotePeer *peer, UserId uid) 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 - SessionThread *session = sessionForUser(uid); + SessionThread* session = sessionForUser(uid); session->addClient(peer); } - void Core::connectInternalPeer(QPointer peer) { if (_initialized && peer) { @@ -827,7 +787,6 @@ void Core::connectInternalPeer(QPointer peer) } } - void Core::setupInternalClientSession(QPointer clientPeer) { if (!_configured) { @@ -844,27 +803,26 @@ void Core::setupInternalClientSession(QPointer clientPeer) uid = _storage->internalUser(); } else { - quWarning() << "Core::setupInternalClientSession(): You're trying to run monolithic Quassel with an unusable Backend! Go fix it!"; + 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) { - quWarning() << "Client peer went away, not starting a session"; + 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 = sessionForUser(uid); + SessionThread* sessionThread = sessionForUser(uid); sessionThread->addClient(corePeer); } - -SessionThread *Core::sessionForUser(UserId uid, bool restore) +SessionThread* Core::sessionForUser(UserId uid, bool restore) { if (_sessions.contains(uid)) return _sessions[uid]; @@ -872,74 +830,71 @@ SessionThread *Core::sessionForUser(UserId uid, bool restore) 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) { - quWarning() << QString("Socket error %1: %2").arg(err).arg(errorString); + qWarning() << QString("Socket error %1: %2").arg(err).arg(errorString); } - QVariantList Core::backendInfo() { instance()->registerStorageBackends(); QVariantList backendInfos; - for (auto &&backend : instance()->_registeredStorageBackends) { + for (auto&& backend : instance()->_registeredStorageBackends) { QVariantMap v; - v["BackendId"] = backend->backendId(); + v["BackendId"] = backend->backendId(); v["DisplayName"] = backend->displayName(); v["Description"] = backend->description(); - v["SetupData"] = backend->setupData(); // ignored by legacy clients + v["SetupData"] = backend->setupData(); // ignored by legacy clients // TODO Protocol Break: Remove legacy (cf. authenticatorInfo()) - const auto &setupData = backend->setupData(); + 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["SetupKeys"] = setupKeys; v["SetupDefaults"] = setupDefaults; // TODO Protocol Break: Remove - v["IsDefault"] = (backend->backendId() == "SQLite"); // newer clients will just use the first in the list + v["IsDefault"] = (backend->backendId() == "SQLite"); // newer clients will just use the first in the list backendInfos << v; } return backendInfos; } - QVariantList Core::authenticatorInfo() { instance()->registerAuthenticators(); QVariantList authInfos; - for(auto &&backend : instance()->_registeredAuthenticators) { + for (auto&& backend : instance()->_registeredAuthenticators) { QVariantMap v; - v["BackendId"] = backend->backendId(); + v["BackendId"] = backend->backendId(); v["DisplayName"] = backend->displayName(); v["Description"] = backend->description(); - v["SetupData"] = backend->setupData(); + 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(); 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(", ")); + 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; } @@ -951,27 +906,27 @@ bool Core::selectBackend(const QString &backend) if (!saveBackendSettings(backend, settings)) { qCritical() << qPrintable(QString("Could not save backend settings, probably a permission problem.")); } - quWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); - quWarning() << qPrintable(tr("Backend already initialized. Skipping Migration...")); + qWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); + qWarning() << qPrintable(tr("Backend already initialized. Skipping Migration...")); return true; case Storage::NotAvailable: qCritical() << qPrintable(tr("Storage backend is not available: %1").arg(backend)); return false; case Storage::NeedsSetup: if (!storage->setup(settings)) { - quWarning() << qPrintable(tr("Unable to setup storage backend: %1").arg(backend)); + qWarning() << qPrintable(tr("Unable to setup storage backend: %1").arg(backend)); return false; } if (storage->init(settings) != Storage::IsReady) { - quWarning() << qPrintable(tr("Unable to initialize storage backend: %1").arg(backend)); + qWarning() << 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.")); } - quWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); + qWarning() << qPrintable(tr("Switched storage backend to: %1").arg(backend)); break; } @@ -991,19 +946,19 @@ bool Core::selectBackend(const QString &backend) } return true; } - quWarning() << qPrintable(tr("Unable to migrate storage backend! (No migration writer for %1)").arg(backend)); + qWarning() << qPrintable(tr("Unable to migrate storage backend! (No migration writer for %1)").arg(backend)); return false; } // inform the user why we cannot merge if (!_storage) { - quWarning() << qPrintable(tr("No currently active storage backend. Skipping migration...")); + qWarning() << qPrintable(tr("No currently active storage backend. Skipping migration...")); } else if (!reader) { - quWarning() << qPrintable(tr("Currently active storage backend does not support migration: %1").arg(_storage->displayName())); + qWarning() << qPrintable(tr("Currently active storage backend does not support migration: %1").arg(_storage->displayName())); } if (writer) { - quWarning() << qPrintable(tr("New storage backend does not support migration: %1").arg(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/ @@ -1014,19 +969,19 @@ bool Core::selectBackend(const QString &backend) // 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) +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(", ")); + 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; } @@ -1036,31 +991,30 @@ bool Core::selectAuthenticator(const QString &backend) switch (state) { case Authenticator::IsReady: saveAuthenticatorSettings(backend, settings); - quWarning() << qPrintable(tr("Switched authenticator to: %1").arg(backend)); + 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)) { - quWarning() << qPrintable(tr("Unable to setup authenticator: %1").arg(backend)); + qWarning() << 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)); + qWarning() << qPrintable(tr("Unable to initialize authenticator: %1").arg(backend)); return false; } saveAuthenticatorSettings(backend, settings); - quWarning() << qPrintable(tr("Switched authenticator to: %1").arg(backend)); + qWarning() << qPrintable(tr("Switched authenticator to: %1").arg(backend)); } _authenticator = std::move(auther); return true; } - bool Core::createUser() { QTextStream out(stdout); @@ -1082,11 +1036,11 @@ bool Core::createUser() enableStdInEcho(); if (password != password2) { - quWarning() << "Passwords don't match!"; + qWarning() << "Passwords don't match!"; return false; } if (password.isEmpty()) { - quWarning() << "Password is empty!"; + qWarning() << "Password is empty!"; return false; } @@ -1095,13 +1049,12 @@ bool Core::createUser() return true; } else { - quWarning() << "Unable to add user:" << qPrintable(username); + qWarning() << "Unable to add user:" << qPrintable(username); return false; } } - -bool Core::changeUserPass(const QString &username) +bool Core::changeUserPass(const QString& username) { QTextStream out(stdout); QTextStream in(stdin); @@ -1130,11 +1083,11 @@ bool Core::changeUserPass(const QString &username) enableStdInEcho(); if (password != password2) { - quWarning() << "Passwords don't match!"; + qWarning() << "Passwords don't match!"; return false; } if (password.isEmpty()) { - quWarning() << "Password is empty!"; + qWarning() << "Password is empty!"; return false; } @@ -1143,13 +1096,12 @@ bool Core::changeUserPass(const QString &username) return true; } else { - quWarning() << "Failed to change password!"; + qWarning() << "Failed to change password!"; return false; } } - -bool Core::changeUserPassword(UserId userId, const QString &password) +bool Core::changeUserPassword(UserId userId, const QString& password) { if (!isConfigured() || !userId.isValid()) return false; @@ -1178,13 +1130,12 @@ bool Core::canChangeUserPassword(UserId userId) return true; } - -std::unique_ptr Core::getMigrationReader(Storage *storage) +std::unique_ptr Core::getMigrationReader(Storage* storage) { 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; @@ -1193,13 +1144,12 @@ std::unique_ptr Core::getMigrationReader(Storage *st return sqlStorage->createMigrationReader(); } - -std::unique_ptr Core::getMigrationWriter(Storage *storage) +std::unique_ptr Core::getMigrationWriter(Storage* storage) { 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; @@ -1208,8 +1158,7 @@ std::unique_ptr Core::getMigrationWriter(Storage *st return sqlStorage->createMigrationWriter(); } - -bool Core::saveBackendSettings(const QString &backend, const QVariantMap &settings) +bool Core::saveBackendSettings(const QString& backend, const QVariantMap& settings) { QVariantMap dbsettings; dbsettings["Backend"] = backend; @@ -1219,8 +1168,7 @@ bool Core::saveBackendSettings(const QString &backend, const QVariantMap &settin return s.sync(); } - -void Core::saveAuthenticatorSettings(const QString &backend, const QVariantMap &settings) +void Core::saveAuthenticatorSettings(const QString& backend, const QVariantMap& settings) { QVariantMap dbsettings; dbsettings["Authenticator"] = backend; @@ -1231,7 +1179,7 @@ void Core::saveAuthenticatorSettings(const QString &backend, const QVariantMap & // Generic version of promptForSettings that doesn't care what *type* of // backend it runs over. template -QVariantMap Core::promptForSettings(const Backend *backend) +QVariantMap Core::promptForSettings(const Backend* backend) { QVariantMap settings; const QVariantList& setupData = backend->setupData(); @@ -1245,7 +1193,7 @@ QVariantMap Core::promptForSettings(const Backend *backend) 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; + out << setupData[i + 1].toString() << " [" << setupData[i + 2].toString() << "]: " << flush; bool noEcho = key.toLower().contains("password"); if (noEcho) { @@ -1257,7 +1205,7 @@ QVariantMap Core::promptForSettings(const Backend *backend) enableStdInEcho(); } - QVariant value{setupData[i+2]}; + QVariant value{setupData[i + 2]}; if (!input.isEmpty()) { switch (value.type()) { case QVariant::Int: @@ -1272,7 +1220,6 @@ QVariantMap Core::promptForSettings(const Backend *backend) return settings; } - #ifdef Q_OS_WIN void Core::stdInEcho(bool on) {