nickorlow/anthracite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

polished up event loop changes
Some checks failed
Docker Build & Publish / build (push) Failing after 55m49s
Details

Browse source
This commit is contained in:
Nicholas Orlowsky 2025-02-21 18:24:28 -05:00
parent 058c395095
commit 409024e04a
18 changed files with 354 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

145
lib/http/request.cpp
View file

@ -1,87 +1,91 @@
#include "request.hpp"
#include "../log/log.hpp"
#include "constants.hpp"
#include <map>
#include <cstring>
#include <map>
#include <stdio.h>
namespace anthracite::http {
void request::parse_header(std::string& raw_line) {
void request::parse_header(std::string& raw_line)
{
auto delim_pos = raw_line.find_first_of(':');
auto value_pos = raw_line.find_first_not_of(' ', delim_pos+1);
auto value_pos = raw_line.find_first_not_of(' ', delim_pos + 1);
std::string header_name = raw_line.substr(0,delim_pos);
std::string header_name = raw_line.substr(0, delim_pos);
std::string header_val = raw_line.substr(value_pos);
_headers[header_name] = header_val;
}
void request::parse_query_param(std::string& raw_param) {
void request::parse_query_param(std::string& raw_param)
{
auto delim_pos = raw_param.find_first_of('=');
auto value_pos = delim_pos+1;
auto value_pos = delim_pos + 1;
std::string query_name = raw_param.substr(0,delim_pos);
std::string query_name = raw_param.substr(0, delim_pos);
std::string query_val = raw_param.substr(value_pos);
_query_params[query_name] = query_val;
}
void request::parse_path(char* raw_path) {
void request::parse_path(char* raw_path)
{
char* saveptr = nullptr;
char* tok = strtok_r(raw_path, "?", &saveptr);
if (tok){
if (tok) {
_path = tok;
}
tok = strtok_r(nullptr, "?", &saveptr);
while(tok) {
while (tok) {
std::string rtok(tok);
parse_query_param(rtok);
tok = strtok_r(nullptr, "?", &saveptr);
}
}
void request::parse_request_line(char* raw_line) {
request_line_parser_state state = METHOD;
void request::parse_request_line(char* raw_line)
{
request_line_parser_state state = METHOD;
char* saveptr = nullptr;
char* tok = strtok_r(raw_line, " \r", &saveptr);
char* saveptr = nullptr;
char* tok = strtok_r(raw_line, " \r", &saveptr);
while(tok){
switch(state) {
case METHOD: {
auto search = method_map.find(tok);
if (search != method_map.end()) {
_method = search->second;
} else {
_method = method::UNKNOWN;
}
state = PATH;
break;
};
case PATH: {
std::string str_tok(tok);
parse_path(tok);
state = VERSION;
break;
};
case VERSION: {
auto search = version_map.find(tok);
if (search != version_map.end()) {
_http_version = search->second;
} else {
_http_version = version::HTTP_1_0;
}
return;
};
while (tok) {
switch (state) {
case METHOD: {
auto search = method_map.find(tok);
if (search != method_map.end()) {
_method = search->second;
} else {
_method = method::UNKNOWN;
}
tok = strtok_r(nullptr, " \r", &saveptr);
state = PATH;
break;
};
case PATH: {
std::string str_tok(tok);
parse_path(tok);
state = VERSION;
break;
};
case VERSION: {
auto search = version_map.find(tok);
if (search != version_map.end()) {
_http_version = search->second;
} else {
_http_version = version::HTTP_1_0;
}
return;
};
}
tok = strtok_r(nullptr, " \r", &saveptr);
}
}
request::request(std::string& raw_data, const std::string& client_ip)
@ -94,26 +98,27 @@ request::request(std::string& raw_data, const std::string& client_ip)
char* saveptr = nullptr;
char* tok = strtok_r(raw_data.data(), "\r\n", &saveptr);
while(tok && state != BODY_CONTENT){
switch(state) {
case REQUEST_LINE: {
parse_request_line(tok);
state = HEADERS;
tok = strtok_r(nullptr, "\n", &saveptr);
break;
};
case HEADERS: {
if (tok[0] == '\r') {
state = BODY_CONTENT;
} else {
std::string rtok(tok);
rtok.pop_back();
parse_header(rtok);
while (tok && state != BODY_CONTENT) {
switch (state) {
case REQUEST_LINE: {
parse_request_line(tok);
state = HEADERS;
tok = strtok_r(nullptr, "\n", &saveptr);
break;
};
case HEADERS: {
if (tok[0] == '\r') {
state = BODY_CONTENT;
} else {
std::string rtok(tok);
rtok.pop_back();
parse_header(rtok);
tok = strtok_r(nullptr, "\n", &saveptr);
}
break;
};
case BODY_CONTENT: break;
}
break;
};
case BODY_CONTENT:
break;
}
}
@ -121,9 +126,9 @@ request::request(std::string& raw_data, const std::string& client_ip)
if (tok) {
_body_content = std::string(tok);
}
//if (getline(line_stream, line, '\0')) {
// _body_content = line;
//}
// if (getline(line_stream, line, '\0')) {
// _body_content = line;
// }
}
std::string request::path() { return _path; }
@ -147,11 +152,11 @@ bool request::close_connection()
const auto& header = _headers.find("Connection");
const bool found = header != _headers.end();
if (found && header->second == "keep-alive") {
return false;
if (found && header->second == "close") {
return true;
}
return true;
return false;
}
std::string request::to_string()