X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=8e91ddd317c7fa6f965e7458de85c5bbb9ee6893;hb=8efbb2ef22f5f007b5dc6d5b15ecf070ccef08ca;hp=50b548c779dd3d8910ea642cd57cd76f5e6c74f5;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 50b548c7..8e91ddd3 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,46 +15,69 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SSLSERVER_H
-#define SSLSERVER_H
+#pragma once
 
 #ifdef HAVE_SSL
 
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QTcpServer>
-#include <QLinkedList>
+#    include <QFile>
+#    include <QLinkedList>
+#    include <QSslCertificate>
+#    include <QSslKey>
+#    include <QTcpServer>
 
 class SslServer : public QTcpServer
 {
     Q_OBJECT
 
 public:
-    SslServer(QObject *parent = 0);
+    SslServer(QObject* parent = nullptr);
 
-    virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
-    virtual QTcpSocket *nextPendingConnection();
+    bool hasPendingConnections() const override { return !_pendingConnections.isEmpty(); }
+    QTcpSocket* nextPendingConnection() override;
 
-    virtual inline const QSslCertificate &certificate() const { return _cert; }
-    virtual inline const QSslKey &key() const { return _key; }
-    virtual inline bool isCertValid() const { return _isCertValid; }
+    const QSslCertificate& certificate() const { return _cert; }
+    const QSslKey& key() const { return _key; }
+    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:
-    virtual void incomingConnection(int socketDescriptor);
-    virtual bool setCertificate(const QString &path);
+    void incomingConnection(qintptr socketDescriptor) override;
+
+    bool setCertificate(const QString& path, const QString& keyPath);
 
 private:
-    QLinkedList<QTcpSocket *> _pendingConnections;
+    /**
+     * 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;
-};
-
+    bool _isCertValid{false};
 
-#endif //HAVE_SSL
+    // 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)
+};
 
-#endif //SSLSERVER_H
+#endif  // HAVE_SSL