#include <vector>
#include <QDateTime>
+#include <QPointer>
#include <QString>
#include <QVariant>
#include <QTimer>
#include "authenticator.h"
#include "bufferinfo.h"
#include "deferredptr.h"
+#include "identserver.h"
#include "message.h"
#include "oidentdconfiggenerator.h"
#include "sessionthread.h"
class CoreAuthHandler;
class CoreSession;
-struct NetworkInfo;
+class InternalPeer;
class SessionThread;
class SignalProxy;
+struct NetworkInfo;
+
class AbstractSqlMigrationReader;
class AbstractSqlMigrationWriter;
public:
static Core *instance();
- static void destroy();
- static void saveState();
- static void restoreState();
+ Core();
+ ~Core() override;
+
+ void init();
/*** Storage access ***/
// These methods are threadsafe.
return instance()->_storage->setBufferLastSeenMsg(user, bufferId, msgId);
}
- //! Get the auth username associated with a userId
- /** \param user The user to retrieve the username for
- * \return The username for the user
- */
- static inline QString getAuthUserName(UserId user) {
- return instance()->_storage->getAuthUserName(user);
- }
//! Get a usable sysident for the given user in oidentd-strict mode
/** \param user The user to retrieve the sysident for
static bool sslSupported();
- /**
- * Reloads SSL certificates used for connection with clients
- *
- * @return True if certificates reloaded successfully, otherwise false.
- */
- static bool reloadCerts();
-
- static void cacheSysIdent();
-
static QVariantList backendInfo();
static QVariantList authenticatorInfo();
static QString setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, const QVariantMap &authSetupMap);
- static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
+ static inline QTimer *syncTimer() { return &instance()->_storageSyncTimer; }
inline OidentdConfigGenerator *oidentdConfigGenerator() const { return _oidentdConfigGenerator; }
+ inline IdentServer *identServer() const { return _identServer; }
static const int AddClientEventId;
-public slots:
- //! Make storage data persistent
- /** \note This method is threadsafe.
- */
- void syncStorage();
- void setupInternalClientSession(InternalPeer *clientConnection);
- QString setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, const QVariantMap &authSetupMap);
-
signals:
//! Sent when a BufferInfo is updated in storage.
void bufferInfoUpdated(UserId user, const BufferInfo &info);
//! Relay from CoreSession::sessionState(). Used for internal connection only
void sessionState(const Protocol::SessionState &sessionState);
+ //! Emitted when database schema upgrade starts or ends
+ void dbUpgradeInProgress(bool inProgress);
+
+ //! Emitted when a fatal error was encountered during async initialization
+ void exitRequested(int exitCode, const QString &reason);
+
+public slots:
+ void initAsync();
+
+ /** Persist storage.
+ *
+ * @note This method is threadsafe.
+ */
+ void syncStorage();
+
+ /**
+ * Reload SSL certificates used for connection with clients.
+ *
+ * @return True if certificates reloaded successfully, otherwise false.
+ */
+ bool reloadCerts();
+
+ void cacheSysIdent();
+
+ QString setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, const QVariantMap &authSetupMap);
+
+ void connectInternalPeer(QPointer<InternalPeer> peer);
+
protected:
- virtual void customEvent(QEvent *event);
+ void customEvent(QEvent *event) override;
private slots:
bool startListening();
bool changeUserPass(const QString &username);
private:
- Core();
- ~Core();
- void init();
- static Core *instanceptr;
-
SessionThread *sessionForUser(UserId userId, bool restoreState = false);
void addClientHelper(RemotePeer *peer, UserId uid);
//void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
QString setupCoreForInternalUsage();
+ void setupInternalClientSession(QPointer<InternalPeer> peer);
bool createUser();
bool saveBackendSettings(const QString &backend, const QVariantMap &settings);
void saveAuthenticatorSettings(const QString &backend, const QVariantMap &settings);
+ void saveState();
+ void restoreState();
+
template<typename Backend>
QVariantMap promptForSettings(const Backend *backend);
private:
+ static Core *_instance;
QSet<CoreAuthHandler *> _connectingClients;
QHash<UserId, SessionThread *> _sessions;
DeferredSharedPtr<Storage> _storage; ///< Active storage backend
DeferredSharedPtr<Authenticator> _authenticator; ///< Active authenticator
- QTimer _storageSyncTimer;
QMap<UserId, QString> _authUserNames;
+ QTimer _storageSyncTimer;
+
#ifdef HAVE_SSL
SslServer _server, _v6server;
#else
QDateTime _startTime;
- bool _configured;
+ IdentServer *_identServer {nullptr};
+
+ bool _initialized{false};
+ bool _configured{false};
+
+ QPointer<InternalPeer> _pendingInternalConnection;
/// Whether or not strict ident mode is enabled, locking users' idents to Quassel username
bool _strictIdentEnabled;