Ticket #10912: Filezilla Server +CPFR CPTO commands.patch

source/ControlSocket.cpp

@@ -400 +400 @@
     CLNT,
     MFMT,
     HASH
+#ifndef FTP_STRICT
+    ,
+    CPFR,   // non-normalized FTP
+    CPTO
+#endif // FTP_STRICT
 };
 
 std::map<CStdString, t_command> const command_map = {
@@ -452 +457 @@
     {_T("STRU"), {commands::STRU, true, false}},
     {_T("CLNT"), {commands::CLNT, true, true}},
     {_T("MFMT"), {commands::MFMT, true, false}},
-    {_T("HASH"), {commands::HASH, true, false}}
+    {_T("HASH"), {commands::HASH, true, false}},
+    {_T("CPFR"), {commands::CPFR, true,  false}},
+    {_T("CPTO"), {commands::CPTO, true,  false}}
 };
 
 t_command CControlSocket::MapCommand(CStdString const& command, CStdString const& args)
@@ -534 +541 @@
                 break;
             }
             RenName = _T("");
+            CopyName = _T("");
             args.MakeLower();
             m_status.username = args;
             UpdateUser();
@@ -1934 +1942 @@
             }
         }
         break;
+    case commands::CPFR:
+        {
+            //Unquote args
+            if (!UnquoteArgs(args)) {
+                Send( _T("501 Syntax error") );
+                break;
+            }
+
+            CopyName = _T("");
+
+            CStdString physicalFile, logicalFile;
+            int error = m_owner.m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_READ, physicalFile, logicalFile);
+            if (!error) {
+                CopyName = physicalFile;
+                Send(_T("350 File exists, ready for destination name."));
+                break;
+            }
+            else if (error & PERMISSION_DENIED)
+                Send(_T("550 Permission denied"));
+            else if (error & PERMISSION_INVALIDNAME)
+                Send(_T("550 Filename invalid."));
+            else if (error & PERMISSION_NOTFOUND)
+                Send(_T("550 file not found"));
+            else {
+                Send(_T("553 Copy of directory not supported."));
+                break;
+            }
+        }
+        break;
+    case commands::CPTO:
+        {
+            if (CopyName == _T(""))
+            {
+                Send(_T("503 Bad sequence of commands!"));
+                break;
+            }
+
+            //Unquote args
+            if (!UnquoteArgs(args)) {
+                Send( _T("501 Syntax error") );
+                break;
+            }
+
+            CStdString physicalFile, logicalFile;
+            int error = m_owner.m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_CREATENEW, physicalFile, logicalFile);
+            if (error)
+                CopyName = _T("");
+            if (error & PERMISSION_DENIED)
+                Send(_T("550 Permission denied"));
+            else if (error & PERMISSION_INVALIDNAME)
+                Send(_T("553 Filename invalid"));
+            else if (error & PERMISSION_DOESALREADYEXIST && (error & PERMISSION_DIRNOTFILE)!=PERMISSION_DIRNOTFILE)
+                Send(_T("553 File exists"));
+            else if (error)
+                Send(_T("553 Filename invalid"));
+            else
+            {
+                Send(_T("151 Copying the file"));
+                if (!CopyFile(RenName, physicalFile, TRUE))
+                    Send(_T("450 Internal error copying the file"));
+                else
+                    Send(_T("250 file copied successfully"));
+            }
+        }
+        break;
     default:
         Send(_T("502 Command not implemented."));
     }

source/ControlSocket.h

@@ -142 +142 @@
 
     CStdString RenName;
     bool bRenFile{};
+    CStdString CopyName;
 
     enum TransferMode
     {