From c6e54a0c05c21b932fdb779488683855aa135e49 Mon Sep 17 00:00:00 2001 From: 3lswear Date: Sun, 6 Mar 2022 14:21:11 +0300 Subject: [PATCH] upstream changes (src) --- src/Autoindex/Autoindex.cpp | 2 +- src/CGI/CgiHandle.cpp | 10 +++++----- src/Client/Client.cpp | 6 +++--- src/Client/Request.cpp | 2 +- src/Client/Response.cpp | 14 +++++++------- src/Server/Server.cpp | 18 +++++++++--------- src/Server/ServerConfig.cpp | 11 ++++------- src/main.cpp | 2 +- 8 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/Autoindex/Autoindex.cpp b/src/Autoindex/Autoindex.cpp index 1c9dcfc..b5a290b 100644 --- a/src/Autoindex/Autoindex.cpp +++ b/src/Autoindex/Autoindex.cpp @@ -23,7 +23,7 @@ std::string Autoindex::getPage(std::string path, std::string allpath, std::strin

\n"; if (dir == NULL) { - DBOUT << WARNING << getDebugTime() << FAIL << " AutoindexError: could not open \"" + DBOUT << WARNING << getDebugTime() << FAIL << "AutoindexError: could not open \"" << allpath << "\" directory." << ZERO_C << std::endl; return ""; } diff --git a/src/CGI/CgiHandle.cpp b/src/CGI/CgiHandle.cpp index 5be25ca..06ae81b 100644 --- a/src/CGI/CgiHandle.cpp +++ b/src/CGI/CgiHandle.cpp @@ -57,7 +57,7 @@ void CgiHandle::printSSmap(std::map &m) { std::map::iterator it; - DBOUT << WARNING << getDebugTime() << FAIL << " Print MAP" << ENDL; + DBOUT << WARNING << getDebugTime() << FAIL << "Print MAP" << ENDL; it = m.begin(); for (; it != m.end(); it++) @@ -68,7 +68,7 @@ void CgiHandle::printSSmap(std::map &m) void printenv(char **env) { - DBOUT << WARNING << getDebugTime() << FAIL << " Print env" << ENDL; + DBOUT << WARNING << getDebugTime() << FAIL << "Print env" << ENDL; for(size_t i = 0; env[i]; i++) { DBOUT << RED << env[i] << ENDL; @@ -92,7 +92,7 @@ std::string CgiHandle::executeCgi() } catch(const std::bad_alloc& e) { - std::cerr << WARNING << getDebugTime() << FAIL << " " << e.what() << ENDL; + std::cerr << WARNING << getDebugTime() << FAIL << e.what() << ENDL; } sI = dup(STDIN_FILENO); sO = dup(STDOUT_FILENO); @@ -108,7 +108,7 @@ std::string CgiHandle::executeCgi() pid = fork(); if (pid == -1) { - std::cerr << WARNING << getDebugTime() << FAIL << " Pid = -1. Fork error."<< ENDL; + std::cerr << WARNING << getDebugTime() << FAIL << "Pid = -1. Fork error."<< ENDL; } else if (pid == 0) { @@ -116,7 +116,7 @@ std::string CgiHandle::executeCgi() dup2(fdOut, STDOUT_FILENO); execve(_response.getCgiPass().c_str(), argv, env); std::cerr << getDebugTime() << FAIL; - perror(" Execve error"); + perror("Execve error"); std::cerr << RESET; write(STDOUT_FILENO, "Status: 500\r\n\r\n", 15); exit(1); diff --git a/src/Client/Client.cpp b/src/Client/Client.cpp index c3cd235..a157c9f 100644 --- a/src/Client/Client.cpp +++ b/src/Client/Client.cpp @@ -185,10 +185,10 @@ std::string Client::generateRespons(std::vector &configs) std::memcpy(_to_send_char, _toSend->c_str(), len + 1); //print request - std::cerr << WARNING << getDebugTime() << GREEN; + std::cerr << WARNING << getDebugTime() << TURGUOISE; if (_request.getCode() != 200) std::cerr << FAIL ; - std::cerr << " [ request ] : " + std::cerr << "[ request ] : " << "[method: " << _request.getMethod() << "] " << "[URI: " << _request.getURI() << " ]"; if (_response.getLocation() != NULL) @@ -201,7 +201,7 @@ std::string Client::generateRespons(std::vector &configs) std::cerr << WARNING << getDebugTime() << GREEN; if (_response.getCode() >= 400) std::cerr << FAIL ; - std::cerr << " [ response ] : " << "[status: " << _response.getCode() + std::cerr << "[ response ] : " << "[status: " << _response.getCode() << " " << _response.getReasonPhrase(_response.getCode()) << " ] [Content-Length: " << _response.getBodySize() << " ]"; if (_response.isRedirect()) diff --git a/src/Client/Request.cpp b/src/Client/Request.cpp index 6d5c9c6..e17316a 100644 --- a/src/Client/Request.cpp +++ b/src/Client/Request.cpp @@ -302,7 +302,7 @@ int Request::parseClientfield(std::string str) value = str.erase(0, distance + 1); if (_headerField.find(key) != _headerField.end()) { - DBOUT << WARNING << getDebugTime() << FAIL << " [Pars-error] : [double header-field: " << key << " ] [method: " + DBOUT << WARNING << getDebugTime() << FAIL << "[Pars-error] : [double header-field: " << key << " ] [method: " << _method << " ]" << " [target: " << _URI << " ]" << ENDL; } else diff --git a/src/Client/Response.cpp b/src/Client/Response.cpp index 1d0bf02..98f78d9 100644 --- a/src/Client/Response.cpp +++ b/src/Client/Response.cpp @@ -239,7 +239,7 @@ std::string Response::getContentType(void) else if (type == "pdf") return ("application/pdf"); else - return ("application/octet-stream"); + return ("text/plain"); } @@ -303,7 +303,7 @@ std::string Response::getFullURI(void) ret = tmp; if (_upload_dir.empty()) _upload_dir = ret; - DBOUT << WARNING << getDebugTime() << OKCYAN << " [fullURI: " << ret << " ]" << ENDL; + DBOUT << WARNING << getDebugTime() << OKCYAN << "[fullURI: " << ret << " ]" << ENDL; return (ret); } @@ -442,7 +442,7 @@ void Response::invalidClient(void) setHeaderBlocks(); generateHeader(); - DBOUT << WARNING << getDebugTime() << FAIL << " Error Method called" << ENDL; + DBOUT << WARNING << getDebugTime() << FAIL << "Error Method called" << ENDL; } @@ -472,7 +472,7 @@ void Response::methodGet(void) generateBody(); setHeaderBlocks(); generateHeader(); - DBOUT << WARNING << getDebugTime() << GREEN << " GET Method called" << ENDL; + DBOUT << WARNING << getDebugTime() << GREEN << "GET Method called" << ENDL; } void Response::methodPost(void) @@ -500,7 +500,7 @@ void Response::methodPost(void) _code = 204; setHeaderBlocks(); generateHeader(); - DBOUT << WARNING << getDebugTime() << GREEN << " POST Method called" << ENDL; + DBOUT << WARNING << getDebugTime() << GREEN << "POST Method called" << ENDL; \ } @@ -525,7 +525,7 @@ void Response::methodPut(void) } setHeaderBlocks(); generateHeader(); - DBOUT << WARNING << getDebugTime() << GREEN << " PUT Method called" << ENDL; + DBOUT << WARNING << getDebugTime() << GREEN << "PUT Method called" << ENDL; } void Response::methodDelete(void) @@ -543,7 +543,7 @@ void Response::methodDelete(void) OpenErrorFile(_code); setHeaderBlocks(); generateHeader(); - DBOUT << WARNING << getDebugTime() << GREEN << " DELETE Method called" << ENDL; + DBOUT << WARNING << getDebugTime() << GREEN << "DELETE Method called" << ENDL; } diff --git a/src/Server/Server.cpp b/src/Server/Server.cpp index c2075a1..5ca7e43 100644 --- a/src/Server/Server.cpp +++ b/src/Server/Server.cpp @@ -56,7 +56,7 @@ void Server::sendData(Client &client, int fd) " to client " << fd << ENDL; if (sent <= 0) { - DBOUT << getDebugTime() << FAIL << " SEND FAILED" << ENDL; + DBOUT << getDebugTime() << FAIL << "SEND FAILED" << ENDL; client.done = true; } else if (sent > 0) @@ -72,12 +72,12 @@ void Server::readSocket(Client &client, int fd) bytes_read = recv(fd, &stringBUF[0], BUFFSIZE, 0); if (bytes_read == 0) { - DBOUT << getDebugTime() << FAIL << " bytes_read 0" << ENDL; + DBOUT << getDebugTime() << FAIL << "bytes_read 0" << ENDL; client.done = true; } else if (bytes_read == -1) { - DBOUT << getDebugTime() << FAIL << " bytes_read -1" << ENDL; + DBOUT << getDebugTime() << FAIL << "bytes_read -1" << ENDL; client.done = true; } else @@ -94,7 +94,7 @@ void Server::readSocket(Client &client, int fd) inline int Server::delete_client_force(std::map &client_map, int fd) { DBOUT << WARNING << getDebugTime() << OKCYAN - << " force deleting client " + << "force deleting client " << fd << ENDL; @@ -112,7 +112,7 @@ inline int Server::delete_client(std::map &client_map, int fd) if (client_map[fd]->getRequest().getConnection() == "close") { DBOUT << WARNING << getDebugTime() - << " completely deleting client " + << "completely deleting client " << fd << ENDL; @@ -125,7 +125,7 @@ inline int Server::delete_client(std::map &client_map, int fd) else { DBOUT << WARNING << getDebugTime() - << " deleting only client " + << "deleting only client " << fd << ENDL; @@ -150,7 +150,7 @@ inline int Server::delete_fd(std::map &map, { epoll_handle(EPOLL_CTL_DEL, it->first, 0); DBOUT << WARNING << getDebugTime() - << " deleting fd " + << "deleting fd " << it->first << ENDL; delete it->second; @@ -191,7 +191,7 @@ void Server::setup_server_socks(std::map &configurations_map) add_to_epoll_list(server_sock.getFd(), server_events); std::cerr << getDebugTime() << GREEN - << " listening on " + << "listening on " << config->getHost() << ":" << config->getPort() @@ -330,7 +330,7 @@ void Server::run(void) client_map[fd]->generateRespons(_configs); epoll_handle(EPOLL_CTL_MOD, fd, EPOLLOUT); - DBOUT << getDebugTime() << " rearmed to EPOLLOUT" << ENDL; + DBOUT << getDebugTime() << "rearmed to EPOLLOUT" << ENDL; } } else if (events & EPOLLOUT) diff --git a/src/Server/ServerConfig.cpp b/src/Server/ServerConfig.cpp index 5029dcd..8ef2a44 100644 --- a/src/Server/ServerConfig.cpp +++ b/src/Server/ServerConfig.cpp @@ -22,17 +22,14 @@ std::string getDebugTime(void) { time_t rawtime; struct tm *timeinfo; + char buf[32]; time(&rawtime); timeinfo = localtime(&rawtime); - std::string ret = std::string(asctime(timeinfo)); - for (size_t i = 0; i < 3; i++) - { - ret.erase(0, ret.find(" ") + 1); - } - ret.erase(ret.find(" ")); - + int tmp = strftime(buf, 32, "%T", timeinfo); + buf[tmp] = '\0'; + std::string ret = std::string(buf); ret = std::string(WARNING) + "[ " + ret + " ] " + std::string(RESET) + std::string(OKCYAN); diff --git a/src/main.cpp b/src/main.cpp index 601fb74..553b1bb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) catch(const ConfigException& e) { std::cerr << RED << "\n" << WARNING << getDebugTime() - << FAIL << " " << e.getMessage() << ENDL; + << FAIL << e.getMessage() << ENDL; } catch (std::domain_error &e) {