1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QSslSocket: clean up

Browse Source 
- port Q_FOREACH to C++11 range-for
- port use of inefficient QLists to QVector
- port from QSharedPointer to auto variables except where the
  payload is returned from a function (there ported to
  QSharedPointer::create())

Fixes errors pointed out by my tree's static checks.

In sslErrors(), fixed an unwanted double-detach problem by
adding a strategic qAsConst().

Change-Id: I8148e23b73337f6f1a721e009f2974536d8447cc
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
This commit is contained in:
Marc Mutz 2016-08-05 10:04:11 +03:00
parent 4c27221295
commit 2f108fafe9
1 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -57,7 +57,7 @@
#include "private/qsslconfiguration_p.h" #include "private/qsslconfiguration_p.h"
Q_DECLARE_METATYPE(QSslSocket::SslMode) Q_DECLARE_METATYPE(QSslSocket::SslMode)
typedef QList<QSslError::SslError> SslErrorList; typedef QVector<QSslError::SslError> SslErrorList;
Q_DECLARE_METATYPE(SslErrorList) Q_DECLARE_METATYPE(SslErrorList)
Q_DECLARE_METATYPE(QSslError) Q_DECLARE_METATYPE(QSslError)
Q_DECLARE_METATYPE(QSslKey) Q_DECLARE_METATYPE(QSslKey)
@ -386,14 +386,14 @@ void tst_QSslSocket::cleanup()
#ifndef QT_NO_SSL #ifndef QT_NO_SSL
QSslSocketPtr tst_QSslSocket::newSocket() QSslSocketPtr tst_QSslSocket::newSocket()
{ {
QSslSocket *socket = new QSslSocket; const auto socket = QSslSocketPtr::create();
proxyAuthCalled = 0; proxyAuthCalled = 0;
connect(socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), connect(socket.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
Qt::DirectConnection); Qt::DirectConnection);
return QSslSocketPtr(socket); return socket;
} }
#endif #endif
@ -633,7 +633,8 @@ void tst_QSslSocket::sslErrors()
// check the SSL errors contain HostNameMismatch and an error due to // check the SSL errors contain HostNameMismatch and an error due to
// the certificate being self-signed // the certificate being self-signed
SslErrorList sslErrors; SslErrorList sslErrors;
foreach (const QSslError &err, socket->sslErrors()) const auto socketSslErrors = socket->sslErrors();
for (const QSslError &err : socketSslErrors)
sslErrors << err.error(); sslErrors << err.error();
qSort(sslErrors); qSort(sslErrors);
QVERIFY(sslErrors.contains(QSslError::HostNameMismatch)); QVERIFY(sslErrors.contains(QSslError::HostNameMismatch));
@ -642,7 +643,8 @@ void tst_QSslSocket::sslErrors()
// check the same errors were emitted by sslErrors // check the same errors were emitted by sslErrors
QVERIFY(!sslErrorsSpy.isEmpty()); QVERIFY(!sslErrorsSpy.isEmpty());
SslErrorList emittedErrors; SslErrorList emittedErrors;
foreach (const QSslError &err, qvariant_cast<QList<QSslError> >(sslErrorsSpy.first().first())) const auto sslErrorsSpyErrors = qvariant_cast<QList<QSslError> >(qAsConst(sslErrorsSpy).first().first());
for (const QSslError &err : sslErrorsSpyErrors)
emittedErrors << err.error(); emittedErrors << err.error();
qSort(emittedErrors); qSort(emittedErrors);
QCOMPARE(sslErrors, emittedErrors); QCOMPARE(sslErrors, emittedErrors);
@ -651,7 +653,7 @@ void tst_QSslSocket::sslErrors()
QVERIFY(!peerVerifyErrorSpy.isEmpty()); QVERIFY(!peerVerifyErrorSpy.isEmpty());
SslErrorList peerErrors; SslErrorList peerErrors;
const QList<QVariantList> &peerVerifyList = peerVerifyErrorSpy; const QList<QVariantList> &peerVerifyList = peerVerifyErrorSpy;
foreach (const QVariantList &args, peerVerifyList) for (const QVariantList &args : peerVerifyList)
peerErrors << qvariant_cast<QSslError>(args.first()).error(); peerErrors << qvariant_cast<QSslError>(args.first()).error();
qSort(peerErrors); qSort(peerErrors);
QCOMPARE(sslErrors, peerErrors); QCOMPARE(sslErrors, peerErrors);
@ -1261,8 +1263,8 @@ void tst_QSslSocket::protocolServerSide()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
QFETCH(QSsl::SslProtocol, clientProtocol); QFETCH(QSsl::SslProtocol, clientProtocol);
socket->setProtocol(clientProtocol); socket->setProtocol(clientProtocol);
// upon SSL wrong version error, error will be triggered, not sslErrors // upon SSL wrong version error, error will be triggered, not sslErrors
@ -1270,14 +1272,14 @@ void tst_QSslSocket::protocolServerSide()
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QFETCH(bool, works); QFETCH(bool, works);
QAbstractSocket::SocketState expectedState = (works) ? QAbstractSocket::ConnectedState : QAbstractSocket::UnconnectedState; QAbstractSocket::SocketState expectedState = (works) ? QAbstractSocket::ConnectedState : QAbstractSocket::UnconnectedState;
QCOMPARE(int(client->state()), int(expectedState)); QCOMPARE(int(client.state()), int(expectedState));
QCOMPARE(client->isEncrypted(), works); QCOMPARE(client.isEncrypted(), works);
} }
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
@ -1302,8 +1304,8 @@ void tst_QSslSocket::serverCipherPreferences()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
socket->setCiphers("AES256-SHA:AES128-SHA"); socket->setCiphers("AES256-SHA:AES128-SHA");
// upon SSL wrong version error, error will be triggered, not sslErrors // upon SSL wrong version error, error will be triggered, not sslErrors
@ -1311,12 +1313,12 @@ void tst_QSslSocket::serverCipherPreferences()
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QVERIFY(client->isEncrypted()); QVERIFY(client.isEncrypted());
QCOMPARE(client->sessionCipher().name(), QString("AES128-SHA")); QCOMPARE(client.sessionCipher().name(), QString("AES128-SHA"));
} }
{ {
@ -1331,8 +1333,8 @@ void tst_QSslSocket::serverCipherPreferences()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
socket->setCiphers("AES256-SHA:AES128-SHA"); socket->setCiphers("AES256-SHA:AES128-SHA");
// upon SSL wrong version error, error will be triggered, not sslErrors // upon SSL wrong version error, error will be triggered, not sslErrors
@ -1340,12 +1342,12 @@ void tst_QSslSocket::serverCipherPreferences()
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QVERIFY(client->isEncrypted()); QVERIFY(client.isEncrypted());
QCOMPARE(client->sessionCipher().name(), QString("AES256-SHA")); QCOMPARE(client.sessionCipher().name(), QString("AES256-SHA"));
} }
} }
@ -1436,21 +1438,21 @@ void tst_QSslSocket::setSocketDescriptor()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data();; socket = &client;
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QCOMPARE(client->state(), QAbstractSocket::ConnectedState); QCOMPARE(client.state(), QAbstractSocket::ConnectedState);
QVERIFY(client->isEncrypted()); QVERIFY(client.isEncrypted());
QVERIFY(!client->peerAddress().isNull()); QVERIFY(!client.peerAddress().isNull());
QVERIFY(client->peerPort() != 0); QVERIFY(client.peerPort() != 0);
QVERIFY(!client->localAddress().isNull()); QVERIFY(!client.localAddress().isNull());
QVERIFY(client->localPort() != 0); QVERIFY(client.localPort() != 0);
} }
void tst_QSslSocket::setSslConfiguration_data() void tst_QSslSocket::setSslConfiguration_data()
@ -2877,16 +2879,16 @@ void tst_QSslSocket::dhServer()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit())); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit()));
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QCOMPARE(client->state(), QAbstractSocket::ConnectedState); QCOMPARE(client.state(), QAbstractSocket::ConnectedState);
} }
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
@ -2911,17 +2913,17 @@ void tst_QSslSocket::dhServerCustomParamsNull()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit())); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit()));
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QVERIFY(client->state() != QAbstractSocket::ConnectedState); QVERIFY(client.state() != QAbstractSocket::ConnectedState);
} }
#endif // QT_NO_OPENSSL #endif // QT_NO_OPENSSL
@ -2956,17 +2958,17 @@ void tst_QSslSocket::dhServerCustomParams()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit())); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit()));
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QVERIFY(client->state() == QAbstractSocket::ConnectedState); QVERIFY(client.state() == QAbstractSocket::ConnectedState);
} }
#endif // QT_NO_OPENSSL #endif // QT_NO_OPENSSL
@ -2988,16 +2990,16 @@ void tst_QSslSocket::ecdhServer()
QEventLoop loop; QEventLoop loop;
QTimer::singleShot(5000, &loop, SLOT(quit())); QTimer::singleShot(5000, &loop, SLOT(quit()));
QSslSocketPtr client(new QSslSocket); QSslSocket client;
socket = client.data(); socket = &client;
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit())); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit()));
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
QCOMPARE(client->state(), QAbstractSocket::ConnectedState); QCOMPARE(client.state(), QAbstractSocket::ConnectedState);
} }
void tst_QSslSocket::verifyClientCertificate_data() void tst_QSslSocket::verifyClientCertificate_data()
@ -3099,16 +3101,16 @@ void tst_QSslSocket::verifyClientCertificate()
QFETCH(QList<QSslCertificate>, clientCerts); QFETCH(QList<QSslCertificate>, clientCerts);
QFETCH(QSslKey, clientKey); QFETCH(QSslKey, clientKey);
QSslSocketPtr client(new QSslSocket); QSslSocket client;
client->setLocalCertificateChain(clientCerts); client.setLocalCertificateChain(clientCerts);
client->setPrivateKey(clientKey); client.setPrivateKey(clientKey);
socket = client.data(); socket = &client;
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
connect(socket, SIGNAL(disconnected()), &loop, SLOT(quit())); connect(socket, SIGNAL(disconnected()), &loop, SLOT(quit()));
connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit()));
client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
loop.exec(); loop.exec();
@ -3130,8 +3132,8 @@ void tst_QSslSocket::verifyClientCertificate()
} }
// check client socket // check client socket
QCOMPARE(int(client->state()), int(expectedState)); QCOMPARE(int(client.state()), int(expectedState));
QCOMPARE(client->isEncrypted(), works); QCOMPARE(client.isEncrypted(), works);
} }
void tst_QSslSocket::setEmptyDefaultConfiguration() // this test should be last, as it has some side effects void tst_QSslSocket::setEmptyDefaultConfiguration() // this test should be last, as it has some side effects
@ -3279,7 +3281,7 @@ void tst_QSslSocket::simplePskConnect()
bool pskCipherFound = false; bool pskCipherFound = false;
const QList<QSslCipher> supportedCiphers = QSslSocket::supportedCiphers(); const QList<QSslCipher> supportedCiphers = QSslSocket::supportedCiphers();
foreach (const QSslCipher &cipher, supportedCiphers) { for (const QSslCipher &cipher : supportedCiphers) {
if (cipher.name() == PSK_CIPHER_WITHOUT_AUTH) { if (cipher.name() == PSK_CIPHER_WITHOUT_AUTH) {
pskCipherFound = true; pskCipherFound = true;
break; break;