Last improvements

data/www/test_post.py

@@ -0,0 +1,17 @@
+import sys
+import select
+
+def main():
+
+
+    print('From cgi: waiting on the servers message', file=sys.stderr)
+
+    print(sys.stdin.readlines())
+
+    # if input_data.strip():
+    #     sys.stdout.write(input_data)
+
+    print('From cgi: after writing to the server', file=sys.stderr)
+
+if __name__ == "__main__":
+    main()

include/CGI.hpp

@@ -1,20 +1,51 @@
 #ifndef CGI_HPP
 #define CGI_HPP
 
+#include <ClientState.hpp>
+#include <HTTPRequest.hpp>
+#include <string>
+#include <memory>
+#include <unordered_map>
+
 #define READ_END 0
 #define WRITE_END 1
 
-// Common gateway interface
+class Client;
+class Poll;
 
 class CGI
 {
-  private:
+private:
+	pid_t		_pid;
+	size_t		_bodyBytesWritten;
+	std::string	_executable;
+	std::string	_pathInfo;
+	std::string	_subPathInfo;
+	std::string	_queryString;
+
   public:
 	CGI();
 	CGI(const CGI &src) = delete;
 	CGI &operator=(const CGI &rhs) = delete;
 	~CGI();
-	void execute();
+
+	ClientState	start(Poll &poll, Client &client, size_t body_length, 
+		std::unordered_map<int, std::shared_ptr<int>> &active_pipes);
+	ClientState	parseURIForCGI(std::string requestTarget);
+	void		execute(std::string executable);
+	bool		fileExists(const std::string& filePath);
+	bool		isExecutable(const std::string& filePath);
+
+	const std::string&	getExecutable(void) const;
+	void				setExecutable(std::string executable);
+	const pid_t&		getPid(void) const;
+
+	ClientState	send(Client &client ,std::string body, size_t bodyLength);
+	size_t		getBufferSize(size_t bodyLength);
+	ClientState	receive(Client &client);
+
+	std::string	body;
+	int			pipe_fd[2];
 };
 
 #endif

include/Client.hpp

@@ -6,6 +6,8 @@
 #include <HTTPRequest.hpp>
 #include <HTTPResponse.hpp>
 #include <Socket.hpp>
+#include <memory>
+#include <unordered_map>
 
 class Client
 {
@@ -16,16 +18,27 @@ class Client
 	const Client &operator=(const Client &other) = delete;
 	~Client();
 
-	ClientState handleConnection(short events);
+	ClientState handleConnection(short events, Poll &poll, Client &client, 
+		std::unordered_map<int, std::shared_ptr<int>> &active_pipes);
 	int getFD(void) const;
+	int	*getCgiToServerFd(void);
+	int	*getServerToCgiFd(void);
+	HTTPRequest	&getRequest(void);
+	void	setState(ClientState state);
+
+	bool	cgiBodyIsSent;
+	bool	cgiHasBeenRead;
+	bool	KO;
 
   private:
-	HTTPRequest _request;
-	HTTPResponse _response;
-	FileManager _file_manager;
-	CGI _cgi;
-	Socket _socket;
-	ClientState _state;
+	HTTPRequest		_request;
+	HTTPResponse	_response;
+	FileManager		_file_manager;
+	CGI				_cgi;
+	Socket			_socket;
+	ClientState		_state;
+	int				_serverToCgiFd[2];
+	int				_cgiToServerFd[2];
 };
 
 #endif

include/ClientState.hpp

@@ -4,11 +4,14 @@
 enum class ClientState
 {
 	Receiving,
+	CGI_Start,
+	CGI_Write,
+	CGI_Read,
 	Loading,
 	Sending,
 	Done,
 	Error,
-	Unkown,
+	Unknown,
 };
 
 #endif

include/FileManager.hpp

@@ -9,8 +9,10 @@
 class FileManager
 {
   private:
-	std::string _response;
-	std::fstream _request_target;
+	std::string		_response;
+	std::fstream	_request_target;
+	size_t			_bytes_sent;
+	// CGI			_cgi;
 
   public:
 	FileManager();
@@ -26,10 +28,13 @@ class FileManager
 	ClientState loadErrorPage(void);
 	ClientState manage(HTTPMethod method, const std::string &filename,
 					   const std::string &body);
+	ClientState manageCgi(std::string http_version, const std::string &body);
 	ClientState manageGet(void);
 	ClientState managePost(const std::string &body);
 	ClientState manageDelete(const std::string &reqest_target_path);
 
+	// CGI APPEND FUNCTION
+
 	const std::string &getResponse(void) const;
 };
 

include/HTTPRequest.hpp

@@ -47,15 +47,21 @@ class HTTPRequest
 	const std::string &getBody(void) const;
 	ClientState receive(int fd);
 
+	const std::string	&getExecutable(void) const;
+	void				setCGIToTrue(void);
+	const bool			&CGITrue(void) const;
+	const size_t		&getBodyLength(void) const;
+
   private:
-	ssize_t _bytes_read;
-	size_t _content_length;
-	HTTPMethod _methodType;
+	ssize_t 	_bytes_read;
+	size_t 		_content_length;
+	HTTPMethod 	_methodType;
 	std::string _http_request;
 	std::string _request_target;
 	std::string _http_version;
 	std::string _body;
 	std::unordered_map<std::string, std::string> _headers;
+	bool		_cgi;
 
 	size_t parseStartLine(size_t &i);
 	size_t parseHeaders(size_t &i);

include/HTTPServer.hpp

@@ -25,11 +25,17 @@ class HTTPServer
 	Poll _poll;
 	std::unordered_map<int, std::shared_ptr<Server>> _active_servers;
 	std::unordered_map<int, std::shared_ptr<Client>> _active_clients;
+	std::unordered_map<int, std::shared_ptr<int>> _active_pipes;
 
 	void setupServers(void);
 	void handleActivePollFDs();
 	void handleNewConnection(int fd);
-	void handleExistingConnection(const pollfd &poll_fd);
+	void handleExistingConnection(const pollfd &poll_fd, Poll &poll, Client &client, 
+			std::unordered_map<int, std::shared_ptr<int>> &active_pipes);
+	Client &findClientByFd(int targetFd);
+	Client &getClientByPipeFd(int pipe_fd);
+	void	handlePipeConnection(const pollfd &poll_fd, Poll &poll, Client &client, 
+		std::unordered_map<int, std::shared_ptr<int>> &active_pipes);
 };
 
 #endif

include/Socket.hpp

@@ -4,6 +4,9 @@
 #include <netinet/in.h>
 #include <string>
 
+// MAX_PENDING_CONNECTION SHOULDN'T BE 1
+// WHY 10? WE CAN ALSO SET IT ON 1024, THAT'S 
+// MORE SAFE, CONCERNING THE AVAILABILITY (siege -b)
 #define MAX_PENDING_CONNECTIONS 10
 
 typedef struct sockaddr_in t_sockaddr_in;

out.txt

@@ -1,2 +0,0 @@
-['hello world!\n', 'goodbye world!\n']
-Content-type: text/html