Commit a20a729a authored by Ole Christian Eidheim's avatar Ole Christian Eidheim
Browse files

Fixes #298: corrected removal of chunk end when receiving larger chunks

parent d49072a4

client_http.hpp

+15 −12
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ namespace SimpleWeb { 
      else {

        parsed_host_port.first = host_port.substr(0, host_end);

        try {

          parsed_host_port.second = static_cast<unsigned short>(stoul(host_port.substr(host_end + 1)));

          parsed_host_port.second = static_cast<unsigned short>(std::stoul(host_port.substr(host_end + 1)));

        }

        catch(...) {

          parsed_host_port.second = default_port;
@@ -573,7 +573,7 @@ namespace SimpleWeb { 


          auto header_it = session->response->header.find("Content-Length");

          if(header_it != session->response->header.end()) {

            auto content_length = stoull(header_it->second);

            auto content_length = std::stoull(header_it->second);

            if(content_length > num_additional_bytes)

              this->read_content(session, content_length - num_additional_bytes);

            else
@@ -698,7 +698,7 @@ namespace SimpleWeb { 
          bytes_transferred -= line.size() + 1;

          unsigned long chunk_size = 0;

          try {

            chunk_size = stoul(line, 0, 16);

            chunk_size = std::stoul(line, 0, 16);

          }

          catch(...) {

            session->callback(make_error_code::make_error_code(errc::protocol_error));
@@ -710,7 +710,7 @@ namespace SimpleWeb { 
            return;

          }



          if(2 + chunk_size + session->response->streambuf.size() > session->response->streambuf.max_size()) {

          if(chunk_size + session->response->streambuf.size() > session->response->streambuf.max_size()) {

            session->response->content.end = false;

            session->callback(ec);

            session->response = std::shared_ptr<Response>(new Response(*session->response));
@@ -726,21 +726,24 @@ namespace SimpleWeb { 
            source.consume(bytes_to_move);

          }



          if((2 + chunk_size) > num_additional_bytes) {

            asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(2 + chunk_size - num_additional_bytes), [this, session, chunk_size_streambuf](const error_code &ec, size_t /*bytes_transferred*/) {

          if(chunk_size > num_additional_bytes) {

            asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(chunk_size - num_additional_bytes), [this, session, chunk_size_streambuf](const error_code &ec, size_t /*bytes_transferred*/) {

              auto lock = session->connection->handler_runner->continue_lock();

              if(!lock)

                return;



              if(!ec) {

                std::istream istream(&session->response->streambuf);



                // Remove "\r\n"

                istream.seekg(2, std::ios::end);

                istream.get();

                istream.get();



                auto null_buffer = std::make_shared<boost::asio::streambuf>(2);

                asio::async_read(*session->connection->socket, *null_buffer, asio::transfer_exactly(2), [this, session, chunk_size_streambuf, null_buffer](const error_code &ec, size_t /*bytes_transferred*/) {

                  auto lock = session->connection->handler_runner->continue_lock();

                  if(!lock)

                    return;

                  if(!ec)

                    read_chunked_transfer_encoded(session, chunk_size_streambuf);

                  else

                    session->callback(ec);

                });

              }

              else

                session->callback(ec);

server_http.hpp

+18 −15
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ namespace SimpleWeb { 
          if(header_it != session->request->header.end()) {

            unsigned long long content_length = 0;

            try {

              content_length = stoull(header_it->second);

              content_length = std::stoull(header_it->second);

            }

            catch(const std::exception &) {

              if(this->on_error)
@@ -605,7 +605,7 @@ namespace SimpleWeb { 
          bytes_transferred -= line.size() + 1;

          unsigned long chunk_size = 0;

          try {

            chunk_size = stoul(line, 0, 16);

            chunk_size = std::stoul(line, 0, 16);

          }

          catch(...) {

            if(this->on_error)
@@ -613,7 +613,12 @@ namespace SimpleWeb { 
            return;

          }



          if(2 + chunk_size + session->request->streambuf.size() > session->request->streambuf.max_size()) {

          if(chunk_size == 0) {

            this->find_resource(session);

            return;

          }



          if(chunk_size + session->request->streambuf.size() > session->request->streambuf.max_size()) {

            auto response = std::shared_ptr<Response>(new Response(session, this->config.timeout_content));

            response->write(StatusCode::client_error_payload_too_large);

            if(this->on_error)
@@ -632,24 +637,25 @@ namespace SimpleWeb { 
            source.consume(bytes_to_move);

          }



          if((2 + chunk_size) > num_additional_bytes) {

            asio::async_read(*session->connection->socket, session->request->streambuf, asio::transfer_exactly(2 + chunk_size - num_additional_bytes), [this, session, chunk_size_streambuf, chunk_size](const error_code &ec, size_t /*bytes_transferred*/) {

          if(chunk_size > num_additional_bytes) {

            asio::async_read(*session->connection->socket, session->request->streambuf, asio::transfer_exactly(chunk_size - num_additional_bytes), [this, session, chunk_size_streambuf](const error_code &ec, size_t /*bytes_transferred*/) {

              auto lock = session->connection->handler_runner->continue_lock();

              if(!lock)

                return;



              if(!ec) {

                std::istream istream(&session->request->streambuf);



                // Remove "\r\n"

                istream.seekg(2, std::ios::end);

                istream.get();

                istream.get();

                auto null_buffer = std::make_shared<boost::asio::streambuf>(2);

                asio::async_read(*session->connection->socket, *null_buffer, asio::transfer_exactly(2), [this, session, chunk_size_streambuf, null_buffer](const error_code &ec, size_t /*bytes_transferred*/) {

                  auto lock = session->connection->handler_runner->continue_lock();

                  if(!lock)

                    return;



                if(chunk_size > 0)

                  if(!ec)

                    read_chunked_transfer_encoded(session, chunk_size_streambuf);

                  else

                  this->find_resource(session);

                    this->on_error(session->request, ec);

                });

              }

              else if(this->on_error)

                this->on_error(session->request, ec);
@@ -660,10 +666,7 @@ namespace SimpleWeb { 
            istream.get();

            istream.get();



            if(chunk_size > 0)

            read_chunked_transfer_encoded(session, chunk_size_streambuf);

            else

              this->find_resource(session);

          }

        }

        else if(this->on_error)

tests/io_test.cpp

+12 −0
Original line number Diff line number Diff line
@@ -143,6 +143,14 @@ int main() { 
    response->write("6\r\nSimple\r\n3\r\nWeb\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n", {{"Transfer-Encoding", "chunked"}});

  };



  server.resource["^/chunked2$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {

    ASSERT(request->path == "/chunked2");



    ASSERT(request->content.string() == "HelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorld");



    response->write("258\r\nHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorld\r\n0\r\n\r\n", {{"Transfer-Encoding", "chunked"}});

  };



  server.resource["^/event-stream1$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> /*request*/) {

    thread work_thread([response] {

      response->close_connection_after_response = true; // Unspecified content length
@@ -314,6 +322,10 @@ int main() { 
      auto r = client.request("POST", "/chunked", "6\r\nSimple\r\n3\r\nWeb\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n", {{"Transfer-Encoding", "chunked"}});

      ASSERT(r->content.string() == "SimpleWeb in\r\n\r\nchunks.");

    }

    {

      auto r = client.request("POST", "/chunked2", "258\r\nHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorld\r\n0\r\n\r\n", {{"Transfer-Encoding", "chunked"}});

      ASSERT(r->content.string() == "HelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorldHelloWorld");

    }



    // Test reconnecting

    for(int c = 0; c < 20; ++c) {