Browse Source

HTTP server better debug output

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
dae959a533
  1. 10
      src/webui/httpconnection.cpp
  2. 11
      src/webui/httprequestparser.cpp

10
src/webui/httpconnection.cpp

@ -82,10 +82,16 @@ void HttpConnection::read() {
// Parse HTTP request header // Parse HTTP request header
int header_end = input.indexOf("\r\n\r\n"); int header_end = input.indexOf("\r\n\r\n");
if (header_end < 0) {
qDebug() << Q_FUNC_INFO << "missing double-CRLF";
m_generator.setStatusLine(400, "Bad Request");
write();
return;
}
QByteArray header = input.left(header_end); QByteArray header = input.left(header_end);
m_parser.writeHeader(header); m_parser.writeHeader(header);
if (m_parser.isError()) { if (m_parser.isError()) {
qDebug() << Q_FUNC_INFO << "parsing error"; qDebug() << Q_FUNC_INFO << "header parsing error";
m_generator.setStatusLine(400, "Bad Request"); m_generator.setStatusLine(400, "Bad Request");
write(); write();
return; return;
@ -115,7 +121,7 @@ void HttpConnection::read() {
} }
if(m_parser.isError()) { if(m_parser.isError()) {
qDebug() << Q_FUNC_INFO << "parsing error"; qDebug() << Q_FUNC_INFO << "message parsing error";
m_generator.setStatusLine(400, "Bad Request"); m_generator.setStatusLine(400, "Bad Request");
write(); write();
} else { } else {

11
src/webui/httprequestparser.cpp

@ -84,7 +84,7 @@ void HttpRequestParser::writeMessage(const QByteArray& ba) {
Q_ASSERT (m_header.hasContentLength()); Q_ASSERT (m_header.hasContentLength());
m_data = ba; m_data = ba;
qDebug() << "m_data.size(): " << m_data.size(); qDebug() << Q_FUNC_INFO << "m_data.size(): " << m_data.size();
// Parse POST data // Parse POST data
if(m_header.contentType() == "application/x-www-form-urlencoded") { if(m_header.contentType() == "application/x-www-form-urlencoded") {
@ -95,8 +95,10 @@ void HttpRequestParser::writeMessage(const QByteArray& ba) {
QPair<QString, QString> pair = i.next(); QPair<QString, QString> pair = i.next();
m_postMap[pair.first] = pair.second; m_postMap[pair.first] = pair.second;
} }
} else { return;
// Parse form data (torrent file) }
// Parse multipart/form data (torrent file)
/** /**
m_data has the following format (if boundary is "cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5") m_data has the following format (if boundary is "cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5")
@ -116,6 +118,8 @@ Submit Query
--cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5-- --cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5--
**/ **/
if (m_header.contentType().startsWith("multipart/form-data")) { if (m_header.contentType().startsWith("multipart/form-data")) {
qDebug() << Q_FUNC_INFO << "header is: " << m_header.toString();
int filename_index = m_data.indexOf("filename="); int filename_index = m_data.indexOf("filename=");
if (filename_index >= 0) { if (filename_index >= 0) {
QByteArray boundary = m_data.left(m_data.indexOf("\r\n")); QByteArray boundary = m_data.left(m_data.indexOf("\r\n"));
@ -132,5 +136,4 @@ Submit Query
m_error = true; m_error = true;
} }
} }
}
} }

Loading…
Cancel
Save