103e0faaae
Fixed TcpSocket::set_descriptor(nullptr) causing an invalid read from address 0x0. Improved HTTP response/request parsing so that they report a parse failure if the first few bytes of the HTTP request don't match the expected format rather than continuing to look for an end of header. Fixed broken fr::Http::url_encode() implementation. Optimised fr::Http::url_decode() implementation. Added fr::Http unit tests.
81 lines
2.0 KiB
C++
81 lines
2.0 KiB
C++
//
|
|
// Created by fred on 10/12/16.
|
|
//
|
|
|
|
#ifndef FRNETLIB_HTTPREQUEST_H
|
|
#define FRNETLIB_HTTPREQUEST_H
|
|
#include <string>
|
|
#include <vector>
|
|
#include <unordered_map>
|
|
#include "TcpSocket.h"
|
|
#include "Http.h"
|
|
|
|
namespace fr
|
|
{
|
|
class HttpRequest : public Http
|
|
{
|
|
public:
|
|
//Constructors
|
|
HttpRequest();
|
|
HttpRequest(HttpRequest&&)=default;
|
|
HttpRequest(const HttpRequest&)= default;
|
|
HttpRequest &operator=(const HttpRequest &)=default;
|
|
HttpRequest &operator=(HttpRequest &&)=default;
|
|
virtual ~HttpRequest() = default;
|
|
|
|
/*!
|
|
* Parse a HTTP response.
|
|
*
|
|
* @param data The HTTP response to parse
|
|
* @param datasz The length of data in bytes
|
|
* @return True if more data is needed, false if finished.
|
|
*/
|
|
fr::Socket::Status parse(const char *data, size_t datasz) override;
|
|
|
|
/*!
|
|
* Constructs a Http Request, ready to send.
|
|
*
|
|
* @return The constructed HTTP request.
|
|
*/
|
|
std::string construct(const std::string &host) const override;
|
|
|
|
private:
|
|
/*!
|
|
* Parses the request header.
|
|
*
|
|
* @param header_end_pos The position in 'body' of the end of the header
|
|
* @return True on success, false on failure
|
|
*/
|
|
bool parse_header(int64_t header_end_pos);
|
|
|
|
/*!
|
|
* Parses the POST data from the body
|
|
*/
|
|
void parse_post_body();
|
|
|
|
/*!
|
|
* Parses the header type (GET/POST) from the given string.
|
|
*
|
|
* @param str The first header line
|
|
* @return The parsed request type
|
|
*/
|
|
Http::RequestType parse_header_type(const std::string &str);
|
|
|
|
/*!
|
|
* Parses the header URI
|
|
*
|
|
* @param str The first header line
|
|
*/
|
|
void parse_header_uri(const std::string &str);
|
|
|
|
//State
|
|
bool header_ended;
|
|
int32_t last_parsed_character;
|
|
size_t content_length;
|
|
|
|
};
|
|
}
|
|
|
|
|
|
#endif //FRNETLIB_HTTPREQUEST_H
|