X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=2557f2ff854c3414e6ce3bdeb8cbdc7b2a534616;hp=570957da99c22cba0a3f45ba286ebca2db34bb63;hb=5dafdaccc84bc3fa0a9fafa7c594e08a58aa02d4;hpb=c45d822706b8e638b65bc8b57b18aaf0555d6e05

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 570957da..2557f2ff 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -62,22 +62,46 @@ void SslServer::incomingConnection(int socketDescriptor) {
 bool SslServer::setCertificate(const QString &path) {
   _certIsValid = false;
 
+  if (path.isNull()) {
+    return false;
+  }
+
   QFile certFile(path);
-  certFile.open(QIODevice::ReadOnly);
+  if (! certFile.exists()) {
+    qWarning() << "SslServer: Certificate file" << qPrintable(path) << "does not exist";
+    return false;
+  }
+
+  if (! certFile.open(QIODevice::ReadOnly)) {
+    qWarning()
+      << "SslServer: Failed to open certificate file" << qPrintable(path)
+      << "error:" << certFile.error();
+    return false;
+  }
   _cert = QSslCertificate(&certFile);
-  certFile.close();
 
-  certFile.open(QIODevice::ReadOnly);
+  if (! certFile.reset()) {
+    qWarning() << "SslServer: IO error reading certificate file";
+    return false;
+  }
+
   _key = QSslKey(&certFile, QSsl::Rsa);
   certFile.close();
 
-  if(_cert.isNull() || !_cert.isValid() || _key.isNull()) {
-    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.";
-  } else {
-    _certIsValid = true;
+  if (_cert.isNull()) {
+    qWarning() << "SslServer:" << qPrintable(path) << "contains no certificate data";
+    return false;
   }
+  if (! _cert.isValid()) {
+    qWarning() << "SslServer: Invalid certificate";
+    return false;
+  }
+  if (_key.isNull()) {
+    qWarning() << "SslServer:" << qPrintable(path) << "contains no key data";
+    return false;
+  }
+
+  _certIsValid = true;
 
   return _certIsValid;
 }