c937457738
The HTTP request body is expected to be a valid JSON object. All other requests are considered malformed requests and result in a HTTP 400 error. Added the Jansson license to the LICENSE-THIRDPARTY.TXT file. Imported some of the tests from the Jansson test suite to the HttpParser test.
144 lines
3.3 KiB
C++
144 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2016 MariaDB Corporation Ab
|
|
*
|
|
* Use of this software is governed by the Business Source License included
|
|
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
|
|
*
|
|
* Change Date: 2019-07-01
|
|
*
|
|
* On the date above, in accordance with the Business Source License, use
|
|
* of this software will be governed by version 2 or later of the General
|
|
* Public License.
|
|
*/
|
|
|
|
#include "maxscale/httprequest.hh"
|
|
|
|
#include <ctype.h>
|
|
|
|
/** TODO: Move this to a C++ string utility header */
|
|
namespace maxscale
|
|
{
|
|
static inline string& trim(string& str)
|
|
{
|
|
if (str.length())
|
|
{
|
|
if (isspace(*str.begin()))
|
|
{
|
|
string::iterator it = str.begin();
|
|
|
|
while (it != str.end() && isspace(*it))
|
|
{
|
|
it++;
|
|
}
|
|
str.erase(str.begin(), it);
|
|
}
|
|
|
|
if (isspace(*str.rbegin()))
|
|
{
|
|
string::reverse_iterator it = str.rbegin();
|
|
while (it != str.rend() && isspace(*it))
|
|
{
|
|
it++;
|
|
}
|
|
|
|
str.erase(it.base(), str.end());
|
|
}
|
|
}
|
|
|
|
return str;
|
|
}
|
|
}
|
|
|
|
HttpRequest* HttpRequest::parse(string data)
|
|
{
|
|
size_t pos = data.find("\r\n");
|
|
string request_line = data.substr(0, pos);
|
|
data.erase(0, pos + 2);
|
|
|
|
pos = request_line.find(" ");
|
|
string verb = request_line.substr(0, pos);
|
|
request_line.erase(0, pos + 1);
|
|
|
|
pos = request_line.find(" ");
|
|
string uri = request_line.substr(0, pos);
|
|
request_line.erase(0, pos + 1);
|
|
|
|
pos = request_line.find("\r\n");
|
|
string http_version = request_line.substr(0, pos);
|
|
request_line.erase(0, pos + 2);
|
|
|
|
map<string, string> headers;
|
|
|
|
while ((pos = data.find("\r\n")) != string::npos)
|
|
{
|
|
string header_line = data.substr(0, pos);
|
|
data.erase(0, pos + 2);
|
|
|
|
if (header_line.length() == 0)
|
|
{
|
|
/** End of headers */
|
|
break;
|
|
}
|
|
|
|
if ((pos = header_line.find(":")) != string::npos)
|
|
{
|
|
string key = header_line.substr(0, pos);
|
|
header_line.erase(0, pos + 1);
|
|
headers[key] = mxs::trim(header_line);
|
|
}
|
|
}
|
|
|
|
/** The headers are now processed and consumed. The message body is
|
|
* the only thing left in the request string. */
|
|
|
|
bool ok = false;
|
|
HttpRequest* request = NULL;
|
|
enum http_verb verb_value = string_to_http_verb(verb);
|
|
json_error_t json_error = {};
|
|
json_t* body = NULL;
|
|
|
|
/** Remove leading and trailing whitespace */
|
|
if (data.length())
|
|
{
|
|
mxs::trim(data);
|
|
}
|
|
|
|
if (http_version == "HTTP/1.1" && verb_value != HTTP_UNKNOWN)
|
|
{
|
|
if (data.length() && (body = json_loads(data.c_str(), 0, &json_error)) == NULL)
|
|
{
|
|
MXS_DEBUG("JSON error in input on line %d column %d: %s (%s)",
|
|
json_error.line, json_error.column, json_error.text,
|
|
data.c_str());
|
|
}
|
|
else
|
|
{
|
|
ok = true;
|
|
}
|
|
}
|
|
|
|
if (ok)
|
|
{
|
|
request = new HttpRequest();
|
|
request->m_verb = verb_value;
|
|
request->m_resource = uri;
|
|
request->m_headers = headers;
|
|
request->m_json.reset(body);
|
|
request->m_json_string = data;
|
|
}
|
|
|
|
return request;
|
|
}
|
|
|
|
HttpRequest::HttpRequest():
|
|
m_json(NULL),
|
|
m_verb(HTTP_UNKNOWN)
|
|
{
|
|
|
|
}
|
|
|
|
HttpRequest::~HttpRequest()
|
|
{
|
|
|
|
}
|