X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=4080f8141348aeb79d46d5eefcdafafa9d430de5;hp=203ec76115292f20da937ab744b1f21cece513a3;hb=a5455d1ea8785e864ce4b513e63283ed156d4872;hpb=ffcc8befd931340321e3aa2029cb5667373fd584

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 203ec761..4080f814 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -25,17 +25,26 @@
 #endif
 
 #include <QFile>
-#include <QDebug>
 
 #include "logger.h"
-#include "util.h"
+#include "quassel.h"
 
 #ifdef HAVE_SSL
 
 SslServer::SslServer(QObject *parent)
-  : QTcpServer(parent)
+  : QTcpServer(parent),
+  _isCertValid(false)
 {
-  setCertificate(quasselDir().absolutePath() + "/quasselCert.pem");
+  static bool sslWarningShown = false;
+  if(!setCertificate(Quassel::configDirPath() + "quasselCert.pem")) {
+    if(!sslWarningShown) {
+      quWarning()
+        << "SslServer: Unable to set certificate file\n"
+        << "          Quassel Core will still work, but cannot provide SSL for client connections.\n"
+        << "          Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
+      sslWarningShown=true;
+    }
+  }
 }
 
 QTcpSocket *SslServer::nextPendingConnection() {
@@ -48,9 +57,10 @@ QTcpSocket *SslServer::nextPendingConnection() {
 void SslServer::incomingConnection(int socketDescriptor) {
   QSslSocket *serverSocket = new QSslSocket(this);
   if(serverSocket->setSocketDescriptor(socketDescriptor)) {
-    if(certIsValid()) {
+    if(isCertValid()) {
       serverSocket->setLocalCertificate(_cert);
       serverSocket->setPrivateKey(_key);
+      serverSocket->addCaCertificates(_ca);
     }
     _pendingConnections << serverSocket;
     emit newConnection();
@@ -60,23 +70,61 @@ void SslServer::incomingConnection(int socketDescriptor) {
 }
 
 bool SslServer::setCertificate(const QString &path) {
+  _isCertValid = false;
+
+  if(path.isEmpty())
+    return false;
+
   QFile certFile(path);
-  certFile.open(QIODevice::ReadOnly);
-  _cert = QSslCertificate(&certFile);
-  certFile.close();
+  if(!certFile.exists()) {
+    quWarning() << "SslServer: Certificate file" << qPrintable(path) << "does not exist";
+    return false;
+  }
+
+  if(!certFile.open(QIODevice::ReadOnly)) {
+    quWarning()
+      << "SslServer: Failed to open certificate file" << qPrintable(path)
+      << "error:" << certFile.error();
+    return false;
+  }
+
+  QList<QSslCertificate> certList = QSslCertificate::fromDevice(&certFile);
+
+  if (certList.isEmpty()) {
+    quWarning() << "SslServer: Certificate file doesn't contain a certificate";
+    return false;
+  }
+
+  _cert = certList[0];
+  certList.removeFirst(); // remove server cert
+
+  // store CA and intermediates certs
+  _ca = certList;
+
+  if(!certFile.reset()) {
+    quWarning() << "SslServer: IO error reading certificate file";
+    return false;
+  }
 
-  certFile.open(QIODevice::ReadOnly);
   _key = QSslKey(&certFile, QSsl::Rsa);
   certFile.close();
 
-  _certIsValid = !_cert.isNull() && _cert.isValid() && !_key.isNull();
-  if(!_certIsValid) {
-    qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n"
-               << "          Quassel Core will still work, but cannot provide SSL for client connections.\n"
-               << "          Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
+  if(_cert.isNull()) {
+    quWarning() << "SslServer:" << qPrintable(path) << "contains no certificate data";
+    return false;
+  }
+  if(!_cert.isValid()) {
+    quWarning() << "SslServer: Invalid certificate";
+    return false;
   }
+  if(_key.isNull()) {
+    quWarning() << "SslServer:" << qPrintable(path) << "contains no key data";
+    return false;
+  }
+
+  _isCertValid = true;
 
-  return _certIsValid;
+  return _isCertValid;
 }
 
 #endif // HAVE_SSL