From 9f2a6715600bf872e41dcd8c4492480b93b4f599 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Wed, 1 Aug 2018 10:33:09 +0200
Subject: [PATCH] Extend 'ignoreExpectedErrors' test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tests/auto/network/ssl/qdtls/tst_qdtls.cpp | 37 ++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
index 60ab87d6f2..3a2c16ea66 100644
--- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
+++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
@@ -100,7 +100,8 @@ private slots:
     void protocolVersionMatching();
     void verificationErrors_data();
     void verificationErrors();
-    void ignoreExpectedErrors();
+    void presetExpectedErrors_data();
+    void presetExpectedErrors();
     void verifyServerCertificate_data();
     void verifyServerCertificate();
     void verifyClientCertificate_data();
@@ -160,6 +161,7 @@ Q_DECLARE_METATYPE(QSslSocket::SslMode)
 Q_DECLARE_METATYPE(QSslSocket::PeerVerifyMode)
 Q_DECLARE_METATYPE(QList<QSslCertificate>)
 Q_DECLARE_METATYPE(QSslKey)
+Q_DECLARE_METATYPE(QVector<QSslError>)
 
 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();
 
     auto serverConfig = defaultServerConfig;
@@ -696,10 +712,7 @@ void tst_QDtls::ignoreExpectedErrors()
     serverConfig.setLocalCertificate(selfSignedCert);
     QVERIFY(serverCrypto->setDtlsConfiguration(serverConfig));
 
-    const QVector<QSslError> expectedErrors = {{QSslError::HostNameMismatch, selfSignedCert},
-                                               {QSslError::SelfSignedCertificate, selfSignedCert}};
-
-    clientCrypto->ignoreVerificationErrors(expectedErrors);
+    clientCrypto->ignoreVerificationErrors(expectedTlsErrors);
     QVERIFY(clientCrypto->setPeer(serverAddress, serverPort));
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
@@ -707,9 +720,15 @@ void tst_QDtls::ignoreExpectedErrors()
 
     QVERIFY(!testLoop.timeout());
 
-    QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
-    QCOMPARE(clientCrypto->handshakeState(), QDtls::HandshakeComplete);
-    QVERIFY(clientCrypto->isConnectionEncrypted());
+    if (works) {
+        QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
+        QCOMPARE(clientCrypto->handshakeState(), QDtls::HandshakeComplete);
+        QVERIFY(clientCrypto->isConnectionEncrypted());
+    } else {
+        QCOMPARE(clientCrypto->dtlsError(), QDtlsError::PeerVerificationError);
+        QVERIFY(!clientCrypto->isConnectionEncrypted());
+        QCOMPARE(clientCrypto->handshakeState(), QDtls::PeerVerificationFailed);
+    }
 }
 
 void tst_QDtls::verifyServerCertificate_data()