X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=1f43cc439e226243cd30e561d2676ebdc1d4cd77;hp=de6030a60c3bfc531d0c5eae174c5bc1cc9981b5;hb=25a3ae50ac0d9835283e4f5f10fcfcc10ed5575d;hpb=0d1c69845ac719c526b108cb3cae94d58d50ec65

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index de6030a6..1f43cc43 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,42 +15,75 @@
  *   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 QT_NO_OPENSSL
-
 #ifndef SSLSERVER_H
 #define SSLSERVER_H
 
-#include <QTcpServer>
-#include <QLinkedList>
+#ifdef HAVE_SSL
+
 #include <QSslCertificate>
 #include <QSslKey>
+#include <QTcpServer>
+#include <QLinkedList>
 
-class SslServer : public QTcpServer {
-  Q_OBJECT
+class SslServer : public QTcpServer
+{
+    Q_OBJECT
 
 public:
-  SslServer(QObject *parent = 0);
+    SslServer(QObject *parent = 0);
+
+    virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
+    virtual QTcpSocket *nextPendingConnection();
 
-  virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
-  virtual QTcpSocket *nextPendingConnection();
+    virtual inline const QSslCertificate &certificate() const { return _cert; }
+    virtual inline const QSslKey &key() const { return _key; }
+    virtual inline bool isCertValid() const { return _isCertValid; }
 
-  virtual inline const QSslCertificate &certificate() const { return _cert; }
-  virtual inline const QSslKey &key() const { return _key; }
-  virtual inline bool certIsValid() const { return _certIsValid; }
+    /**
+     * 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);
+#if QT_VERSION >= 0x050000
+    virtual void incomingConnection(qintptr socketDescriptor);
+#else
+    virtual void incomingConnection(int socketDescriptor);
+#endif
+
+    virtual bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
-  QLinkedList<QTcpSocket *> _pendingConnections;
-  QSslCertificate _cert;
-  QSslKey _key;
-  bool _certIsValid;
+    /**
+     * 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();
+
+    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)
 };
 
-#endif //SSLSERVER_H
 
-#endif //QT_NO_OPENSSL
+#endif //HAVE_SSL
+
+#endif //SSLSERVER_H