more tests on cgi

2022-07-28 17:27:03 +02:00
parent 8477669e6f
commit e6ec3fe97b
10 changed files with 104 additions and 338 deletions
--- a/srcs/Webserv.cpp
+++ b/srcs/Webserv.cpp
@@ -8,7 +8,7 @@ Webserv::Webserv()
 	_epfd = ::epoll_create1(0); // (EPOLL_CLOEXEC) for CGI fork ?
 	if (_epfd == -1)
 	{
-		std::perror("err epoll_create1(): ");
+		std::perror("err epoll_create1()");
 		throw std::runtime_error("Epoll init");
 	}
 }
@@ -38,9 +38,18 @@ void	Webserv::init_virtual_servers() // ADD config param
 	_socket_fd = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); // (SOCK_CLOEXEC) for CGI fork ?
 	if (_socket_fd == -1)
 	{
-		std::perror("err socket(): ");
+		std::perror("err socket()");
 		throw std::runtime_error("Socket init");
 	}
+	// HUGO ADD
+		// allow socket descriptor to be reuseable
+		int	on = 1;
+		if (setsockopt(_socket_fd, SOL_SOCKET,  SO_REUSEADDR, (char *)&on, sizeof(on)) < 0)
+		{
+			::perror("setsockopt() failed");
+			throw std::runtime_error("Socket init");
+		}
+	// HUGO ADD END

 	_bind(_socket_fd, 4040);
 	_listen(_socket_fd, 512); // 512 arbitrary
@@ -51,7 +60,7 @@ void	Webserv::init_virtual_servers() // ADD config param
 	ev.data.fd = _socket_fd;
 	if (::epoll_ctl(_epfd, EPOLL_CTL_ADD, _socket_fd, &ev) == -1)
 	{
-		std::perror("err epoll_ctl(): ");
+		std::perror("err epoll_ctl()");
 		throw std::runtime_error("Socket init");
 	}
 }
@@ -88,7 +97,7 @@ void	Webserv::start()

 	if (nfds == -1)
 	{
-		std::perror("err epoll_wait(): ");
+		std::perror("err epoll_wait()");
 		throw std::runtime_error("Epoll wait");
 	}
 }
@@ -110,7 +119,7 @@ void	Webserv::_bind(int socket_fd, in_port_t port)

 	if (::bind(socket_fd, (const sockaddr*)&addr, sizeof addr) == -1)
 	{
-		std::perror("err bind(): ");
+		std::perror("err bind()");
 		throw std::runtime_error("Socket bind");		
 	}
 }
@@ -119,7 +128,7 @@ void	Webserv::_listen(int socket_fd, unsigned int max_connections)
 {
 	if (::listen(socket_fd, max_connections) == -1)
 	{
-		std::perror("err listen(): ");
+		std::perror("err listen()");
 		throw std::runtime_error("Socket listen");
 	}
 }
@@ -135,7 +144,7 @@ void	Webserv::_accept_connection(int fd)
 	accepted_fd = ::accept(fd, (sockaddr*)&addr, &addr_len);
 	if (accepted_fd == -1)
 	{
-		std::perror("err accept(): ");
+		std::perror("err accept()");
 		return;
 	}
 	::fcntl(accepted_fd, F_SETFL, O_NONBLOCK);
@@ -145,7 +154,7 @@ void	Webserv::_accept_connection(int fd)
 	ev.events = EPOLLIN;
 	ev.data.fd = accepted_fd;
 	if (::epoll_ctl(_epfd, EPOLL_CTL_ADD, accepted_fd, &ev) == -1)
-		std::perror("err accept() epoll_ctl(): ");
+		std::perror("err accept() epoll_ctl()");
 }

 void	Webserv::_read_request(int fd)
@@ -154,9 +163,9 @@ void	Webserv::_read_request(int fd)
 	_read_ret = ::recv(fd, _buf, BUFSIZE, 0);
 	if (_read_ret == -1)
 	{
-		std::perror("err recv(): ");
+		std::perror("err recv()");
 		if (::send(fd, MSG_BOUNCE, sizeof MSG_BOUNCE - 1, 0) == -1)
-			std::perror("err send(): ");
+			std::perror("err send()");

 		::close(fd);
 		return;
@@ -175,79 +184,76 @@ void	Webserv::_read_request(int fd)
 		std::perror("err accept() epoll_ctl(): ");
 }

+void	Webserv::_serve_file(int fd, std::string page)
+{
+	int	page_fd;
+	std::string to_send;
+	std::string end_header = "\r\n\r\n";
+	std::string body;
+	std::stringstream strs;
+	char buffer[1];
+
+	to_send  = "HTTP/1.1 200 OK\n";
+	to_send += "Content-Type: text/html;\n";
+	to_send += "Content-Length: ";
+	page_fd = open(page.c_str(), O_RDONLY);
+	for (int ret = 1; ret > 0;)
+	{
+		ret = read(page_fd, buffer, 1);
+		body += buffer;
+	}
+	strs << body.size();
+	to_send += strs.str();
+	to_send += end_header;
+	to_send += body;
+	if (::send(fd, to_send.c_str(), to_send.size(), 0) == -1)
+		std::perror("err send()");
+}
+void	Webserv::_exec_cgi_script(int fd)
+{
+	int		save_stdout;
+	char**	env = new char*[5];
+	char * const * nll = NULL;
+
+	// set env
+	env[0] = strdup("PATH_INFO=/no");
+	env[1] = strdup("REQUEST_METHOD=POST");
+	env[2] = strdup("SERVER_PROTOCOL=HTTP/1.1");
+	env[3] = strdup("CONTENT_LENGTH=665");
+	env[4] = NULL;
+	// save STDOUT
+	save_stdout = dup(STDOUT_FILENO);
+	// inside chil process
+	if (fork() == 0)
+	{
+		dup2(fd, STDOUT_FILENO);
+//		execve("./srcs/cgi-bin/cgi_cpp.cgi", nll, env);
+		execve("./srcs/cgi-bin/php-cgi", nll, env);
+	}
+	// inside parent process
+	else
+		waitpid(-1, NULL, 0);
+	// restore stdout
+	dup2(save_stdout, STDOUT_FILENO);
+}
+
 void	Webserv::_send_response(int fd)
 {
-
-
-	// TMP test cgi
-	// find POST in _buf
-	std::string tmpstr = _buf;
-	std::size_t found;
-	found = tmpstr.find("POST");
-	// if "POST" found, execve a cgi
-	if (found != std::string::npos)
-	{
-		int		save_stdout;
-		char**	env = new char*[4];
-		char * const * nll = NULL;
-
-		// set env
-		env[0] = strdup("PATH_INFO=/no");
-		env[1] = strdup("REQUEST_METHOD=POST");
-		env[2] = strdup("SERVER_PROTOCOL=HTTP/1.1");
-		env[3] = NULL;
-		// save STDOUT
-		save_stdout = dup(STDOUT_FILENO);
-		// inside chil process
-		if (fork() == 0)
-		{
-			dup2(fd, STDOUT_FILENO);
-			execve("./srcs/cgi-bin/cgi_cpp.cgi", nll, env);
-		}
-		// inside parent process
-		else
-			waitpid(-1, NULL, 0);
-		// restore stdout
-		dup2(save_stdout, STDOUT_FILENO);
-		// don't send the rest
-		::close(fd);
-		return;
-	}
-	else
-		found = tmpstr.find("index.html");
-	// if "index.html" found, send the page
-	if (found != std::string::npos)
-	{
-		int	index_fd;
-		std::string to_send;
-		std::string end_header = "\r\n\r\n";
-		std::string body;
-		std::stringstream strs;
-		char buffer[1];
-
-		to_send = "HTTP/1.1 200 OK\nContent-Type: text/html; charset=UTF-8\nContent-Length: ";
-		index_fd = open("./index.html", O_RDONLY);
-		for (int ret = 1; ret > 0;)
-		{
-			ret = read(index_fd, buffer, 1);
-			body += buffer;
-		}
-		strs << body.size();
-		to_send += strs.str();
-		to_send += end_header;
-		to_send += body;
-		::send(fd, to_send.c_str(), to_send.size(), 0);
-		// don't send the rest
-		::close(fd);
-		return;
-	}
-	// TMP end test cgi
-
+	// TMP HUGO test cgi
+		// if "POST" found in _buf, execve a cgi
+		if (std::string(_buf).find("POST") != std::string::npos)
+			_exec_cgi_script(fd);
+		// if "index.html" found in _buf, send the page
+		if (std::string(_buf).find("index.html") != std::string::npos)
+			_serve_file(fd, "index.html");
+	// TMP HUGO end test cgi

 	std::cout << "send()\n";
+	std::cout << "buf size: " << strlen(_buf) << "\n";
+	std::cout << "_buf: " << _buf << "\n";
 	if (::send(fd, _buf, _read_ret, 0) == -1)
-		std::perror("err send(): ");
+		std::perror("err send()");
 	if (::send(fd, MSG_TEST, sizeof MSG_TEST - 1, 0) == -1)
-		std::perror("err send(): ");
+		std::perror("err send()");
 	::close(fd);
 }
--- a/srcs/cgi-bin/php-cgi
+++ b/srcs/cgi-bin/php-cgi
@@ -1,7 +1,9 @@
 #! /usr/bin/php

-# <?php phpinfo(); ?>
 <?php
+	echo "BEGIN PHP-CGI\n-----------\n\n";
+	//phpinfo();
 	echo getenv('REQUEST_METHOD');
-	echo $_POST['REQUEST_METHOD'];
+	//echo $_POST['REQUEST_METHOD'];
+	echo "\n\n-----------\nEND PHP-CGI\n\n";
 ?>