mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

SslButton: Improve reliability and usefulness #3534 #3536

Browse source
This commit is contained in:
Markus Goetz 2015-08-05 12:58:04 +02:00
parent 38da1b7de1
commit 9a9cefbcc5
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/sslbutton.cpp
View file

@ -208,6 +208,17 @@ void SslButton::slotUpdateMenu() {
AccountPtr account = _accountState->account();
if (account->url().scheme() == QLatin1String("https")) {
QString sslVersion = account->sslConfiguration().sessionCipher().protocolString()
+ ", " + account->sslConfiguration().sessionCipher().authenticationMethod()
+ ", " + account->sslConfiguration().sessionCipher().keyExchangeMethod()
+ ", " + account->sslConfiguration().sessionCipher().encryptionMethod();
_menu->addAction(sslVersion)->setEnabled(false);
#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
if (account->sslConfiguration().sessionTicket().isEmpty()) {
_menu->addAction(tr("No support for SSL session tickets/identifiers"))->setEnabled(false);
}
#endif
QList<QSslCertificate> chain = account->sslConfiguration().peerCertificateChain();

10
src/libsync/networkjobs.cpp
View file

@ -361,6 +361,7 @@ void CheckServerJob::start()
{
setReply(getRequest(path()));
setupConnections(reply());
connect(reply(), SIGNAL(metaDataChanged()), this, SLOT(metaDataChangedSlot()));
AbstractNetworkJob::start();
}
@ -390,10 +391,15 @@ bool CheckServerJob::installed(const QVariantMap &info)
return info.value(QLatin1String("installed")).toBool();
}
void CheckServerJob::metaDataChangedSlot()
{
// We used to have this in finished(), but because of a bug in Qt this did not always have the cipher etc.
account()->setSslConfiguration(reply()->sslConfiguration());
}
bool CheckServerJob::finished()
{
account()->setSslConfiguration(reply()->sslConfiguration());
#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
if (reply()->request().url().scheme() == QLatin1String("https")
&& reply()->sslConfiguration().sessionTicket().isEmpty()

1
src/libsync/networkjobs.h
View file

@ -166,6 +166,7 @@ signals:
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual void slotTimeout() Q_DECL_OVERRIDE;
virtual void metaDataChangedSlot();
private:
bool _subdirFallback;