fix query and remove system env

Author: Abdelaziz Chakkaf

headers/Cgi.hpp

@@ -15,7 +15,7 @@
 
 class Cgi {
     private:
-        char                        **createEnvironmentVariables(Request &request, char **systemEnv);
+        char                        **createEnvironmentVariables(Request &request);
         std::vector<std::string>    extractBinaryPaths(char **environmentVariables);
         std::string                 locateExecutable(const std::vector<std::string> &searchPaths,
 													const std::string &executableName);

srcs/models/Cgi.cpp

@@ -26,25 +26,17 @@ Cgi::Cgi() {}
 
 Cgi::~Cgi() {}
 
-char **Cgi::createEnvironmentVariables(Request &request, char **systemEnv)
+char **Cgi::createEnvironmentVariables(Request &request)
 {
-	size_t systemEnvCount = 0;
-	while (systemEnv[systemEnvCount])
-		++systemEnvCount;
-
-	char **envVariables = new char *[systemEnvCount + request.getEnvSize() + 1]; // free this
 	size_t index = 0;
+	char **envVariables = new char *[request.getEnvSize() + 1];
 
-	while (systemEnv[index])
-	{
-		envVariables[index] = strdup(systemEnv[index]);
+	while (index < request.getEnvSize()){
+		envVariables[index] = strdup(request.getEnv(index).c_str());
 		++index;
 	}
 
-	for (size_t j = 0; !request.getEnv(j).empty(); ++j)
-		envVariables[index++] = strdup(request.getEnv(j).c_str());
-
-	envVariables[index - 1] = NULL;
+	envVariables[index] = NULL;
 	return envVariables;
 }
 
@@ -87,7 +79,7 @@ std::string Cgi::locateExecutable(const std::vector<std::string> &searchPaths, c
 std::string Cgi::executeCgiScript(Request &request, char **systemEnv)
 {
 	request.convertToEnv();
-	char **envVariables = createEnvironmentVariables(request, systemEnv);
+	char **envVariables = createEnvironmentVariables(request);
 	std::vector<std::string> binaryPaths = extractBinaryPaths(systemEnv);
 	std::string scriptExtension;
 	std::string interpreterPath;

srcs/models/Request.cpp

@@ -36,7 +36,7 @@ Request::Request(const std::string &requestString, ClientData& c) :client(c)
 
 	if (this->path.find_first_of("?") != std::string::npos)
 	{
-		this->query = this->path.substr(this->path.find_first_of("?"));
+		this->query = this->path.substr(this->path.find_first_of("?") + 1);
 		size_t queryStart = this->path.find_first_of("?") + 1;
 		while (true)
 		{
@@ -104,10 +104,13 @@ void Request::convertToEnv(void)
 	if (!headerPairs["Host"].empty())
 		vEnv.push_back("HTTP_HOST="+ headerPairs["Host"]);
 
+	// vEnv.push_back(("DOCUMENT_ROOT="+ client.server->getRootPath()));
+	vEnv.push_back("DOCUMENT_ROOT=/Users/achakkaf/Documents/webserv/var/www/html");
+
 	if (!headerPairs["User-Agent"].empty())
 		vEnv.push_back("HTTP_USER_AGENT="+ headerPairs["User-Agent"]);
 	if (!headerPairs["Cookie"].empty())
-		vEnv.push_back("HTTP_COOKIE="+ headerPairs["Cookie"]); // is this correct HTTP_COOKIE=session=0c4982e7b7ef3dca??
+		vEnv.push_back("HTTP_COOKIE="+ headerPairs["Cookie"]); // is this correct HTTP_COOKIE=session=0c4982e7b7ef3dca ??
 	if (!headerPairs["Authorization"].empty())
 		vEnv.push_back("HTTP_AUTHORIZATION="+ headerPairs["Authorization"]);
 	printMap(vEnv); // remove this