github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 13:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Properly recover from HTTP parsing errors (Web UI)

Browse source 
May be related to issue #68.
This commit is contained in:
Christophe Dumez 2012-09-29 14:26:52 +03:00
commit 7bd9139d28
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/webui/httpconnection.cpp
View file

@ -77,17 +77,19 @@ void HttpConnection::handleDownloadFailure(const QString& url,
<< qPrintable(reason) << std::endl; << qPrintable(reason) << std::endl;
} }
void HttpConnection::read() { void HttpConnection::read()
{
m_receivedData.append(m_socket->readAll()); m_receivedData.append(m_socket->readAll());
// Parse HTTP request header // Parse HTTP request header
int header_end = m_receivedData.indexOf("\r\n\r\n"); const int header_end = m_receivedData.indexOf("\r\n\r\n");
if (header_end < 0) { if (header_end < 0) {
qDebug() << "Partial request: \n" << m_receivedData; qDebug() << "Partial request: \n" << m_receivedData;
// Partial request waiting for the rest // Partial request waiting for the rest
return; return;
} }
QByteArray header = m_receivedData.left(header_end);
const QByteArray header = m_receivedData.left(header_end);
m_parser.writeHeader(header); m_parser.writeHeader(header);
if (m_parser.isError()) { if (m_parser.isError()) {
qWarning() << Q_FUNC_INFO << "header parsing error"; qWarning() << Q_FUNC_INFO << "header parsing error";
@ -102,7 +104,7 @@ void HttpConnection::read() {
const int expected_length = m_parser.header().contentLength(); const int expected_length = m_parser.header().contentLength();
QByteArray message = m_receivedData.mid(header_end + 4, expected_length); QByteArray message = m_receivedData.mid(header_end + 4, expected_length);
if (expected_length > 10000000) { if (expected_length > 10000000 /* ~10MB */) {
qWarning() << "Bad request: message too long"; qWarning() << "Bad request: message too long";
m_generator.setStatusLine(400, "Bad Request"); m_generator.setStatusLine(400, "Bad Request");
m_receivedData.clear(); m_receivedData.clear();
@ -117,7 +119,6 @@ void HttpConnection::read() {
} }
m_parser.writeMessage(message); m_parser.writeMessage(message);
m_receivedData = m_receivedData.mid(header_end + 4 + expected_length); m_receivedData = m_receivedData.mid(header_end + 4 + expected_length);
} else { } else {
m_receivedData.clear(); m_receivedData.clear();
@ -132,7 +133,8 @@ void HttpConnection::read() {
} }
} }
void HttpConnection::write() { void HttpConnection::write()
{
m_socket->write(m_generator.toByteArray()); m_socket->write(m_generator.toByteArray());
m_socket->disconnectFromHost(); m_socket->disconnectFromHost();
} }

3
src/webui/httprequestparser.cpp
View file

@ -66,6 +66,7 @@ const QList<QByteArray>& HttpRequestParser::torrents() const {
} }
void HttpRequestParser::writeHeader(const QByteArray& ba) { void HttpRequestParser::writeHeader(const QByteArray& ba) {
m_error = false;
// Parse header // Parse header
m_header = QHttpRequestHeader(ba); m_header = QHttpRequestHeader(ba);
QUrl url = QUrl::fromEncoded(m_header.path().toAscii()); QUrl url = QUrl::fromEncoded(m_header.path().toAscii());
@ -94,7 +95,7 @@ static QList<QByteArray> splitRawData(QByteArray rawData, const QByteArray& sep)
void HttpRequestParser::writeMessage(const QByteArray& ba) { void HttpRequestParser::writeMessage(const QByteArray& ba) {
// Parse message content // Parse message content
Q_ASSERT (m_header.hasContentLength()); Q_ASSERT (m_header.hasContentLength());
m_error = false;
m_data = ba; m_data = ba;
qDebug() << Q_FUNC_INFO << "m_data.size(): " << m_data.size(); qDebug() << Q_FUNC_INFO << "m_data.size(): " << m_data.size();