From 843ffc91eeaf8097915684d5a728ec974f7e2051 Mon Sep 17 00:00:00 2001
From: Talyx <farruh.rahmatov40@gmail.com>
Date: Sat, 19 Feb 2022 16:55:18 +0300
Subject: [PATCH] add : upload dir

---
 src/Client/Response.cpp | 22 ++++++++++++++--------
 src/Client/Response.hpp |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Client/Response.cpp b/src/Client/Response.cpp
index 9ef9737..ade0982 100644
--- a/src/Client/Response.cpp
+++ b/src/Client/Response.cpp
@@ -217,11 +217,15 @@ std::string	Response::getFullURI(void)
 		int	pos = 0;
 		pos = _request.getURI().rfind("/");
 		tmp = _request.getURI().substr(pos);
+		if (!_location->uploadDir.empty())
+			_upload_dir = _location->uploadDir + tmp;
 		tmp = _location->root + tmp;
 	}
 	else
 	{
 		tmp	= _request.getURI().substr(len);
+		if (!_location->uploadDir.empty())
+			_upload_dir = _location->uploadDir + tmp;
 		tmp = _location->root + tmp;
 	}
 	if (_request.isDir(tmp) ==  0)
@@ -235,9 +239,11 @@ std::string	Response::getFullURI(void)
 	}
 	else
 		ret = tmp;
-
+	if (_upload_dir.empty())
+		_upload_dir = ret;
 	DBOUT << PINK << "location " << _location->location << ENDL;
 	DBOUT << PINK << "fullURI " << ret << ENDL;
+	DBOUT << PINK << "upload dir " << _upload_dir << ENDL;
 	return (ret);
 }
 
@@ -274,11 +280,11 @@ bool	Response::allowedMethod(std::string &method)
 	{
 		if (*it == method)
 			return (true);
-		DBOUT << BLUE << *it << ENDL;
 		it++;
 	}
-	if (_location->cgi_pass.empty())
-		_code = 405;
+	if (!_location->cgi_pass.empty() && (method == "GET" || method == "POST"))
+		return (true);
+	_code = 405;
 	return (false);
 	
 }
@@ -337,7 +343,7 @@ void	Response::generate2(serverListen &l)
 			_code = (_request.getBody()->size() > (unsigned long)_maxBodySize) ? 413 : _code;
 	}
 
-	if (_request.badCode(_code) || (!allowedMethod(_method) && _location->cgi_pass.empty()) || isRedirect())
+	if (_request.badCode(_code) || !allowedMethod(_method) || isRedirect())
 	{
 		invalidClient();
 		return;
@@ -435,16 +441,16 @@ void	Response::methodPost(void)
 void	Response::methodPut(void)
 {
 	_code = 201;
-	if (_request.isFile(_fullURI) == 0)
+	if (_request.isFile(_upload_dir) == 0)
 		_code = 204;
-	std::ofstream	file(_fullURI.c_str(), std::ios::out | std::ios::binary);
+	std::ofstream	file(_upload_dir.c_str(), std::ios::out | std::ios::binary);
 	if (!file.is_open())
 		_code = 403;
 	else
 	{
 		file.write(_request.getBody()->data(), _request.getBody()->size());
+		file.close();
 	}
-	file.close();
 	setHeaderBlocks();
 	generateHeader();
 	DBOUT << GREEN << "PUT method called" << ENDL;
diff --git a/src/Client/Response.hpp b/src/Client/Response.hpp
index ccac86c..d73a8a7 100644
--- a/src/Client/Response.hpp
+++ b/src/Client/Response.hpp
@@ -33,6 +33,7 @@ private:
     std::string     _locationSTR;
     std::string     _contentLanguage;
     std::string     _transferEncoding;
+    std::string     _upload_dir;
 
     void            setHeaderBlocks(void);
     void            setContentType(void);