-bool SslServer::setCertificate(const QString &path) {
- _certIsValid = false;
-
- if (path.isNull()) {
- return false;
- }
-
- QFile certFile(path);
- 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);
-
- 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;
- }
-
- return _certIsValid;
+
+bool SslServer::setCertificate(const QString &path, const QString &keyPath)
+{
+ _isCertValid = false;
+
+ if (path.isEmpty())
+ return false;
+
+ QFile certFile(path);
+ 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;
+ }
+
+ // load key from keyPath if it differs from path, otherwise load key from path
+ if(path != keyPath) {
+ QFile keyFile(keyPath);
+ if(!keyFile.exists()) {
+ quWarning() << "SslServer: Key file" << qPrintable(keyPath) << "does not exist";
+ return false;
+ }
+
+ if (!keyFile.open(QIODevice::ReadOnly)) {
+ quWarning()
+ << "SslServer: Failed to open key file" << qPrintable(keyPath)
+ << "error:" << keyFile.error();
+ return false;
+ }
+
+ _key = QSslKey(&keyFile, QSsl::Rsa);
+ keyFile.close();
+ } else {
+ _key = QSslKey(&certFile, QSsl::Rsa);
+ }
+
+ certFile.close();
+
+ if (_cert.isNull()) {
+ quWarning() << "SslServer:" << qPrintable(path) << "contains no certificate data";
+ return false;
+ }
+
+ // We allow the core to offer SSL anyway, so no "return false" here. Client will warn about the cert being invalid.
+ const QDateTime now = QDateTime::currentDateTime();
+ if (now < _cert.effectiveDate())
+ quWarning() << "SslServer: Certificate won't be valid before" << _cert.effectiveDate().toString();
+
+ else if (now > _cert.expiryDate())
+ quWarning() << "SslServer: Certificate expired on" << _cert.expiryDate().toString();
+
+ else { // Qt4's isValid() checks for time range and blacklist; avoid a double warning, hence the else block
+#if QT_VERSION < 0x050000
+ if (!_cert.isValid())
+#else
+ if (_cert.isBlacklisted())
+#endif
+ quWarning() << "SslServer: Certificate blacklisted";
+ }
+ if (_key.isNull()) {
+ quWarning() << "SslServer:" << qPrintable(keyPath) << "contains no key data";
+ return false;
+ }
+
+ _isCertValid = true;
+
+ return _isCertValid;