Added parsing cookies

Author: awwit

httpserverapp.userprefs

@@ -1,20 +1,21 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="httpserverapp/Utils.cpp">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="httpserverapp/Main.cpp">
     <Files>
       <File FileName="httpserverapp/Main.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Main.cpp" Line="58" Column="2" />
+      <File FileName="httpserverapp/Main.cpp" Line="26" Column="42" />
       <File FileName="httpserverapp/ServerRequest.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/ServerResponse.h" Line="7" Column="1" />
-      <File FileName="httpserverapp/Utils.h" Line="47" Column="57" />
+      <File FileName="httpserverapp/ServerResponse.h" Line="1" Column="1" />
+      <File FileName="httpserverapp/Utils.h" Line="55" Column="2" />
       <File FileName="httpserverapp/Test.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Test.cpp" Line="13" Column="2" />
+      <File FileName="httpserverapp/Test.cpp" Line="24" Column="3" />
       <File FileName="httpserverapp/Socket.h" Line="1" Column="1" />
-      <File FileName="httpserverapp/Utils.cpp" Line="22" Column="2" />
+      <File FileName="httpserverapp/Utils.cpp" Line="272" Column="112" />
       <File FileName="httpserverapp/Socket.cpp" Line="1" Column="1" />
       <File FileName="httpserverapp/System.h" Line="1" Column="1" />
       <File FileName="httpserverapp/RawData.h" Line="1" Column="1" />
       <File FileName="httpserverapp/System.cpp" Line="1" Column="1" />
+      <File FileName="httpserverapp/ResourceAbstract.cpp" Line="19" Column="3" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

httpserverapp/FileIncoming.cpp

@@ -6,25 +6,33 @@
 namespace HttpServer
 {
 	FileIncoming::FileIncoming(const std::string &fileName, const std::string &fileType, const size_t fileSize)
+		: file_name(fileName), file_type(fileType), file_size(fileSize)
 	{
-		file_name = fileName;
-		file_type = fileType;
-		file_size = fileSize;
+		
 	}
 
-	FileIncoming::~FileIncoming()
+	FileIncoming::FileIncoming(const FileIncoming &file)
+		: file_name(file.file_name), file_type(file.file_type), file_size(file.file_size)
 	{
 
 	}
 
+	FileIncoming::FileIncoming(FileIncoming &&file)
+		: file_name(file.file_name), file_type(file.file_type), file_size(file.file_size)
+	{
+		file.file_name.clear();
+		file.file_type.clear();
+		file.file_size = 0;
+	}
+
 	bool FileIncoming::isExists() const
 	{
-		std::ifstream file(file_name);
+		std::ifstream file(file_name, std::ifstream::binary);
 
 		bool is_exists = file.good();
 
 		file.close();
 
 		return is_exists;
 	}
-};
+};

httpserverapp/FileIncoming.h

@@ -12,11 +12,13 @@ namespace HttpServer
 		size_t file_size;
 
 	private:
-		FileIncoming();
+		FileIncoming() = delete;
 
 	public:
 		FileIncoming(const std::string &, const std::string &, const size_t);
-		~FileIncoming();
+		FileIncoming(const FileIncoming &);
+		FileIncoming(FileIncoming &&);
+		~FileIncoming() = default;
 
 		inline std::string getName() const
 		{
@@ -35,4 +37,4 @@ namespace HttpServer
 
 		bool isExists() const;
 	};
-};
+};

httpserverapp/Main.cpp

@@ -16,21 +16,30 @@ DLLEXPORT int application_call(HttpServer::server_request *request, HttpServer::
 	std::unordered_map<std::string, std::string> headers;
 	std::unordered_multimap<std::string, std::string> data;
 	std::unordered_multimap<std::string, HttpServer::FileIncoming> files;
+	std::unordered_multimap<std::string, std::string> cookies;
 
 	Utils::rawPairsToStlUnorderedMultimap(params, request->params, request->params_count);
 	Utils::rawPairsToStlUnorderedMap(headers, request->headers, request->headers_count);
 	Utils::rawPairsToStlUnorderedMultimap(data, request->data, request->data_count);
 	Utils::rawFilesInfoToFilesIncoming(files, request->files, request->files_count);
 
+	auto it_cookie = headers.find("Cookie");
+
+	if (headers.end() != it_cookie)
+	{
+		Utils::parseCookies(it_cookie->second, cookies);
+	}
+
 	HttpServer::ServerRequest proc_request {
 		HttpServer::Socket(request->socket),
 		std::string(request->method),
 		std::string(request->uri_reference),
 		std::string(request->document_root),
-		params,
-		headers,
-		data,
-		files
+		std::move(params),
+		std::move(headers),
+		std::move(data),
+		std::move(files),
+		std::move(cookies)
 	};
 
 	HttpServer::ServerResponse proc_response {
@@ -42,11 +51,17 @@ DLLEXPORT int application_call(HttpServer::server_request *request, HttpServer::
 
 	int result = EXIT_SUCCESS;
 
-	std::ifstream file(absolute_path);
+	std::ifstream file(absolute_path, std::ifstream::binary);
 
 	if (file)
 	{
-		proc_response.headers["Connection"] = "keep-alive";
+		auto it_connection = proc_request.headers.find("Connection");
+
+		if (proc_request.headers.cend() != it_connection)
+		{
+			proc_response.headers["Connection"] = it_connection->second;
+		}
+
 		proc_response.headers["X-Sendfile"] = absolute_path;
 	}
 	else

httpserverapp/ServerRequest.h

@@ -34,7 +34,8 @@ namespace HttpServer
 	 * @member const std::unordered_multimap<std::string, std::string> params - параметры ресурса
 	 * @member const std::unordered_map<std::string, std::string> headers - заголовки запроса
 	 * @member const std::unordered_multimap<std::string, std::string> data - входящие данные запроса
-	 * @member const std::unordered_multimap<std::string, FileIncoming *> files - входящие файлы запроса
+	 * @member const std::unordered_multimap<std::string, FileIncoming> files - входящие файлы запроса
+	 * @member const std::unordered_multimap<std::string, std::string> cookies - входящие куки запроса
 	 */
 	struct ServerRequest
 	{
@@ -46,5 +47,6 @@ namespace HttpServer
 		const std::unordered_map<std::string, std::string> headers;
 		const std::unordered_multimap<std::string, std::string> data;
 		const std::unordered_multimap<std::string, FileIncoming> files;
+		const std::unordered_multimap<std::string, std::string> cookies;
 	};
 };