42_adjoly/webserv
1
0
Fork 0
mirror of https://github.com/KeyZox71/webserv.git synced 2025-05-10 21:08:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix: fixed url

Browse Source
This commit is contained in:
Adam JOLY
2025-04-30 14:54:34 +02:00
parent 57f681ddf0
commit 98955fc131
5 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/config/URL.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/22 12:17:48 by adjoly #+# #+# */
/* Updated: 2025/04/29 15:48:19 by adjoly ### ########.fr */
/* Updated: 2025/04/30 14:38:03 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,7 +17,6 @@
#include <sstream>
#include <string>
#include <vector>
#include <webserv.hpp>
class URL {
public:
@ -31,9 +30,11 @@ class URL {
return _full_url < other._full_url;
}
std::vector<std::string> getSegments(void) { return _path_segments; }
std::vector<std::string> getSegments(void) const { return _path_segments; }
std::string getFullUrl(void) const { return _full_url; }
std::string getQueryString(void) const { return _query_string; }
std::string getPort(void) const { return _port; }
private:
void parse() {
@ -97,7 +98,6 @@ class URL {
};
inline std::ostream &operator<<(std::ostream &os, const URL &URL) {
os << URL.getFullUrl();
return os;
}

11
includes/requests/ARequest.hpp
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/03 17:23:00 by mmoussou #+# #+# */
/* Updated: 2025/04/30 09:34:49 by adjoly ### ########.fr */
/* Updated: 2025/04/30 14:52:22 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -55,6 +55,15 @@ class ARequest : public http::IMessage {
std::string _protocol;
config::Server *_conf;
URL *_url;
std::string _sanitizeStr(std::string &str) {
std::string newStr = str;
if (str[str.size() - 1] == '\r') {
newStr.erase(str.size() - 1);
}
return newStr;
}
};
} // namespace http

13
includes/server/Client.hpp
View File

@ -6,13 +6,14 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/14 14:14:39 by adjoly #+# #+# */
/* Updated: 2025/04/30 09:37:38 by adjoly ### ########.fr */
/* Updated: 2025/04/30 14:51:39 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#pragma once
#include <config/default.hpp>
#include <cstdio>
#include <netinet/in.h>
#include <requests/default.hpp>
#include <server/Server.hpp>
@ -43,11 +44,21 @@ class Client {
private:
void _getRequest(std::string);
std::string _sanitizeStr(std::string &str) {
std::string newStr = str;
if (str[str.size() - 1] == '\r') {
newStr.erase(str.size() - 1);
}
return newStr;
}
struct pollfd *_pfd;
struct sockaddr_in _client_addr;
http::ARequest *_request;
// http::Response *_response;
config::Server *_conf;
config::Route *_route;
config::Config *_Gconf;
};

10
src/requests_handling/requestImplementation/Get.cpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/30 09:40:16 by adjoly #+# #+# */
/* Updated: 2025/04/30 09:41:41 by adjoly ### ########.fr */
/* Updated: 2025/04/30 14:54:23 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -28,6 +28,9 @@ void Get::parse(std::string const &data) {
if (std::getline(stream, line)) {
std::istringstream line_stream(line);
line_stream >> this->_method >> this->_target >> this->_protocol;
_method = _sanitizeStr(_method);
_target = _sanitizeStr(_target);
_protocol = _sanitizeStr(_protocol);
/* this->_target.insert(this->_target.begin(), '.'); */
}
@ -36,7 +39,7 @@ void Get::parse(std::string const &data) {
if (delimiter_index != std::string::npos) {
std::string key = line.substr(0, delimiter_index);
std::string value = line.substr(delimiter_index + 2);
this->_headers.insert(std::make_pair(key, value));
this->_headers.insert(std::make_pair(key, _sanitizeStr(value)));
}
}
@ -46,6 +49,9 @@ void Get::parse(std::string const &data) {
this->_body = body_stream.str();
_url = new URL("http://" + _headers["Host"] + _target);
std::cout << "wtf = " << _headers["Host"] << std::endl;
std::cout << *_url << std::endl;
/*

15
src/server/Client.cpp
View File

@ -6,11 +6,12 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/17 11:12:41 by mmoussou #+# #+# */
/* Updated: 2025/04/29 17:27:49 by adjoly ### ########.fr */
/* Updated: 2025/04/30 13:48:03 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#include "cppeleven.hpp"
#include "requests/default.hpp"
#include <log.hpp>
#include <server/Client.hpp>
#include <sstream>
@ -44,15 +45,15 @@ void Client::parse(void) {
received_data += std::string(buffer, bytes_received);
} while (buffer[bytes_received]);
this->_getRequest(received_data);
_getRequest(received_data);
this->_conf = _Gconf->getServer(this->_request->getHeaders()["Host"]);
_conf = _Gconf->getServer(this->_request->getHeaders()["Host"]);
// if (received_data.length > (get max_body_size from Route corresponding) )
// throw error
}
bool Client::requestParsed(void) {
bool Client::requestParsed(void) {
if (_request == not_nullptr) {
return false;
}
@ -63,6 +64,12 @@ void Client::_getRequest(std::string request_str) {
std::string method = request_str.substr(
0, request_str.substr(0, 4).find_last_not_of(" ") + 1);
(void)_route;
/* if (_isAllowed(method)) { */
/* _request = new http::Get(); */
/* _request->setMethod("405"); */
/* _log->info("405 methods not allowed"); // TODO make a better log print */
/* } */
if (method == "GET") {
this->_request = new http::Get(request_str);
_log->info("get request received");