From 5a47939d5c07a968f27562a3ebc800fcc2b225bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 10 Sep 2020 16:30:36 +0200 Subject: tst_QNetworkReply: Avoid race in ioGetFromHttpWithAuth Our authentication code is race-y by design: 1. When two requests are fired off and queued at the same time in the same QHttpNetworkConnection then if one of them encounters "authentication required" then it will copy whatever credentials it got to all the other channels in the connection. This is likely what the first part of the test is testing. 2. If a later request is fired off and it includes credentials in the url then the newly included credentials should be used instead of the cached ones. The race here can occurr when one socket either takes too long to connect or the connected signal is not received early enough. Then the first socket is used for both requests and then we can hit case #2 when the url contains credentials. Pick-to: 5.15 Change-Id: I646a5378d8c1256b2de98b51912953df29f68cb2 Reviewed-by: Timur Pocheptsov --- tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/auto/network/access') diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 98f468e49e..fa574b8d92 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -3499,7 +3499,11 @@ void tst_QNetworkReply::ioGetFromHttpWithAuth() QNetworkRequest request(url); { QNetworkReplyPtr reply1(manager.get(request)); - QNetworkReplyPtr reply2(manager.get(request)); + QUrl copy = url; + copy.setUserName(QString()); + copy.setPassword(QString()); + QNetworkRequest request2(copy); + QNetworkReplyPtr reply2(manager.get(request2)); DataReader reader1(reply1); DataReader reader2(reply2); QSignalSpy finishedspy(reply1.data(), SIGNAL(finished())); -- cgit v1.2.3