mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

csync: Put up the QNAM key chain for comparison

Browse Source 
Comparing with the CA certs will not help with
intermediates, and other cases.
This commit is contained in:
Daniel Molkentin 2013-01-21 13:29:17 +01:00
parent 0171b8b998
commit 7794480da0
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mirall/csyncthread.cpp
View File

@ -18,6 +18,7 @@
#include "mirall/theme.h"
#include "mirall/logger.h"
#include "mirall/utility.h"
#include "mirall/owncloudinfo.h"
#ifdef Q_OS_WIN
#include <windows.h>
@ -446,11 +447,10 @@ int CSyncThread::getauth(const char *prompt,
int pos = 0;
// IF we had a cert ack'ed by the user, it was added to the Qt default
// CA Cert list. So we get the list of certs to check against from
// Qt.
QList<QSslCertificate> certs = QSslSocket::defaultCaCertificates();
// This is the set of certificates which QNAM accepted, so we should accept
// them as well
QList<QSslCertificate> certs = ownCloudInfo::instance()->certificateChain();
while (!certOk && (pos = regexp.indexIn(qPrompt, 1+pos)) != -1) {
QString neon_fingerprint = regexp.cap(1);

8
src/mirall/owncloudinfo.cpp
View File

@ -263,6 +263,11 @@ QString ownCloudInfo::configHandle(QNetworkReply *reply)
return configHandle;
}
QList<QSslCertificate> ownCloudInfo::certificateChain() const
{
return _certificateChain;
}
QUrl ownCloudInfo::redirectUrl(const QUrl& possibleRedirectUrl,
const QUrl& oldRedirectUrl) const {
QUrl redirectUrl;
@ -285,6 +290,9 @@ QUrl ownCloudInfo::redirectUrl(const QUrl& possibleRedirectUrl,
void ownCloudInfo::slotReplyFinished()
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
if (reply->header(QNetworkRequest::LocationHeader).toUrl().scheme() == QLatin1String("https"))
_certificateChain = reply->sslConfiguration().peerCertificateChain();
if( ! reply ) {
qDebug() << "ownCloudInfo: Reply empty!";

7
src/mirall/owncloudinfo.h
View File

@ -83,6 +83,12 @@ public:
*/
QString configHandle(QNetworkReply *reply = 0);
/**
* Certificate chain of the connection est. with ownCloud.
* Empty if the connection is HTTP-based
*/
QList<QSslCertificate> certificateChain() const;
signals:
// result signal with url- and version string.
void ownCloudInfoFound( const QString&, const QString&, const QString&, const QString& );
@ -129,6 +135,7 @@ private:
QUrl _urlRedirectedTo;
QHash<QNetworkReply*, QString> _directories;
QHash<QNetworkReply*, QString> _configHandleMap;
QList<QSslCertificate> _certificateChain;
bool _certsUntrusted;
int _authAttempts;
};