AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend 'ignoreExpectedErrors' test

Browse Source 
with a case when we fail to ignore/pre-set one of possible
verification errors.

Change-Id: I23b06243b61acef1ef3576c51529f3ef6601ba7d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Timur Pocheptsov 2018-08-01 10:33:09 +02:00
parent 4286b2dcd9
commit 9f2a671560
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/auto/network/ssl/qdtls/tst_qdtls.cpp
View File

@ -100,7 +100,8 @@ private slots:
void protocolVersionMatching(); void protocolVersionMatching();
void verificationErrors_data(); void verificationErrors_data();
void verificationErrors(); void verificationErrors();
void ignoreExpectedErrors(); void presetExpectedErrors_data();
void presetExpectedErrors();
void verifyServerCertificate_data(); void verifyServerCertificate_data();
void verifyServerCertificate(); void verifyServerCertificate();
void verifyClientCertificate_data(); void verifyClientCertificate_data();
@ -160,6 +161,7 @@ Q_DECLARE_METATYPE(QSslSocket::SslMode)
Q_DECLARE_METATYPE(QSslSocket::PeerVerifyMode) Q_DECLARE_METATYPE(QSslSocket::PeerVerifyMode)
Q_DECLARE_METATYPE(QList<QSslCertificate>) Q_DECLARE_METATYPE(QList<QSslCertificate>)
Q_DECLARE_METATYPE(QSslKey) Q_DECLARE_METATYPE(QSslKey)
Q_DECLARE_METATYPE(QVector<QSslError>)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -687,8 +689,22 @@ void tst_QDtls::verificationErrors()
} }
} }
void tst_QDtls::ignoreExpectedErrors() void tst_QDtls::presetExpectedErrors_data()
{ {
QTest::addColumn<QVector<QSslError>>("expectedTlsErrors");
QTest::addColumn<bool>("works");
QVector<QSslError> expectedErrors{{QSslError::HostNameMismatch, selfSignedCert}};
QTest::addRow("unexpected-self-signed") << expectedErrors << false;
expectedErrors.push_back({QSslError::SelfSignedCertificate, selfSignedCert});
QTest::addRow("all-errors-ignored") << expectedErrors << true;
}
void tst_QDtls::presetExpectedErrors()
{
QFETCH(const QVector<QSslError>, expectedTlsErrors);
QFETCH(const bool, works);
connectHandshakeReadingSlots(); connectHandshakeReadingSlots();
auto serverConfig = defaultServerConfig; auto serverConfig = defaultServerConfig;
@ -696,10 +712,7 @@ void tst_QDtls::ignoreExpectedErrors()
serverConfig.setLocalCertificate(selfSignedCert); serverConfig.setLocalCertificate(selfSignedCert);
QVERIFY(serverCrypto->setDtlsConfiguration(serverConfig)); QVERIFY(serverCrypto->setDtlsConfiguration(serverConfig));
const QVector<QSslError> expectedErrors = {{QSslError::HostNameMismatch, selfSignedCert}, clientCrypto->ignoreVerificationErrors(expectedTlsErrors);
{QSslError::SelfSignedCertificate, selfSignedCert}};
clientCrypto->ignoreVerificationErrors(expectedErrors);
QVERIFY(clientCrypto->setPeer(serverAddress, serverPort)); QVERIFY(clientCrypto->setPeer(serverAddress, serverPort));
QVERIFY(clientCrypto->doHandshake(&clientSocket)); QVERIFY(clientCrypto->doHandshake(&clientSocket));
@ -707,9 +720,15 @@ void tst_QDtls::ignoreExpectedErrors()
QVERIFY(!testLoop.timeout()); QVERIFY(!testLoop.timeout());
if (works) {
QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto); QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
QCOMPARE(clientCrypto->handshakeState(), QDtls::HandshakeComplete); QCOMPARE(clientCrypto->handshakeState(), QDtls::HandshakeComplete);
QVERIFY(clientCrypto->isConnectionEncrypted()); QVERIFY(clientCrypto->isConnectionEncrypted());
} else {
QCOMPARE(clientCrypto->dtlsError(), QDtlsError::PeerVerificationError);
QVERIFY(!clientCrypto->isConnectionEncrypted());
QCOMPARE(clientCrypto->handshakeState(), QDtls::PeerVerificationFailed);
}
} }
void tst_QDtls::verifyServerCertificate_data() void tst_QDtls::verifyServerCertificate_data()