Skip to content

Allow sending request content to custom QIODevice #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jnwatts wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow sending request content to custom QIODevice #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e485b8b
Allow sending request content to custom QIODevice
Aug 7, 2015
ff2ab66
Oops, shouldn't call setContentDevice() if returning false...
Aug 10, 2015
4e5d639
HttpConnection: Remove debug output
Aug 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 143 additions & 42 deletions pillowcore/HttpConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ namespace Pillow
public:
Pillow::HttpConnection::State _state;
QIODevice* _inputDevice,* _outputDevice;
QIODevice* _contentDevice;
http_parser _parser;

// Request fields.
Expand All @@ -91,6 +92,7 @@ namespace Pillow
QVarLengthArray<Pillow::HttpHeaderRef, 32> _requestHeadersRef;
Pillow::HttpHeaderCollection _requestHeaders;
int _requestContentLength; int _requestContentLengthHeaderIndex;
int _requestContentReceived, _requestContentWritten;
bool _requestHttp11;
Pillow::HttpParamCollection _requestParams;

Expand All @@ -105,7 +107,9 @@ namespace Pillow
void initialize();
void processInput();
void setupRequestHeaders();
void prepareRequestHeaders();
void transitionToReceivingHeaders();
void setContentDevice(QIODevice *contentDevice);
void transitionToReceivingContent();
void transitionToSendingHeaders();
void transitionToSendingContent();
Expand All @@ -129,7 +133,7 @@ namespace Pillow
}

Pillow::HttpConnectionPrivate::HttpConnectionPrivate(HttpConnection *connection)
: q_ptr(connection), _state(Pillow::HttpConnection::Uninitialized), _inputDevice(0), _outputDevice(0)
: q_ptr(connection), _state(Pillow::HttpConnection::Uninitialized), _inputDevice(0), _outputDevice(0), _contentDevice(0)
{
}

Expand All @@ -156,8 +160,46 @@ inline void Pillow::HttpConnectionPrivate::processInput()
if (_state != Pillow::HttpConnection::ReceivingHeaders && _state != Pillow::HttpConnection::ReceivingContent) return;

qint64 bytesAvailable = _inputDevice->bytesAvailable();
if (bytesAvailable > 0)

if (_state == Pillow::HttpConnection::ReceivingContent && _contentDevice) {
// Read some data if possible

// Limit capacity to min of MaxRequestData or bytesavailable
bytesAvailable = qMin(bytesAvailable, qint64(Pillow::HttpConnection::MaximumRequestContentLength));
if (_requestContent.capacity() < bytesAvailable)
_requestContent.reserve(bytesAvailable);

// Limit bytesAvailable to remaining capacity
bytesAvailable = qMin(bytesAvailable, qint64(_requestContent.capacity() - _requestContent.size()));
if (bytesAvailable > 0) {
qint64 bytesRead = _inputDevice->read(_requestContent.data() + _requestContent.size(), bytesAvailable);
_requestContent.data_ptr()->size += bytesRead;
_requestContent.data_ptr()->data[_requestContent.data_ptr()->size] = 0;
_requestContentReceived += bytesRead;
}

// Write some data if possible
bytesAvailable = _requestContent.size();
if (bytesAvailable > 0) {
qint64 bytesWritten = _contentDevice->write(_requestContent.data(), bytesAvailable);
if (bytesWritten < 0)
return; //TODO: Throw error, close connection
else if (bytesWritten < bytesAvailable)
{
_requestContent.remove(0, bytesWritten);
}
else
{
_requestContent.data_ptr()->size = 0;
_requestContent.data_ptr()->data[0] = 0;
}
if (_requestHeaders.size() > 0) _requestHeaders.pop_back();
_requestContentWritten += bytesWritten;
}
}
else if (bytesAvailable > 0)
{
// Simple content or headers
if (_requestBuffer.capacity() < _requestBuffer.size() + bytesAvailable)
_requestBuffer.reserve(_requestBuffer.size() + bytesAvailable + 1);
qint64 bytesRead = _inputDevice->read(_requestBuffer.data() + _requestBuffer.size(), bytesAvailable);
Expand All @@ -174,11 +216,27 @@ inline void Pillow::HttpConnectionPrivate::processInput()
return writeRequestErrorResponse(400); // Bad client Request!
else if (thin_http_parser_is_finished(&_parser))
transitionToReceivingContent();
else if (_inputDevice->bytesAvailable() > 0)
QTimer::singleShot(0, q_ptr, SLOT(processInput()));
}
else if (_state == Pillow::HttpConnection::ReceivingContent)
{
if (_requestBuffer.size() - int(_parser.body_start) >= _requestContentLength)
transitionToSendingHeaders(); // Finished receiving the content.
if (_contentDevice)
{
if (_requestContentWritten >= _requestContentLength)
{
transitionToSendingHeaders();
}
else if (_inputDevice->bytesAvailable() > 0 || _requestContentReceived < _requestContentLength)
QTimer::singleShot(0, q_ptr, SLOT(processInput()));
}
else
{
if (_requestContentReceived >= _requestContentLength || int(_requestBuffer.size() - _parser.body_start) >= _requestContentLength)
transitionToSendingHeaders(); // Finished receiving the content.
else if (_inputDevice->bytesAvailable() > 0 || _requestContentReceived < _requestContentLength)
QTimer::singleShot(0, q_ptr, SLOT(processInput()));
}
}
}

Expand All @@ -193,6 +251,18 @@ inline void Pillow::HttpConnectionPrivate::transitionToReceivingHeaders()
_requestHttp11 = false;
}

void Pillow::HttpConnectionPrivate::setContentDevice(QIODevice *contentDevice)
{
if (_state != Pillow::HttpConnection::ContentReady) return;
_state = Pillow::HttpConnection::ReceivingContent;
_contentDevice = contentDevice;
if (_contentDevice) {
setFromRawData(_requestContent, _requestBuffer.constData(), _parser.body_start, _requestBuffer.size() - _parser.body_start);
}
processInput();
}


inline void Pillow::HttpConnectionPrivate::setupRequestHeaders()
{
char* data = _requestBuffer.data();
Expand All @@ -209,10 +279,45 @@ inline void Pillow::HttpConnectionPrivate::setupRequestHeaders()
}
}

void Pillow::HttpConnectionPrivate::prepareRequestHeaders()
{
// Prepare and null terminate the request fields.

if (_requestHeaders.size() != _requestHeadersRef.size())
setupRequestHeaders();

char* data = _requestBuffer.data();

if (_parser.query_string_len == 0)
{
// The request uri has no query string, we can use the data straight because it means that inserting null after the path
// will not destroy the uri (which does not include the fragment).
setFromRawDataAndNullterm(_requestUri, data, _parser.request_uri_start, _parser.request_uri_len);
}
else
{
// Create deep copy for requestUri; it would otherwise get a null inserted after the path.
_requestUri = QByteArray(data + _parser.request_uri_start, _parser.request_uri_len);
}
setFromRawDataAndNullterm(_requestMethod, data, _parser.request_method_start, _parser.request_method_len);
setFromRawDataAndNullterm(_requestFragment, data, _parser.fragment_start, _parser.fragment_len);
setFromRawDataAndNullterm(_requestPath, data, _parser.request_path_start, _parser.request_path_len);
setFromRawDataAndNullterm(_requestQueryString, data, _parser.query_string_start, _parser.query_string_len);
setFromRawDataAndNullterm(_requestHttpVersion, data, _parser.http_version_start, _parser.http_version_len);

if (!_requestUriDecoded.isEmpty()) _requestUriDecoded = QString();
if (!_requestFragmentDecoded.isEmpty())_requestFragmentDecoded = QString();
if (!_requestPathDecoded.isEmpty())_requestPathDecoded = QString();
if (!_requestQueryStringDecoded.isEmpty())_requestQueryStringDecoded = QString();

_requestHttp11 = _requestHttpVersion == httpSlash11Token;
}

inline void Pillow::HttpConnectionPrivate::transitionToReceivingContent()
{
if (_state == Pillow::HttpConnection::ReceivingContent) return;
_state = Pillow::HttpConnection::ReceivingContent;
if (_state == Pillow::HttpConnection::ReceivingContent ||
_state == Pillow::HttpConnection::ContentReady) return;
_state = Pillow::HttpConnection::ContentReady;

setupRequestHeaders();

Expand All @@ -223,7 +328,7 @@ inline void Pillow::HttpConnectionPrivate::transitionToReceivingContent()
// Exit early if the client sent an incorrect or unacceptable content-length.
if (_requestContentLength < 0)
return writeRequestErrorResponse(400); // Invalid request: negative content length does not make sense.
else if (_requestContentLength > Pillow::HttpConnection::MaximumRequestContentLength || !contentLengthParseOk)
else if (!contentLengthParseOk)
return writeRequestErrorResponse(413); // Request entity too large.

if (_requestContentLength > 0)
Expand All @@ -234,13 +339,17 @@ inline void Pillow::HttpConnectionPrivate::transitionToReceivingContent()
// Resize the request buffer right away to avoid too many reallocs later.
// NOTE: This invalidates the request headers QByteArrays if the reallocation
// changes the buffer's address (very likely unless the content-length is tiny).
_requestBuffer.reserve(_parser.body_start + _requestContentLength + 1);
_requestBuffer.reserve(_parser.body_start + qMin(_requestContentLength, int(Pillow::HttpConnection::MaximumRequestContentLength)) + 1);

_requestContentReceived = _requestBuffer.size() - _parser.body_start;
_requestContentWritten = 0;

// So do invalidate the request headers.
if (_requestHeaders.size() > 0) _requestHeaders.pop_back();

// Pump; the content may already be sitting in the buffers.
processInput();
prepareRequestHeaders();

emit q_ptr->contentReady(q_ptr);
}
else
{
Expand All @@ -253,38 +362,10 @@ inline void Pillow::HttpConnectionPrivate::transitionToSendingHeaders()
if (_state == Pillow::HttpConnection::SendingHeaders) return;
_state = Pillow::HttpConnection::SendingHeaders;

// Prepare and null terminate the request fields.

if (_requestHeaders.size() != _requestHeadersRef.size())
setupRequestHeaders();
prepareRequestHeaders();

char* data = _requestBuffer.data();

if (_parser.query_string_len == 0)
{
// The request uri has no query string, we can use the data straight because it means that inserting null after the path
// will not destroy the uri (which does not include the fragment).
setFromRawDataAndNullterm(_requestUri, data, _parser.request_uri_start, _parser.request_uri_len);
}
else
{
// Create deep copy for requestUri; it would otherwise get a null inserted after the path.
_requestUri = QByteArray(data + _parser.request_uri_start, _parser.request_uri_len);
}
setFromRawDataAndNullterm(_requestMethod, data, _parser.request_method_start, _parser.request_method_len);
setFromRawDataAndNullterm(_requestFragment, data, _parser.fragment_start, _parser.fragment_len);
setFromRawDataAndNullterm(_requestPath, data, _parser.request_path_start, _parser.request_path_len);
setFromRawDataAndNullterm(_requestQueryString, data, _parser.query_string_start, _parser.query_string_len);
setFromRawDataAndNullterm(_requestHttpVersion, data, _parser.http_version_start, _parser.http_version_len);

if (!_requestUriDecoded.isEmpty()) _requestUriDecoded = QString();
if (!_requestFragmentDecoded.isEmpty())_requestFragmentDecoded = QString();
if (!_requestPathDecoded.isEmpty())_requestPathDecoded = QString();
if (!_requestQueryStringDecoded.isEmpty())_requestQueryStringDecoded = QString();

_requestHttp11 = _requestHttpVersion == httpSlash11Token;

setFromRawData(_requestContent, _requestBuffer.constData(), _parser.body_start, _requestContentLength);
if (!_contentDevice)
setFromRawData(_requestContent, _requestBuffer.constData(), _parser.body_start, _requestContentLength);

// Reset our known information about the response.
_responseContentLength = -1; // The response content-length is initially unknown.
Expand Down Expand Up @@ -651,6 +732,11 @@ void Pillow::HttpConnection::initialize(QIODevice* inputDevice, QIODevice* outpu
d_ptr->initialize();
}

void Pillow::HttpConnection::setContentDevice(QIODevice *contentDevice)
{
d_ptr->setContentDevice(contentDevice);
}

Pillow::HttpConnection::State Pillow::HttpConnection::state() const
{
return d_ptr->_state;
Expand All @@ -666,6 +752,11 @@ QIODevice *Pillow::HttpConnection::outputDevice() const
return d_ptr->_outputDevice;
}

QIODevice *Pillow::HttpConnection::contentDevice() const
{
return d_ptr->_contentDevice;
}

void Pillow::HttpConnection::processInput()
{
d_ptr->processInput();
Expand Down Expand Up @@ -693,7 +784,12 @@ void Pillow::HttpConnection::writeResponseString(int statusCode, const HttpHeade

void Pillow::HttpConnection::writeHeaders(int statusCode, const HttpHeaderCollection& headers)
{
d_ptr->writeHeaders(statusCode, headers);
d_ptr->writeHeaders(statusCode, headers);
}

void Pillow::HttpConnection::writeRequestErrorResponse(int statusCode)
{
d_ptr->writeRequestErrorResponse(statusCode);
}

void Pillow::HttpConnection::writeContent(const QByteArray& content)
Expand Down Expand Up @@ -806,6 +902,11 @@ const QByteArray &Pillow::HttpConnection::requestContent() const
return d_ptr->_requestContent;
}

qint64 Pillow::HttpConnection::requestContentLength() const
{
return d_ptr->_requestContentLength;
}

const Pillow::HttpHeaderCollection &Pillow::HttpConnection::requestHeaders() const
{
return d_ptr->_requestHeaders;
Expand Down
7 changes: 6 additions & 1 deletion pillowcore/HttpConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace Pillow
Q_PROPERTY(QByteArray requestContent READ requestContent NOTIFY requestReady)

public:
enum State { Uninitialized, ReceivingHeaders, ReceivingContent, SendingHeaders, SendingContent, Completed, Flushing, Closed };
enum State { Uninitialized, ReceivingHeaders, ContentReady, ReceivingContent, SendingHeaders, SendingContent, Completed, Flushing, Closed };
enum { MaximumRequestHeaderLength = 32 * 1024 };
enum { MaximumRequestContentLength = 128 * 1024 * 1024 };
Q_ENUMS(State);
Expand All @@ -52,9 +52,11 @@ namespace Pillow
~HttpConnection();

void initialize(QIODevice* inputDevice, QIODevice* outputDevice = 0);
void setContentDevice(QIODevice *contentDevice);

QIODevice* inputDevice() const;
QIODevice* outputDevice() const;
QIODevice* contentDevice() const;
State state() const;

QHostAddress remoteAddress() const;
Expand All @@ -68,6 +70,7 @@ namespace Pillow
const QByteArray& requestQueryString() const;
const QByteArray& requestHttpVersion() const;
const QByteArray& requestContent() const;
qint64 requestContentLength() const;

// Request members, decoded version. Use those rather than manually decoding the raw data returned by the methods
// above when decoded values are desired (they are cached).
Expand All @@ -91,6 +94,7 @@ namespace Pillow
void writeResponse(int statusCode = 200, const Pillow::HttpHeaderCollection& headers = Pillow::HttpHeaderCollection(), const QByteArray& content = QByteArray());
void writeResponseString(int statusCode = 200, const Pillow::HttpHeaderCollection& headers = Pillow::HttpHeaderCollection(), const QString& content = QString());
void writeHeaders(int statusCode = 200, const Pillow::HttpHeaderCollection& headers = Pillow::HttpHeaderCollection());
void writeRequestErrorResponse(int statusCode = 400);
void writeContent(const QByteArray& content);
void endContent();

Expand All @@ -103,6 +107,7 @@ namespace Pillow
qint64 responseContentLength() const;

signals:
void contentReady(Pillow::HttpConnection* self); // The headers are ready to be processed, all request headers have been received. If a contentHandler has been specified, it MUST call setContentDevice (with or without NULL) to continue handling the connection.
void requestReady(Pillow::HttpConnection* self); // The request is ready to be processed, all request headers and content have been received.
void requestCompleted(Pillow::HttpConnection* self); // The response is completed, all response headers and content have been sent.
void closed(Pillow::HttpConnection* self); // The connection is closing, no further requests will arrive on this object.
Expand Down
18 changes: 18 additions & 0 deletions pillowcore/HttpHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ HttpHandler::HttpHandler(QObject *parent)
{
}

bool HttpHandler::handleContent(HttpConnection *connection)
{
return false;
}

//
// HttpHandlerStack
//
Expand All @@ -28,6 +33,19 @@ HttpHandlerStack::HttpHandlerStack(QObject *parent)
{
}

bool HttpHandlerStack::handleContent(HttpConnection *connection)
{
foreach (QObject* object, children())
{
HttpHandler* handler = qobject_cast<HttpHandler*>(object);

if (handler && handler->handleContent(connection))
return true;
}

return false;
}

bool HttpHandlerStack::handleRequest(Pillow::HttpConnection *connection)
{
foreach (QObject* object, children())
Expand Down
2 changes: 2 additions & 0 deletions pillowcore/HttpHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ namespace Pillow
HttpHandler(QObject *parent = 0);

public slots:
virtual bool handleContent(Pillow::HttpConnection* connection);
virtual bool handleRequest(Pillow::HttpConnection* connection) = 0;
};

Expand All @@ -51,6 +52,7 @@ namespace Pillow
HttpHandlerStack(QObject* parent = 0);

public:
virtual bool handleContent(Pillow::HttpConnection* connection);
virtual bool handleRequest(Pillow::HttpConnection *connection);
};

Expand Down
Loading