Index: /trunk/include/iprt/ftp.h =================================================================== --- /trunk/include/iprt/ftp.h (revision 82672) +++ /trunk/include/iprt/ftp.h (revision 82673) @@ -47,4 +47,49 @@ /** Nil FTP client handle. */ #define NIL_RTFTPSERVER ((RTFTPSERVER)0) + +/** Maximum length (in characters) a command can have (without parameters). */ +#define RTFTPSERVER_MAX_CMD_LEN 64 + +/** + * Enumeration for defining the current server connection mode. + */ +typedef enum RTFTPSERVER_CONNECTION_MODE +{ + /** Normal mode, nothing to transfer. */ + RTFTPSERVER_CONNECTION_MODE_NORMAL = 0, + /** Server is in passive mode (is listening). */ + RTFTPSERVER_CONNECTION_MODE_PASSIVE, + /** Server connects via port to the client. */ + RTFTPSERVER_CONNECTION_MODE_MODE_PORT, + /** The usual 32-bit hack. */ + RTFTPSERVER_CONNECTION_MODE_32BIT_HACK = 0x7fffffff +} RTFTPSERVER_CONNECTION_MODE; + +/** + * Enumeration for defining the data transfer mode. + */ +typedef enum RTFTPSERVER_TRANSFER_MODE +{ + RTFTPSERVER_TRANSFER_MODE_UNKNOWN = 0, + RTFTPSERVER_TRANSFER_MODE_STREAM, + RTFTPSERVER_TRANSFER_MODE_BLOCK, + RTFTPSERVER_TRANSFER_MODE_COMPRESSED, + /** The usual 32-bit hack. */ + RTFTPSERVER_DATA_MODE_32BIT_HACK = 0x7fffffff +} RTFTPSERVER_DATA_MODE; + +/** + * Enumeration for defining the data type. + */ +typedef enum RTFTPSERVER_DATA_TYPE +{ + RTFTPSERVER_DATA_TYPE_UNKNOWN = 0, + RTFTPSERVER_DATA_TYPE_ASCII, + RTFTPSERVER_DATA_TYPE_EBCDIC, + RTFTPSERVER_DATA_TYPE_IMAGE, + RTFTPSERVER_DATA_TYPE_LOCAL, + /** The usual 32-bit hack. */ + RTFTPSERVER_DATA_TYPE_32BIT_HACK = 0x7fffffff +} RTFTPSERVER_DATA_TYPE; /** Index: /trunk/src/VBox/Runtime/generic/ftp-server.cpp =================================================================== --- /trunk/src/VBox/Runtime/generic/ftp-server.cpp (revision 82672) +++ /trunk/src/VBox/Runtime/generic/ftp-server.cpp (revision 82673) @@ -44,7 +44,9 @@ #include #include +#include #include #include #include +#include #include @@ -102,9 +104,13 @@ RTFTPSERVER_CMD_CWD, /** Lists a directory. */ - RTFTPSERVER_CMD_LS, + RTFTPSERVER_CMD_LIST, + /** Sets the transfer mode. */ + RTFTPSERVER_CMD_MODE, /** Sends a nop ("no operation") to the server. */ RTFTPSERVER_CMD_NOOP, /** Sets the password for authentication. */ RTFTPSERVER_CMD_PASS, + /** Sets the port to use for the data connection. */ + RTFTPSERVER_CMD_PORT, /** Gets the current working directory. */ RTFTPSERVER_CMD_PWD, @@ -117,8 +123,12 @@ /** Retrieves the current status of a transfer. */ RTFTPSERVER_CMD_STAT, + /** Gets the server's OS info. */ + RTFTPSERVER_CMD_SYST, /** Sets the (data) representation type. */ RTFTPSERVER_CMD_TYPE, /** Sets the user name for authentication. */ RTFTPSERVER_CMD_USER, + /** End marker. */ + RTFTPSERVER_CMD_LAST, /** The usual 32-bit hack. */ RTFTPSERVER_CMD_32BIT_HACK = 0x7fffffff @@ -138,13 +148,70 @@ typedef RTFTPSERVERCLIENTSTATE *PRTFTPSERVERCLIENTSTATE; - -static int rtFTPServerSendReply(PRTFTPSERVERCLIENTSTATE pClient, RTFTPSERVER_REPLY enmReply) -{ - RT_NOREF(enmReply); - - RTTcpWrite(pClient->hSocket, "hello\n", sizeof("hello\n") - 1); - - int rc = 0; - RT_NOREF(rc); +typedef DECLCALLBACK(int) FNRTFTPSERVERCMD(PRTFTPSERVERCLIENTSTATE pClient); +/** Pointer to a FNRTFTPSERVERCMD(). */ +typedef FNRTFTPSERVERCMD *PFNRTFTPSERVERCMD; + +static FNRTFTPSERVERCMD rtFTPServerHandleSYST; + +typedef struct RTFTPSERVER_CMD_ENTRY +{ + RTFTPSERVER_CMD enmCmd; + char szCmd[RTFTPSERVER_MAX_CMD_LEN]; + PFNRTFTPSERVERCMD pfnCmd; +} RTFTPSERVER_CMD_ENTRY; + +const RTFTPSERVER_CMD_ENTRY g_aCmdMap[] = +{ + { RTFTPSERVER_CMD_SYST, "SYST", rtFTPServerHandleSYST }, + { RTFTPSERVER_CMD_LAST, "", NULL } +}; + + +static int rtFTPServerSendReplyRc(PRTFTPSERVERCLIENTSTATE pClient, RTFTPSERVER_REPLY enmReply) +{ + char szReply[32]; + RTStrPrintf2(szReply, sizeof(szReply), "%RU32\r\n", enmReply); + + return RTTcpWrite(pClient->hSocket, szReply, strlen(szReply) + 1); +} + +static int rtFTPServerSendReplyStr(PRTFTPSERVERCLIENTSTATE pClient, const char *pcszStr) +{ + char *pszReply; + int rc = RTStrAPrintf(&pszReply, "%s\r\n", pcszStr); + if (RT_SUCCESS(rc)) + { + rc = RTTcpWrite(pClient->hSocket, pszReply, strlen(pszReply) + 1); + RTStrFree(pszReply); + return rc; + } + + return VERR_NO_MEMORY; +} + +static int rtFTPServerLookupUser(PRTFTPSERVERCLIENTSTATE pClient, const char *pcszUser) +{ + RT_NOREF(pClient, pcszUser); + + LogFunc(("User='%s'\n", pcszUser)); + + return VINF_SUCCESS; /** @todo Implement lookup. */ +} + +static int rtFTPServerAuthenticate(PRTFTPSERVERCLIENTSTATE pClient, const char *pcszUser, const char *pcszPassword) +{ + RT_NOREF(pClient, pcszUser, pcszPassword); + + LogFunc(("User='%s', Password='%s'\n", pcszUser, pcszPassword)); + + return VINF_SUCCESS; /** @todo Implement authentication. */ +} + +static int rtFTPServerHandleSYST(PRTFTPSERVERCLIENTSTATE pClient) +{ + char szOSInfo[64]; + int rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szOSInfo, sizeof(szOSInfo)); + if (RT_SUCCESS(rc)) + rc = rtFTPServerSendReplyStr(pClient, szOSInfo); return rc; @@ -153,5 +220,99 @@ static int rtFTPServerDoLogin(PRTFTPSERVERCLIENTSTATE pClient) { - int rc = rtFTPServerSendReply(pClient, RTFTPSERVER_REPLY_READY_FOR_NEW_USER); + LogFlowFuncEnter(); + + /* Send welcome message. */ + int rc = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_READY_FOR_NEW_USER); + if (RT_SUCCESS(rc)) + { + size_t cbRead; + + char szUser[64]; + rc = RTTcpRead(pClient->hSocket, szUser, sizeof(szUser), &cbRead); + if (RT_SUCCESS(rc)) + { + rc = rtFTPServerLookupUser(pClient, szUser); + if (RT_SUCCESS(rc)) + { + rc = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_USERNAME_OKAY_NEED_PASSWORD); + if (RT_SUCCESS(rc)) + { + char szPass[64]; + rc = RTTcpRead(pClient->hSocket, szPass, sizeof(szPass), &cbRead); + { + if (RT_SUCCESS(rc)) + { + rc = rtFTPServerAuthenticate(pClient, szUser, szPass); + if (RT_SUCCESS(rc)) + { + rc = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_LOGGED_IN_PROCEED); + } + } + } + } + } + } + } + + if (RT_FAILURE(rc)) + { + int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_NOT_LOGGED_IN); + if (RT_SUCCESS(rc)) + rc = rc2; + } + + return rc; +} + +static int rtFTPServerProcessCommands(PRTFTPSERVERCLIENTSTATE pClient) +{ + int rc; + + for (;;) + { + size_t cbRead; + char szCmd[RTFTPSERVER_MAX_CMD_LEN]; + rc = RTTcpRead(pClient->hSocket, szCmd, sizeof(szCmd), &cbRead); + if ( RT_SUCCESS(rc) + && strlen(szCmd)) + { + /* A tiny bit of sanitation. */ + RTStrStripL(szCmd); + + /* First, terminate string by finding the command end marker (telnet style). */ + /** @todo Not sure if this is entirely correct and/or needs tweaking; good enough for now as it seems. */ + char *pszCmdEnd = RTStrIStr(szCmd, "\r\n"); + if (pszCmdEnd) + *pszCmdEnd = '\0'; + + /* Second, determine if there is any parameters following. */ + char *pszCmdParms = RTStrIStr(szCmd, " "); + /* pszCmdParms can be NULL if command has not parameters. */ + RT_NOREF(pszCmdParms); + + unsigned i = 0; + for (; i < RT_ELEMENTS(g_aCmdMap); i++) + { + if (!RTStrICmp(szCmd, g_aCmdMap[i].szCmd)) + { + rc = g_aCmdMap[i].pfnCmd(pClient); + break; + } + } + + if (i == RT_ELEMENTS(g_aCmdMap)) + { + int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_CMD_NOT_IMPL); + if (RT_SUCCESS(rc)) + rc = rc2; + } + } + else + { + int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_CMD_NOT_RECOGNIZED); + if (RT_SUCCESS(rc)) + rc = rc2; + } + } return rc; @@ -170,4 +331,6 @@ int rc = rtFTPServerDoLogin(&ClientState); + if (RT_SUCCESS(rc)) + rc = rtFTPServerProcessCommands(&ClientState); return rc; @@ -187,4 +350,6 @@ if (pThis) { + pThis->u32Magic = RTFTPSERVER_MAGIC; + rc = RTTcpServerCreate(pcszAddress, uPort, RTTHREADTYPE_DEFAULT, "ftpsrv", rtFTPServerThread, pThis /* pvUser */, &pThis->pTCPServer);