mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-26 21:03:31 +01:00
Code Issues Releases Wiki Activity

Prevent redirect loops

Browse Source
This commit is contained in:
Uwe L. Korn 2013-07-24 11:27:11 +02:00
parent d755415704
commit 95dac14782
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/utils/NetworkReply.cpp
View File

@ -68,6 +68,7 @@ void
NetworkReply::load( const QUrl& url )
{
m_url = url;
m_formerUrls << url;
QNetworkRequest request( url );
Q_ASSERT( Tomahawk::Utils::nam() != 0 );
@ -101,7 +102,7 @@ NetworkReply::networkLoadFinished()
}
QVariant redir = m_reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
if ( redir.isValid() && !redir.toUrl().isEmpty() )
if ( redir.isValid() && !redir.toUrl().isEmpty() && m_formerUrls.count( redir.toUrl().toString() ) < maxSameRedirects && m_formerUrls.count() < maxRedirects )
{
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Redirected HTTP request to" << redir;
if ( m_blacklistedHosts.contains( redir.toUrl().host() ) )

4
src/libtomahawk/utils/NetworkReply.h
View File

@ -38,6 +38,9 @@ public:
void blacklistHostFromRedirection( const QString& host );
QNetworkReply* reply() const { return m_reply; }
static const uint maxRedirects = 100;
static const uint maxSameRedirects = 5;
signals:
void redirected();
@ -53,6 +56,7 @@ private:
void load( const QUrl& url );
QStringList m_blacklistedHosts;
QStringList m_formerUrls;
QNetworkReply* m_reply;
QUrl m_url;
};