Skip to content

Commit ae11e0b

Browse files
committedDec 14, 2016
[BACKPORT][BUGFIX] Fixed a crash on bad network protocol
( from f48f90e )
1 parent 903e8cf commit ae11e0b

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed
 

‎src/gui/qgsfiledownloader.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ void QgsFileDownloader::startDownload()
6060
mReply = nam->get( request );
6161

6262
connect( mReply, SIGNAL( readyRead() ), this, SLOT( onReadyRead() ) );
63-
connect( mReply, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( onNetworkError( QNetworkReply::NetworkError ) ) );
6463
connect( mReply, SIGNAL( finished() ), this, SLOT( onFinished() ) );
6564
connect( mReply, SIGNAL( downloadProgress( qint64, qint64 ) ), this, SLOT( onDownloadProgress( qint64, qint64 ) ) );
6665
connect( nam, SIGNAL( requestTimedOut( QNetworkReply* ) ), this, SLOT( onRequestTimedOut() ) );
@@ -161,7 +160,7 @@ void QgsFileDownloader::onFinished()
161160
if ( mReply->error() )
162161
{
163162
mFile.remove();
164-
error( tr( "Download failed: %1." ).arg( mReply->errorString() ) );
163+
error( tr( "Download failed: %1" ).arg( mReply->errorString() ) );
165164
}
166165
else if ( !redirectionTarget.isNull() )
167166
{
@@ -174,18 +173,15 @@ void QgsFileDownloader::onFinished()
174173
startDownload();
175174
return;
176175
}
177-
// All done
178-
emit downloadCompleted();
176+
else
177+
{
178+
emit downloadCompleted();
179+
}
179180
}
180181
emit downloadExited();
181182
this->deleteLater();
182183
}
183184

184-
void QgsFileDownloader::onNetworkError( QNetworkReply::NetworkError err )
185-
{
186-
Q_ASSERT( mReply );
187-
error( QString( "Network error %1: %2" ).arg( err ).arg( mReply->errorString() ) );
188-
}
189185

190186
void QgsFileDownloader::onDownloadProgress( qint64 bytesReceived, qint64 bytesTotal )
191187
{

‎src/gui/qgsfiledownloader.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ class GUI_EXPORT QgsFileDownloader : public QObject
7575
void onReadyRead();
7676
/** Called when the network reply has finished */
7777
void onFinished();
78-
/** Called on Network Error */
79-
void onNetworkError( QNetworkReply::NetworkError err );
8078
/** Called on data ready to be processed */
8179
void onDownloadProgress( qint64 bytesReceived, qint64 bytesTotal );
8280
/** Called when a network request times out */

‎tests/src/gui/testqgsfiledownloader.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ void TestQgsFileDownloader::testInValidDownload()
172172
QVERIFY( mError );
173173
QVERIFY( !mCanceled );
174174
QVERIFY( mTempFile->size() == 0 );
175-
QCOMPARE( mErrorMessage, QString( "Network error 3: Host www.doesnotexistofthatimsure.qgis not found" ) );
175+
QCOMPARE( mErrorMessage, QString( "Download failed: Host www.doesnotexistofthatimsure.qgis not found" ) );
176176
}
177177

178178
void TestQgsFileDownloader::testCanceledDownload()
@@ -205,7 +205,7 @@ void TestQgsFileDownloader::testInvalidUrl()
205205
QVERIFY( !mCompleted );
206206
QVERIFY( mError );
207207
QVERIFY( !mCanceled );
208-
QCOMPARE( mErrorMessage, QString( "Network error 301: Protocol \"xyz\" is unknown" ) );
208+
QCOMPARE( mErrorMessage, QString( "Download failed: Protocol \"xyz\" is unknown" ) );
209209
}
210210

211211
void TestQgsFileDownloader::testBlankUrl()
@@ -216,7 +216,7 @@ void TestQgsFileDownloader::testBlankUrl()
216216
QVERIFY( !mCompleted );
217217
QVERIFY( mError );
218218
QVERIFY( !mCanceled );
219-
QCOMPARE( mErrorMessage, QString( "Network error 301: Protocol \"\" is unknown" ) );
219+
QCOMPARE( mErrorMessage, QString( "Download failed: Protocol \"\" is unknown" ) );
220220
}
221221

222222
#ifndef QT_NO_OPENSSL
@@ -225,9 +225,9 @@ void TestQgsFileDownloader::testSslError_data()
225225
QTest::addColumn<QString>( "url" );
226226
QTest::addColumn<QString>( "result" );
227227

228-
QTest::newRow( "expired" ) << "https://expired.badssl.com/" << "Network error 6: SSL handshake failed;SSL Errors: ;The certificate has expired";
229-
QTest::newRow( "self-signed" ) << "https://self-signed.badssl.com/" << "Network error 6: SSL handshake failed;SSL Errors: ;The certificate is self-signed, and untrusted";
230-
QTest::newRow( "untrusted-root" ) << "https://untrusted-root.badssl.com/" << "Network error 6: SSL handshake failed;No certificates could be verified;SSL Errors: ;The issuer certificate of a locally looked up certificate could not be found;The root CA certificate is not trusted for this purpose";
228+
QTest::newRow( "expired" ) << "https://expired.badssl.com/" << "SSL Errors: ;The certificate has expired";
229+
QTest::newRow( "self-signed" ) << "https://self-signed.badssl.com/" << "SSL Errors: ;The certificate is self-signed, and untrusted";
230+
QTest::newRow( "untrusted-root" ) << "https://untrusted-root.badssl.com/" << "No certificates could be verified;SSL Errors: ;The issuer certificate of a locally looked up certificate could not be found;The root CA certificate is not trusted for this purpose";
231231
}
232232

233233
void TestQgsFileDownloader::testSslError()

‎tests/src/python/test_qgsfiledownloader.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test_inValidDownload(self):
7878
self.assertTrue(self.progress_was_called)
7979
self.assertFalse(self.canceled_was_called)
8080
self.assertTrue(self.error_was_called)
81-
self.assertEqual(self.error_args[1], [u'Network error 3: Host www.doesnotexistofthatimsure.qgis not found'])
81+
self.assertEqual(self.error_args[1], [u'Download failed: Host www.doesnotexistofthatimsure.qgis not found'])
8282
self.assertFalse(os.path.isfile(destination))
8383

8484
def test_dowloadCanceled(self):
@@ -99,7 +99,7 @@ def test_InvalidUrl(self):
9999
self.assertFalse(self.canceled_was_called)
100100
self.assertTrue(self.error_was_called)
101101
self.assertFalse(os.path.isfile(destination))
102-
self.assertEqual(self.error_args[1], [u"Network error 301: Protocol \"xyz\" is unknown"])
102+
self.assertEqual(self.error_args[1], [u"Download failed: Protocol \"xyz\" is unknown"])
103103

104104
def test_InvalidFile(self):
105105
self._make_download('https://github.com/qgis/QGIS/archive/master.zip', "")
@@ -117,7 +117,7 @@ def test_BlankUrl(self):
117117
self.assertFalse(self.canceled_was_called)
118118
self.assertTrue(self.error_was_called)
119119
self.assertFalse(os.path.isfile(destination))
120-
self.assertEqual(self.error_args[1], [u"Network error 301: Protocol \"\" is unknown"])
120+
self.assertEqual(self.error_args[1], [u"Download failed: Protocol \"\" is unknown"])
121121

122122
def ssl_compare(self, name, url, error):
123123
destination = tempfile.mktemp()
@@ -130,12 +130,12 @@ def ssl_compare(self, name, url, error):
130130
self.assertFalse(os.path.isfile(destination), msg)
131131
result = sorted(self.error_args[1])
132132
result = ';'.join(result)
133-
self.assertEqual(result, error, msg + "expected:\n%s\nactual:\n%s\n" % (result, error))
133+
self.assertEqual(result, error, msg + "expected:\n%s\nactual:\n%s\n" % (error, result))
134134

135135
def test_sslExpired(self):
136-
self.ssl_compare("expired", "https://expired.badssl.com/", "Network error 6: SSL handshake failed;SSL Errors: ;The certificate has expired")
137-
self.ssl_compare("self-signed", "https://self-signed.badssl.com/", "Network error 6: SSL handshake failed;SSL Errors: ;The certificate is self-signed, and untrusted")
138-
self.ssl_compare("untrusted-root", "https://untrusted-root.badssl.com/", "Network error 6: SSL handshake failed;No certificates could be verified;SSL Errors: ;The issuer certificate of a locally looked up certificate could not be found;The root CA certificate is not trusted for this purpose")
136+
self.ssl_compare("expired", "https://expired.badssl.com/", "SSL Errors: ;The certificate has expired")
137+
self.ssl_compare("self-signed", "https://self-signed.badssl.com/", "SSL Errors: ;The certificate is self-signed, and untrusted")
138+
self.ssl_compare("untrusted-root", "https://untrusted-root.badssl.com/", "No certificates could be verified;SSL Errors: ;The issuer certificate of a locally looked up certificate could not be found;The root CA certificate is not trusted for this purpose")
139139

140140
def _set_slot(self, *args, **kwargs):
141141
#print('_set_slot(%s) called' % args[0])

0 commit comments

Comments
 (0)
Please sign in to comment.