Changeset 82813 in vbox for trunk/src/VBox

Timestamp:

Jan 21, 2020 5:48:19 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/FTP: Remember the current working directory per client.

Location:

trunk/src/VBox/Runtime

Files:

• generic/ftp-server.cpp (modified) (5 diffs)
• tools/RTFTPServer.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/generic/ftp-server.cpp

@@ -364 +364 @@
     " UTF8"
 
+/** Maximum length in characters a FTP server path can have (excluding termination). */
+#define RTFTPSERVER_MAX_PATH        RTPATH_MAX
+
 
 /*********************************************************************************************************************************
@@ -461 +464 @@
     RTStrFree(psz);
 
+    return rc;
+}
+
+/**
+ * Sets the current working directory for a client.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to set current working directory for.
+ * @param   pcszPath            Working directory to set.
+ */
+static int rtFtpSetCWD(PRTFTPSERVERCLIENT pClient, const char *pcszPath)
+{
+    RTStrFree(pClient->State.pszCWD);
+
+    pClient->State.pszCWD = RTStrDup(pcszPath);
+
+    LogFlowFunc(("Current CWD is now '%s'\n", pClient->State.pszCWD));
+
+    int rc = pClient->State.pszCWD ? VINF_SUCCESS : VERR_NO_MEMORY;
+    AssertRC(rc);
     return rc;
 }
@@ -1038 +1061 @@
 
     if (RT_SUCCESS(rc))
+    {
+        const size_t cbPath   = sizeof(char) * RTFTPSERVER_MAX_PATH;
+        char        *pszPath  = RTStrAlloc(cbPath);
+        if (pszPath)
+        {
+            RTFTPSERVER_HANDLE_CALLBACK_VA(pfnOnPathGetCurrent, pszPath, cbPath);
+
+            if (RT_SUCCESS(rc))
+                rtFtpSetCWD(pClient, pszPath);
+
+            RTStrFree(pszPath);
+        }
+        else
+            rc = VERR_NO_MEMORY;
+
         return rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_OKAY);
+    }
 
     return rc;
@@ -1050 +1089 @@
     int rc;
 
-    RTFTPSERVER_HANDLE_CALLBACK_VA(pfnOnPathSetCurrent, apcszArgs[0]);
-
-    if (RT_SUCCESS(rc))
+    const char *pcszPath = apcszArgs[0];
+
+    RTFTPSERVER_HANDLE_CALLBACK_VA(pfnOnPathSetCurrent, pcszPath);
+
+    if (RT_SUCCESS(rc))
+    {
+        rtFtpSetCWD(pClient, pcszPath);
+
         return rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_OKAY);
+    }
 
     return rc;
@@ -1711 +1756 @@
     pState->pszUser = NULL;
 
+    RTStrFree(pState->pszCWD);
+    pState->pszCWD = NULL;
+
     pState->cFailedLoginAttempts = 0;
     pState->tsLastCmdMs          = RTTimeMilliTS();

trunk/src/VBox/Runtime/tools/RTFTPServer.cpp

@@ -256 +256 @@
     Assert(pData->cbUser == sizeof(FTPSERVERDATA));
 
+    const char *pcszStat = pcszPath ? pcszPath : pThis->szCWD;
+
+    RTPrintf("Stat for '%s'\n", pcszStat);
+
     RTFILE hFile;
-    int rc = RTFileOpen(&hFile, pcszPath ? pcszPath : pThis->szCWD,
+    int rc = RTFileOpen(&hFile, pcszStat,
                         RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (RT_SUCCESS(rc))
@@ -294 +298 @@
     RTPrintf("Current directory is: '%s'\n", pThis->szCWD);
 
-    RTStrPrintf(pszPWD, cbPWD, "%s", pThis->szCWD);
-
-    return VINF_SUCCESS;
+    return RTStrCopy(pszPWD, cbPWD, pThis->szCWD);
 }