X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=eead9bfeda7c6a2baa398adab2cc00f49dfdd58a;hp=2b63abd7feab3c559fa7bf8ad7b752a5328cb9db;hb=HEAD;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 2b63abd7..4997daae 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,48 +18,65 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SSLSERVER_H
-#define SSLSERVER_H
-
-#ifdef HAVE_SSL
+#pragma once
 
+#include <QFile>
 #include <QSslCertificate>
 #include <QSslKey>
 #include <QTcpServer>
-#include <QLinkedList>
+
+#include "metricsserver.h"
 
 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();
+    const QSslCertificate& certificate() const { return _cert; }
+    const QSslKey& key() const { return _key; }
+    bool isCertValid() const { return _isCertValid; }
 
-    virtual inline const QSslCertificate &certificate() const { return _cert; }
-    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();
+
+    void setMetricsServer(MetricsServer* metricsServer);
 
 protected:
-#if QT_VERSION >= 0x050000
-    virtual void incomingConnection(qintptr socketDescriptor);
-#else
-    virtual void incomingConnection(int socketDescriptor);
-#endif
+    void incomingConnection(qintptr socketDescriptor) override;
 
-    virtual bool setCertificate(const QString &path, const QString &keyPath);
+    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);
+
+    MetricsServer* _metricsServer{nullptr};
+
     QSslCertificate _cert;
     QSslKey _key;
     QList<QSslCertificate> _ca;
-    bool _isCertValid;
-};
+    bool _isCertValid{false};
 
+    // 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 //HAVE_SSL
-
-#endif //SSLSERVER_H
+    QDateTime _certificateExpires;
+};