X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=16ab183bd3e33495ce6fe72e49b872832e6272d6;hb=e212eabe53878a8fa6ecb15909a325ed7dd63283;hp=c2644531a4ce7c0490602d7b9bb46d64031ce7ac;hpb=c1572b1c1d6effb21083c6b09f08b30824827a98;p=quassel.git

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index c2644531..16ab183b 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 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  *
@@ -27,6 +27,7 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QLinkedList>
+#include <QFile>
 
 class SslServer : public QTcpServer
 {
@@ -42,6 +43,16 @@ public:
     virtual inline const QSslKey &key() const { return _key; }
     virtual inline bool isCertValid() const { return _isCertValid; }
 
+    /**
+     * Reloads SSL certificates used for connections
+     *
+     * If this command fails, it will try to maintain the most recent working certificate.  Error
+     * conditions are automatically written to the log.
+     *
+     * @return True if certificates reloaded successfully, otherwise false.
+     */
+    bool reloadCerts();
+
 protected:
 #if QT_VERSION >= 0x050000
     virtual void incomingConnection(qintptr socketDescriptor);
@@ -49,14 +60,29 @@ protected:
     virtual void incomingConnection(int socketDescriptor);
 #endif
 
-    virtual bool setCertificate(const QString &path);
+    virtual bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
+    /**
+     * Loads SSL certificates used for connections
+     *
+     * If this command fails, it will try to maintain the most recent working certificate.  Will log
+     * specific failure points, but does not offer verbose guidance.
+     *
+     * @return True if certificates loaded successfully, otherwise false.
+     */
+    bool loadCerts();
+    QSslKey loadKey(QFile *keyFile);
+
     QLinkedList<QTcpSocket *> _pendingConnections;
     QSslCertificate _cert;
     QSslKey _key;
     QList<QSslCertificate> _ca;
     bool _isCertValid;
+
+    // Used when reloading certificates later
+    QString _sslCertPath; /// Path to the certificate file
+    QString _sslKeyPath;  /// Path to the private key file (may be in same file as above)
 };