42_adjoly/webserv
1
0
Fork 0
mirror of https://github.com/KeyZox71/webserv.git synced 2025-07-20 14:36:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「✨」 feat(http/parsing): full url percent decoding

Browse Source
This commit is contained in:
y-syo
2025-07-15 19:28:07 +02:00
parent 411eaa1999
commit 2dd70f6209
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/requests_handling/requestImplementation/Delete.cpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/30 09:42:18 by adjoly #+# #+# */ /* Created: 2025/04/30 09:42:18 by adjoly #+# #+# */
/* Updated: 2025/07/08 11:43:21 by adjoly ### ########.fr */ /* Updated: 2025/07/15 19:16:59 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,6 +26,21 @@ Delete::Delete(std::string &data, config::Server *srv) {
this->parse(data); this->parse(data);
} }
static std::string urlDecode(const std::string& str) {
std::ostringstream decoded;
for (size_t i = 0; i < str.length(); ++i) {
if (str[i] == '%' && i + 2 < str.length()) {
std::string hex = str.substr(i + 1, 2);
char decodedChar = static_cast<char>(std::strtol(hex.c_str(), 0, 16));
decoded << decodedChar;
i += 2;
} else {
decoded << str[i];
}
}
return decoded.str();
}
void Delete::parse(std::string const &data) { void Delete::parse(std::string const &data) {
std::istringstream stream(data); std::istringstream stream(data);
std::string line; std::string line;
@ -34,7 +49,7 @@ void Delete::parse(std::string const &data) {
std::istringstream line_stream(line); std::istringstream line_stream(line);
line_stream >> this->_method >> this->_target >> this->_protocol; line_stream >> this->_method >> this->_target >> this->_protocol;
_method = _sanitizeStr(_method); _method = _sanitizeStr(_method);
_target = _sanitizeStr(_target); _target = urlDecode(_sanitizeStr(_target));
_protocol = _sanitizeStr(_protocol); _protocol = _sanitizeStr(_protocol);
} }

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

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/30 09:40:16 by adjoly #+# #+# */ /* Created: 2025/04/30 09:40:16 by adjoly #+# #+# */
/* Updated: 2025/07/08 15:47:43 by adjoly ### ########.fr */ /* Updated: 2025/07/15 19:16:46 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -39,6 +39,21 @@ Get::~Get(void) {
delete _url; delete _url;
} }
static std::string urlDecode(const std::string& str) {
std::ostringstream decoded;
for (size_t i = 0; i < str.length(); ++i) {
if (str[i] == '%' && i + 2 < str.length()) {
std::string hex = str.substr(i + 1, 2);
char decodedChar = static_cast<char>(std::strtol(hex.c_str(), 0, 16));
decoded << decodedChar;
i += 2;
} else {
decoded << str[i];
}
}
return decoded.str();
}
void Get::parse(std::string const &data) { void Get::parse(std::string const &data) {
std::istringstream stream(data); std::istringstream stream(data);
std::string line; std::string line;
@ -47,7 +62,7 @@ void Get::parse(std::string const &data) {
std::istringstream line_stream(line); std::istringstream line_stream(line);
line_stream >> this->_method >> this->_target >> this->_protocol; line_stream >> this->_method >> this->_target >> this->_protocol;
_method = _sanitizeStr(_method); _method = _sanitizeStr(_method);
_target = _sanitizeStr(_target); _target = urlDecode(_sanitizeStr(_target));
_protocol = _sanitizeStr(_protocol); _protocol = _sanitizeStr(_protocol);
} }

19
src/requests_handling/requestImplementation/Post.cpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/30 09:50:20 by adjoly #+# #+# */ /* Created: 2025/04/30 09:50:20 by adjoly #+# #+# */
/* Updated: 2025/07/12 18:00:40 by mmoussou ### ########.fr */ /* Updated: 2025/07/15 19:17:08 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -32,6 +32,21 @@ Post::Post(std::string &data, config::Server *srv) {
this->parse(data); this->parse(data);
} }
static std::string urlDecode(const std::string& str) {
std::ostringstream decoded;
for (size_t i = 0; i < str.length(); ++i) {
if (str[i] == '%' && i + 2 < str.length()) {
std::string hex = str.substr(i + 1, 2);
char decodedChar = static_cast<char>(std::strtol(hex.c_str(), 0, 16));
decoded << decodedChar;
i += 2;
} else {
decoded << str[i];
}
}
return decoded.str();
}
void Post::parse(std::string const &data) { void Post::parse(std::string const &data) {
size_t header_end = data.find("\r\n\r\n"); size_t header_end = data.find("\r\n\r\n");
if (header_end == std::string::npos) if (header_end == std::string::npos)
@ -45,7 +60,7 @@ void Post::parse(std::string const &data) {
std::istringstream line_stream(line); std::istringstream line_stream(line);
line_stream >> this->_method >> this->_target >> this->_protocol; line_stream >> this->_method >> this->_target >> this->_protocol;
_method = _sanitizeStr(_method); _method = _sanitizeStr(_method);
_target = _sanitizeStr(_target); _target = urlDecode(_sanitizeStr(_target));
_protocol = _sanitizeStr(_protocol); _protocol = _sanitizeStr(_protocol);
} }