X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=021d9c94164963b5160ce9c02b2641b903b50e3a;hp=98e2612e7e3c8ae148b98b755a4678052de5e335;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=c382e0c11f80fb37307ecc42c487aa433c97ad8c diff --git a/src/core/core.h b/src/core/core.h index 98e2612e..021d9c94 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -39,31 +40,40 @@ #include "authenticator.h" #include "bufferinfo.h" #include "deferredptr.h" +#include "identserver.h" #include "message.h" #include "oidentdconfiggenerator.h" #include "sessionthread.h" +#include "singleton.h" #include "storage.h" #include "types.h" class CoreAuthHandler; class CoreSession; -struct NetworkInfo; +class InternalPeer; class SessionThread; class SignalProxy; +struct NetworkInfo; + class AbstractSqlMigrationReader; class AbstractSqlMigrationWriter; -class Core : public QObject +class Core : public QObject, public Singleton { Q_OBJECT public: - static Core *instance(); - static void destroy(); + Core(); + ~Core() override; + + void init(); + + /** + * Shuts down active core sessions, saves state and emits the shutdownComplete() signal afterwards. + */ + void shutdown(); - static void saveState(); - static void restoreState(); /*** Storage access ***/ // These methods are threadsafe. @@ -429,6 +439,22 @@ public: } + //! Request a certain number messages stored in a given buffer, matching certain filters + /** \param buffer The buffer we request messages from + * \param first if != -1 return only messages with a MsgId >= first + * \param last if != -1 return only messages with a MsgId < last + * \param limit if != -1 limit the returned list to a max of \limit entries + * \param type The Message::Types that should be returned + * \return The requested list of messages + */ + static inline QList requestMsgsFiltered(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, + int limit = -1, Message::Types type = Message::Types{-1}, + Message::Flags flags = Message::Flags{-1}) + { + return instance()->_storage->requestMsgsFiltered(user, bufferId, first, last, limit, type, flags); + } + + //! Request a certain number of messages across all buffers /** \param first if != -1 return only messages with a MsgId >= first * \param last if != -1 return only messages with a MsgId < last @@ -441,6 +467,21 @@ public: } + //! Request a certain number of messages across all buffers, matching certain filters + /** \param first if != -1 return only messages with a MsgId >= first + * \param last if != -1 return only messages with a MsgId < last + * \param limit Max amount of messages + * \param type The Message::Types that should be returned + * \return The requested list of messages + */ + static inline QList requestAllMsgsFiltered(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1, + Message::Types type = Message::Types{-1}, + Message::Flags flags = Message::Flags{-1}) + { + return instance()->_storage->requestAllMsgsFiltered(user, first, last, limit, type, flags); + } + + //! Request a list of all buffers known to a user. /** This method is used to get a list of all buffers we have stored a backlog from. * \note This method is threadsafe. @@ -520,13 +561,6 @@ public: 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 @@ -606,38 +640,63 @@ public: return instance()->_storage->bufferActivity(bufferId, lastSeenMsgId); } + //! Update the highlight count for a Buffer + /** This Method is used to make the highlight count state of a Buffer persistent + * \note This method is threadsafe. + * + * \param user The Owner of that Buffer + * \param bufferId The buffer id + * \param MsgId The Message id where the marker line should be placed + */ + static inline void setHighlightCount(UserId user, BufferId bufferId, int highlightCount) { + return instance()->_storage->setHighlightCount(user, bufferId, highlightCount); + } + + + //! Get a Hash of all highlight count states + /** This Method is called when the Quassel Core is started to restore the highlight count + * \note This method is threadsafe. + * + * \param user The Owner of the buffers + */ + static inline QHash highlightCounts(UserId user) { + return instance()->_storage->highlightCounts(user); + } + //! Get the highlight count states for a buffer + /** This method is used to load the highlight count of a buffer when its last seen message changes. + * \note This method is threadsafe. + * + * \param bufferId The buffer + * \param lastSeenMsgId The last seen message + */ + static inline int highlightCount(BufferId bufferId, MsgId lastSeenMsgId) { + return instance()->_storage->highlightCount(bufferId, lastSeenMsgId); + } + static inline QDateTime startTime() { return instance()->_startTime; } static inline bool isConfigured() { return instance()->_configured; } - static bool sslSupported(); /** - * Reloads SSL certificates used for connection with clients + * Whether or not strict ident mode is enabled, locking users' idents to Quassel username * - * @return True if certificates reloaded successfully, otherwise false. + * @return True if strict mode enabled, otherwise false */ - static bool reloadCerts(); + static inline bool strictIdentEnabled() { return instance()->_strictIdentEnabled; } - static void cacheSysIdent(); + static bool sslSupported(); 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); @@ -645,8 +704,39 @@ signals: //! 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); + + //! Emitted once core shutdown is complete + void shutdownComplete(); + +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 peer); + protected: - virtual void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private slots: bool startListening(); @@ -654,24 +744,26 @@ private slots: void incomingConnection(); void clientDisconnected(); - bool initStorage(const QString &backend, const QVariantMap &settings, bool setup = false); - bool initAuthenticator(const QString &backend, const QVariantMap &settings, bool setup = false); + bool initStorage(const QString &backend, const QVariantMap &settings, + const QProcessEnvironment &environment, bool loadFromEnvironment, + bool setup = false); + bool initAuthenticator(const QString &backend, const QVariantMap &settings, + const QProcessEnvironment &environment, bool loadFromEnvironment, + bool setup = false); void socketError(QAbstractSocket::SocketError err, const QString &errorString); void setupClientSession(RemotePeer *, UserId); bool changeUserPass(const QString &username); -private: - Core(); - ~Core(); - void init(); - static Core *instanceptr; + void onSessionShutdown(SessionThread *session); +private: SessionThread *sessionForUser(UserId userId, bool restoreState = false); void addClientHelper(RemotePeer *peer, UserId uid); //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); QString setupCoreForInternalUsage(); + void setupInternalClientSession(QPointer peer); bool createUser(); @@ -693,17 +785,22 @@ private: bool saveBackendSettings(const QString &backend, const QVariantMap &settings); void saveAuthenticatorSettings(const QString &backend, const QVariantMap &settings); + void saveState(); + void restoreState(); + template QVariantMap promptForSettings(const Backend *backend); private: + static Core *_instance; QSet _connectingClients; QHash _sessions; DeferredSharedPtr _storage; ///< Active storage backend DeferredSharedPtr _authenticator; ///< Active authenticator - QTimer _storageSyncTimer; QMap _authUserNames; + QTimer _storageSyncTimer; + #ifdef HAVE_SSL SslServer _server, _v6server; #else @@ -717,7 +814,15 @@ private: QDateTime _startTime; - bool _configured; + IdentServer *_identServer {nullptr}; + + bool _initialized{false}; + bool _configured{false}; + + QPointer _pendingInternalConnection; + + /// Whether or not strict ident mode is enabled, locking users' idents to Quassel username + bool _strictIdentEnabled; static std::unique_ptr getMigrationReader(Storage *storage); static std::unique_ptr getMigrationWriter(Storage *storage);