Changeset 82781 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 16, 2020 12:49:33 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/FTP: Implemented FEAT and OPTS commands, along with some more protocol tweaking in order to make connecting w/ Nautilus work. bugref:9646

File:

• trunk/src/VBox/Runtime/generic/ftp-server.cpp (modified) (11 diffs)

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

@@ -133 +133 @@
     /** Gets the current working directory. */
     RTFTPSERVER_CMD_PWD,
+    /** Get options. Needed in conjunction with the FEAT command. */
+    RTFTPSERVER_CMD_OPTS,
     /** Terminates the session (connection). */
     RTFTPSERVER_CMD_QUIT,
@@ -300 +302 @@
 static FNRTFTPSERVERCMD rtFtpServerHandlePORT;
 static FNRTFTPSERVERCMD rtFtpServerHandlePWD;
+static FNRTFTPSERVERCMD rtFtpServerHandleOPTS;
 static FNRTFTPSERVERCMD rtFtpServerHandleQUIT;
 static FNRTFTPSERVERCMD rtFtpServerHandleRETR;
@@ -334 +337 @@
     { RTFTPSERVER_CMD_CDUP,     "CDUP", true,  rtFtpServerHandleCDUP },
     { RTFTPSERVER_CMD_CWD,      "CWD",  true,  rtFtpServerHandleCWD  },
-    { RTFTPSERVER_CMD_FEAT,     "FEAT", true,  rtFtpServerHandleFEAT },
+    { RTFTPSERVER_CMD_FEAT,     "FEAT", false, rtFtpServerHandleFEAT },
     { RTFTPSERVER_CMD_LIST,     "LIST", true,  rtFtpServerHandleLIST },
     { RTFTPSERVER_CMD_MODE,     "MODE", true,  rtFtpServerHandleMODE },
@@ -341 +344 @@
     { RTFTPSERVER_CMD_PORT,     "PORT", true,  rtFtpServerHandlePORT },
     { RTFTPSERVER_CMD_PWD,      "PWD",  true,  rtFtpServerHandlePWD  },
+    { RTFTPSERVER_CMD_OPTS,     "OPTS", false, rtFtpServerHandleOPTS },
     { RTFTPSERVER_CMD_QUIT,     "QUIT", false, rtFtpServerHandleQUIT },
     { RTFTPSERVER_CMD_RETR,     "RETR", true,  rtFtpServerHandleRETR },
@@ -352 +356 @@
 };
 
-/** Feature string which represents all commands we support in addition to RFC 959.
+/** Feature string which represents all commands we support in addition to RFC 959 (see RFC 2398).
  *  Must match the command table above.
  *
- *  Don't forget the terminating ";" at each feature. */
+ *  Don't forget the beginning space (" ") at each feature. */
 #define RTFTPSERVER_FEATURES_STRING \
-    "SIZE;" /* Supports reporting file sizes. */
+    " SIZE\r\n" \
+    " UTF8"
 
 
@@ -380 +385 @@
     LogFlowFunc(("Sending reply code %RU32\n", enmReply));
 
-    return RTTcpWrite(pClient->hSocket, szReply, strlen(szReply) + 1);
+    return RTTcpWrite(pClient->hSocket, szReply, strlen(szReply));
 }
 
@@ -423 +428 @@
     RTStrFree(pszFmt);
 
-    rc = RTTcpWrite(pClient->hSocket, pszMsg, strlen(pszMsg) + 1 /* Include termination */);
+    rc = RTTcpWrite(pClient->hSocket, pszMsg, strlen(pszMsg));
 
     RTStrFree(pszMsg);
@@ -450 +455 @@
     AssertRCReturn(rc, rc);
 
-    rc = RTTcpWrite(pClient->hSocket, psz, strlen(psz) + 1 /* Include termination */);
+    LogFlowFunc(("Sending reply '%s'\n", psz));
+
+    rc = RTTcpWrite(pClient->hSocket, psz, strlen(psz));
 
     RTStrFree(psz);
@@ -1055 +1062 @@
     RT_NOREF(cArgs, apcszArgs);
 
-    int rc = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_SYSTEM_STATUS); /* Features begin */
+    int rc = rtFtpServerSendReplyStr(pClient, "211-BEGIN Features:");
     if (RT_SUCCESS(rc))
     {
         rc = rtFtpServerSendReplyStr(pClient, RTFTPSERVER_FEATURES_STRING);
         if (RT_SUCCESS(rc))
-            rc = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_SYSTEM_STATUS); /* Features end */
+            rc = rtFtpServerSendReplyStr(pClient, "211 END Features");
     }
 
@@ -1242 +1249 @@
     if (RT_SUCCESS(rc))
        rc = rtFtpServerSendReplyRcEx(pClient, RTFTPSERVER_REPLY_PATHNAME_OK, "\"%s\"", szPWD); /* See RFC 959, APPENDIX II. */
+
+    return rc;
+}
+
+static int rtFtpServerHandleOPTS(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
+{
+    RT_NOREF(cArgs, apcszArgs);
+
+    int rc = VINF_SUCCESS;
+
+    int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_OKAY);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     return rc;
@@ -1394 +1414 @@
     int rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szOSInfo, sizeof(szOSInfo));
     if (RT_SUCCESS(rc))
-        rc = rtFtpServerSendReplyStr(pClient, szOSInfo);
+        rc = rtFtpServerSendReplyStr(pClient, "215 %s", szOSInfo);
 
     return rc;