external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 20:31:56 +00:00
Code Issues Releases Wiki Activity

Fix HTTP parser bug for parsing header from multiple pieces of data.

Browse source
This commit is contained in:
winlin 2019-12-16 18:21:39 +08:00
parent 45ed458927
commit 6bad973a7c
3 changed files with 218 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
trunk/src/service/srs_service_http_conn.cpp
View file

@ -79,12 +79,10 @@ srs_error_t SrsHttpParser::parse_message(ISrsReader* reader, ISrsHttpMessage** p
// Reset request data.
state = SrsHttpParseStateInit;
hp_header = http_parser();
// Reset the message url.
url = "";
// The body that we have read from cache.
pbody = NULL;
// Reset the temporarily parsed header field.
expect_field_name = true;
// We must reset the field name and value, because we may get a partial value in on_header_value.
field_name = field_value = "";
// The header of the request.
srs_freep(header);
header = new SrsHttpHeader();
@ -144,6 +142,11 @@ srs_error_t SrsHttpParser::parse_message_imp(ISrsReader* reader)
return srs_error_wrap(err, "grow buffer");
}
}
SrsHttpParser* obj = this;
if (!obj->field_value.empty()) {
obj->header->set(obj->field_name, obj->field_value);
}
return err;
}
@ -206,15 +209,14 @@ int SrsHttpParser::on_header_field(http_parser* parser, const char* at, size_t l
{
SrsHttpParser* obj = (SrsHttpParser*)parser->data;
srs_assert(obj);
// field value=>name, reap the field.
if (!obj->expect_field_name) {
if (!obj->field_value.empty()) {
obj->header->set(obj->field_name, obj->field_value);
obj->field_name = obj->field_value = "";
}
obj->expect_field_name = true;
if (length > 0) {
obj->field_name = string(at, (int)length);
obj->field_name.append(at, (int)length);
}
srs_info("Header field(%d bytes): %.*s", (int)length, (int)length, at);
@ -227,9 +229,8 @@ int SrsHttpParser::on_header_value(http_parser* parser, const char* at, size_t l
srs_assert(obj);
if (length > 0) {
obj->field_value = string(at, (int)length);
obj->field_value.append(at, (int)length);
}
obj->expect_field_name = false;
srs_info("Header value(%d bytes): %.*s", (int)length, (int)length, at);
return 0;

2
trunk/src/service/srs_service_http_conn.hpp
View file

@ -49,8 +49,6 @@ private:
// Whether allow jsonp parse.
bool jsonp;
private:
// http parse data, reset before parse message.
bool expect_field_name;
std::string field_name;
std::string field_value;
SrsHttpParseState state;

207
trunk/src/utest/srs_utest_http.cpp
View file

@ -28,6 +28,8 @@ using namespace std;
#include <srs_http_stack.hpp>
#include <srs_service_http_conn.hpp>
#include <srs_utest_protocol.hpp>
#include <srs_protocol_json.hpp>
#include <srs_kernel_utility.hpp>
class MockResponseWriter : virtual public ISrsHttpResponseWriter, virtual public ISrsHttpHeaderFilter
{
@ -156,8 +158,211 @@ VOID TEST(ProtocolHTTPTest, HTTPHeader)
h.set_content_type("text/plain");
EXPECT_STREQ("text/plain", h.content_type().c_str());
EXPECT_EQ(2, h.count());
SrsJsonObject* o = SrsJsonAny::object();
h.dumps(o);
EXPECT_EQ(2, o->count());
srs_freep(o);
}
VOID TEST(ProtocolHTTPTest, HTTPCommonHandler)
class MockMSegmentsReader : public ISrsReader
{
public:
vector<string> in_bytes;
public:
MockMSegmentsReader();
virtual ~MockMSegmentsReader();
public:
virtual srs_error_t read(void* buf, size_t size, ssize_t* nread);
};
MockMSegmentsReader::MockMSegmentsReader()
{
}
MockMSegmentsReader::~MockMSegmentsReader()
{
}
srs_error_t MockMSegmentsReader::read(void* buf, size_t size, ssize_t* nread)
{
srs_error_t err = srs_success;
for (;;) {
if (in_bytes.empty() || size <= 0) {
return srs_error_new(-1, "EOF");
}
string v = in_bytes[0];
if (v.empty()) {
in_bytes.erase(in_bytes.begin());
continue;
}
int nn = srs_min(size, v.length());
memcpy(buf, v.data(), nn);
if (nread) {
*nread = nn;
}
if (nn < (int)v.length()) {
in_bytes[0] = string(v.data() + nn, v.length() - nn);
} else {
in_bytes.erase(in_bytes.begin());
}
break;
}
return err;
}
VOID TEST(ProtocolHTTPTest, MSegmentsReader)
{
srs_error_t err;
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("Host: ossrs.net\r\n");
if (true) {
char buf[1024];
HELPER_ARRAY_INIT(buf, 1024, 0);
ssize_t nn = 0;
HELPER_EXPECT_SUCCESS(r.read(buf, 1024, &nn));
ASSERT_EQ(31, nn);
EXPECT_STREQ("GET /api/v1/versions HTTP/1.1\r\n", buf);
}
if (true) {
char buf[1024];
HELPER_ARRAY_INIT(buf, 1024, 0);
ssize_t nn = 0;
HELPER_EXPECT_SUCCESS(r.read(buf, 1024, &nn));
ASSERT_EQ(17, nn);
EXPECT_STREQ("Host: ossrs.net\r\n", buf);
}
}
VOID TEST(ProtocolHTTPTest, HTTPMessageParser)
{
srs_error_t err;
if (true) {
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("Host: ossrs");
r.in_bytes.push_back(".net\r");
r.in_bytes.push_back("\n");
r.in_bytes.push_back("\r\n");
SrsHttpParser p;
HELPER_ASSERT_SUCCESS(p.initialize(HTTP_REQUEST, false));
ISrsHttpMessage* msg = NULL;
HELPER_ASSERT_SUCCESS(p.parse_message(&r, &msg));
EXPECT_TRUE(msg->is_http_get());
EXPECT_STREQ("/api/v1/versions", msg->path().c_str());
EXPECT_STREQ("ossrs.net", msg->host().c_str());
srs_freep(msg);
}
if (true) {
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("Host: ossrs");
r.in_bytes.push_back(".net\r\n");
r.in_bytes.push_back("\r\n");
SrsHttpParser p;
HELPER_ASSERT_SUCCESS(p.initialize(HTTP_REQUEST, false));
ISrsHttpMessage* msg = NULL;
HELPER_ASSERT_SUCCESS(p.parse_message(&r, &msg));
EXPECT_TRUE(msg->is_http_get());
EXPECT_STREQ("/api/v1/versions", msg->path().c_str());
EXPECT_STREQ("ossrs.net", msg->host().c_str());
srs_freep(msg);
}
if (true) {
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("User-Agent: curl/7.54.0\r\n");
r.in_bytes.push_back("Host: ossrs");
r.in_bytes.push_back(".net\r\n");
r.in_bytes.push_back("\r\n");
SrsHttpParser p;
HELPER_ASSERT_SUCCESS(p.initialize(HTTP_REQUEST, false));
ISrsHttpMessage* msg = NULL;
HELPER_ASSERT_SUCCESS(p.parse_message(&r, &msg));
EXPECT_TRUE(msg->is_http_get());
EXPECT_STREQ("/api/v1/versions", msg->path().c_str());
EXPECT_STREQ("ossrs.net", msg->host().c_str());
EXPECT_STREQ("curl/7.54.0", msg->header()->get("User-Agent").c_str());
srs_freep(msg);
}
if (true) {
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("User-");
r.in_bytes.push_back("Agent: curl/7.54.0\r\n");
r.in_bytes.push_back("Host: ossrs");
r.in_bytes.push_back(".net\r\n");
r.in_bytes.push_back("\r\n");
SrsHttpParser p;
HELPER_ASSERT_SUCCESS(p.initialize(HTTP_REQUEST, false));
ISrsHttpMessage* msg = NULL;
HELPER_ASSERT_SUCCESS(p.parse_message(&r, &msg));
EXPECT_TRUE(msg->is_http_get());
EXPECT_STREQ("/api/v1/versions", msg->path().c_str());
EXPECT_STREQ("ossrs.net", msg->host().c_str());
EXPECT_STREQ("curl/7.54.0", msg->header()->get("User-Agent").c_str());
srs_freep(msg);
}
if (true) {
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("User-");
r.in_bytes.push_back("Agent: curl");
r.in_bytes.push_back("/7.54.0\r\n");
r.in_bytes.push_back("Host: ossrs");
r.in_bytes.push_back(".net\r\n");
r.in_bytes.push_back("\r\n");
SrsHttpParser p;
HELPER_ASSERT_SUCCESS(p.initialize(HTTP_REQUEST, false));
ISrsHttpMessage* msg = NULL;
HELPER_ASSERT_SUCCESS(p.parse_message(&r, &msg));
EXPECT_TRUE(msg->is_http_get());
EXPECT_STREQ("/api/v1/versions", msg->path().c_str());
EXPECT_STREQ("ossrs.net", msg->host().c_str());
EXPECT_STREQ("curl/7.54.0", msg->header()->get("User-Agent").c_str());
srs_freep(msg);
}
if (true) {
MockMSegmentsReader r;
r.in_bytes.push_back("GET /api/v1/versions HTTP/1.1\r\n");
r.in_bytes.push_back("Host: ossrs.net\r\n");
r.in_bytes.push_back("\r\n");
SrsHttpParser p;
HELPER_ASSERT_SUCCESS(p.initialize(HTTP_REQUEST, false));
ISrsHttpMessage* msg = NULL;
HELPER_ASSERT_SUCCESS(p.parse_message(&r, &msg));
EXPECT_TRUE(msg->is_http_get());
EXPECT_STREQ("/api/v1/versions", msg->path().c_str());
EXPECT_STREQ("ossrs.net", msg->host().c_str());
srs_freep(msg);
}
}