Fixed Win32 writable file, added more tests and removed Path Vulnerab…

…ility Test for now
eclipse-ecal · Oct 24, 2023 · 02fd0de · 02fd0de
1 parent 87bce95
commit 02fd0de
Show file tree

Hide file tree

Showing 3 changed files with 343 additions and 10 deletions.
diff --git a/fineftp-server/src/ftp_session.cpp b/fineftp-server/src/ftp_session.cpp
@@ -122,7 +122,7 @@ namespace fineftp
                         }
                         else
                         {
-                          std::cerr << "Command write error: " << ec.message() << std::endl;
+                          std::cerr << "Command write error for message " << me->command_output_queue_.front() << ec.message() << std::endl;
                         }
                       }
                     ));
@@ -254,10 +254,12 @@ namespace fineftp
       // Close command socket
       command_strand_.post([me = shared_from_this()]()
                             {
+          // TODO: Decide when to close the command socket. Doing that here actually breaks sending the "221 Closing command socket" message.
+
                               // Properly close command socket
-                              asio::error_code ec;
-                              me->command_socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ec);
-                              me->command_socket_.close(ec);
+                              //asio::error_code ec;
+                              //me->command_socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ec);
+                              //me->command_socket_.close(ec);
                             });
     }
     else

diff --git a/fineftp-server/src/win32/file_man.cpp b/fineftp-server/src/win32/file_man.cpp
@@ -115,9 +115,9 @@ WriteableFile::WriteableFile(const std::string& filename, std::ios::openmode mod
   (void)mode;
 #if !defined(__GNUG__)
   auto wfilename = StrConvert::Utf8ToWide(filename);
-  handle_ = ::CreateFileW(wfilename.c_str(), GENERIC_WRITE, FILE_SHARE_DELETE, nullptr, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
+  handle_ = ::CreateFileW(wfilename.c_str(), GENERIC_WRITE, FILE_SHARE_DELETE, nullptr, CREATE_NEW, FILE_ATTRIBUTE_NORMAL /*FILE_FLAG_WRITE_THROUGH*/, 0);
 #else
-  handle_ = ::CreateFileA(filename.c_str(), GENERIC_WRITE, FILE_SHARE_DELETE, nullptr, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
+  handle_ = ::CreateFileA(filename.c_str(), GENERIC_WRITE, FILE_SHARE_DELETE, nullptr, CREATE_NEW, /*FILE_ATTRIBUTE_NORMAL*/ FILE_FLAG_WRITE_THROUGH, 0);
 #endif
 
   if (INVALID_HANDLE_VALUE != handle_ && (mode & std::ios::app) == std::ios::app)
@@ -139,6 +139,7 @@ void WriteableFile::close()
   if (INVALID_HANDLE_VALUE != handle_)
   {
     ::CloseHandle(handle_);
+    handle_ = INVALID_HANDLE_VALUE;
   }
 }