github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-30 03:28:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Separate URL components before percent-decoding

Browse source 
Allow special characters in query string parameters.
Closes #9116.
This commit is contained in:
Vladimir Golovnev (Glassez) 2019-01-26 21:49:58 +03:00
parent fc534e88a3
commit b0446380c6
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/base/http/requestparser.cpp
View file

@ -180,11 +180,14 @@ bool RequestParser::parseRequestLine(const QString &line)
m_request.method = match.captured(1);
// Request Target
const QByteArray decodedUrl {QByteArray::fromPercentEncoding(match.captured(2).toLatin1())};
const int sepPos = decodedUrl.indexOf('?');
m_request.path = QString::fromUtf8(decodedUrl.constData(), (sepPos == -1 ? decodedUrl.size() : sepPos));
// URL components should be separated before percent-decoding
// [rfc3986] 2.4 When to Encode or Decode
const QByteArray url {match.captured(2).toLatin1()};
const int sepPos = url.indexOf('?');
const QByteArray pathComponent = ((sepPos == -1) ? url : Utils::ByteArray::midView(url, 0, sepPos));
m_request.path = QString::fromUtf8(QByteArray::fromPercentEncoding(pathComponent));
if (sepPos >= 0)
m_request.query = decodedUrl.mid(sepPos + 1);
m_request.query = url.mid(sepPos + 1);
// HTTP-version
m_request.version = match.captured(3);