Merge pull request #436 from ejohnstown/sftp-list

Author: haydenroche5

examples/echoserver/echoserver.c

@@ -2030,6 +2030,57 @@ static int wsUserAuth(byte authType,
 }
 
 
+#ifdef WOLFSSH_SFTP
+/*
+ * Sets the WOLFSSH object's default SFTP path to the value provided by
+ * defaultSftpPath, or uses the current working directory from where the
+ * echoserver is run. The new default path is cleaned up with the real
+ * path function.
+ *
+ * @param ssh             WOLFSSH object to update
+ * @param defaultSftpPath command line provided default SFTP path
+ * @return                0 for success or error code
+ */
+static int SetDefaultSftpPath(WOLFSSH* ssh, const char* defaultSftpPath)
+{
+    char path[WOLFSSH_MAX_FILENAME];
+    char realPath[WOLFSSH_MAX_FILENAME];
+    int ret = 0;
+
+    if (defaultSftpPath == NULL) {
+    #ifdef USE_WINDOWS_API
+        if (GetCurrentDirectoryA(sizeof(path)-1, path) == 0) {
+            ret = WS_INVALID_PATH_E;
+        }
+    #else
+        if (getcwd(path, sizeof(path)-1) == NULL) {
+            ret = WS_INVALID_PATH_E;
+        }
+    #endif
+    }
+    else {
+        if (WSTRLEN(defaultSftpPath) >= sizeof(path)) {
+            ret = WS_INVALID_PATH_E;
+        }
+        else {
+            WSTRNCPY(path, defaultSftpPath, sizeof(path));
+        }
+    }
+
+    if (ret == 0) {
+        path[sizeof(path) - 1] = 0;
+        ret = wolfSSH_RealPath(NULL, path, realPath, sizeof(realPath));
+    }
+
+    if (ret == WS_SUCCESS) {
+        ret = wolfSSH_SFTP_SetDefaultPath(ssh, realPath);
+    }
+
+    return ret;
+}
+#endif
+
+
 static void ShowUsage(void)
 {
     printf("echoserver %s\n", LIBWOLFSSH_VERSION_STRING);
@@ -2451,12 +2502,9 @@ THREAD_RETURN WOLFSSH_THREAD echoserver_test(void* args)
         }
 
     #ifdef WOLFSSH_SFTP
-        if (defaultSftpPath) {
-            if (wolfSSH_SFTP_SetDefaultPath(ssh, defaultSftpPath)
-                    != WS_SUCCESS) {
-                fprintf(stderr, "Couldn't store default sftp path.\n");
-                WEXIT(EXIT_FAILURE);
-            }
+        if (SetDefaultSftpPath(ssh, defaultSftpPath) != 0) {
+            fprintf(stderr, "Couldn't store default sftp path.\n");
+            WEXIT(EXIT_FAILURE);
         }
     #endif
 

src/port.c

@@ -166,6 +166,25 @@ int wfopen(WFILE** f, const char* filename, const char* mode)
 
 #if defined(USE_WINDOWS_API) && (defined(WOLFSSH_SFTP) || defined(WOLFSSH_SCP))
 
+/*
+ * SFTP paths all start with a leading root "/". Most Windows file routines
+ * expect a drive letter when dealing with an absolute path. If the provided
+ * path, f, is of the form "/C:...", adjust the pointer f to point to the "C",
+ * and decrement the file path size, fSz, by one.
+ *
+ * @param f    pointer to a file name
+ * @param fSz  size of f in bytes
+ * @return     pointer to somewhere in f
+ */
+static const char* TrimFileName(const char* f, size_t* fSz)
+{
+    if (f != NULL && fSz != NULL && *fSz >= 3 && f[0] == '/' && f[2] == ':') {
+        f++;
+        *fSz--;
+    }
+    return f;
+}
+
 void* WS_CreateFileA(const char* fileName, unsigned long desiredAccess,
         unsigned long shareMode, unsigned long creationDisposition,
         unsigned long flags, void* heap)
@@ -178,6 +197,8 @@ void* WS_CreateFileA(const char* fileName, unsigned long desiredAccess,
     errno_t error;
 
     fileNameSz = WSTRLEN(fileName);
+    fileName = TrimFileName(fileName, &fileNameSz);
+
     error = mbstowcs_s(&unicodeFileNameSz, NULL, 0, fileName, 0);
     if (error)
         return INVALID_HANDLE_VALUE;
@@ -211,6 +232,8 @@ void* WS_FindFirstFileA(const char* fileName,
     errno_t error;
 
     fileNameSz = WSTRLEN(fileName);
+    fileName = TrimFileName(fileName, &fileNameSz);
+
     error = mbstowcs_s(&unicodeFileNameSz, NULL, 0, fileName, 0);
     if (error)
         return INVALID_HANDLE_VALUE;
@@ -268,6 +291,8 @@ int WS_GetFileAttributesExA(const char* fileName, void* fileInfo, void* heap)
     errno_t error;
 
     fileNameSz = WSTRLEN(fileName);
+    fileName = TrimFileName(fileName, &fileNameSz);
+
     error = mbstowcs_s(&unicodeFileNameSz, NULL, 0, fileName, 0);
     if (error != 0)
         return 0;
@@ -301,6 +326,8 @@ int WS_RemoveDirectoryA(const char* dirName, void* heap)
     errno_t error;
 
     dirNameSz = WSTRLEN(dirName);
+    dirName = TrimFileName(dirName, &dirNameSz);
+
     error = mbstowcs_s(&unicodeDirNameSz, NULL, 0, dirName, 0);
     if (error != 0)
         return 0;
@@ -333,6 +360,8 @@ int WS_CreateDirectoryA(const char* dirName, void* heap)
     errno_t error;
 
     dirNameSz = WSTRLEN(dirName);
+    dirName = TrimFileName(dirName, &dirNameSz);
+
     error = mbstowcs_s(&unicodeDirNameSz, NULL, 0, dirName, 0);
     if (error != 0)
         return 0;
@@ -368,6 +397,7 @@ int WS_MoveFileA(const char* oldName, const char* newName, void* heap)
     errno_t error;
 
     oldNameSz = WSTRLEN(oldName);
+    oldName = TrimFileName(oldName, &oldNameSz);
 
     error = mbstowcs_s(&unicodeOldNameSz, NULL, 0, oldName, 0);
     if (error != 0)
@@ -382,6 +412,8 @@ int WS_MoveFileA(const char* oldName, const char* newName, void* heap)
         oldName, oldNameSz);
 
     newNameSz = WSTRLEN(newName);
+    newName = TrimFileName(newName, &newNameSz);
+
     error = mbstowcs_s(&unicodeNewNameSz, NULL, 0, newName, 0);
     if (error != 0)
         return 0;
@@ -417,6 +449,8 @@ int WS_DeleteFileA(const char* fileName, void* heap)
     errno_t error;
 
     fileNameSz = WSTRLEN(fileName);
+    fileName = TrimFileName(fileName, &fileNameSz);
+
     error = mbstowcs_s(&unicodeFileNameSz, NULL, 0, fileName, 0);
     if (error != 0)
         return 0;

src/ssh.c

@@ -2274,57 +2274,64 @@ int wolfSSH_ChannelGetEof(WOLFSSH_CHANNEL* channel)
 
 #if (defined(WOLFSSH_SFTP) || defined(WOLFSSH_SCP)) && \
     !defined(NO_WOLFSSH_SERVER)
+
+#define DELIM "/\\"
+#define IS_DELIM(x) ((x) == '/' || (x) == '\\')
+#define IS_WINPATH(x,y) ((x) > 1 && (y)[1] == ':')
+
 /*
- * Paths starting with a slash are absolute, rooted at root. Any path that
- * doesn't have a starting slash is assumed to be relative to the current
+ * Paths starting with a slash are absolute, rooted at "/". Any path that
+ * doesn't have a starting slash is assumed to be relative to the default
  * path. If the path is empty, return the default path.
  *
  * The path "/." is stripped out. The path "/.." strips out the previous
  * path value. The root path, "/", is always present.
  *
  * Example: "/home/fred/frob/frizz/../../../barney/bar/baz/./././../.."
  * will return "/home/barney". "/../.." will return "/". "." will return
- * currentPath.
+ * the default path.
  *
  * Note, this function does not care about OS and filesystem issues. The
  * SFTP protocol describes how paths are handled in SFTP. Specialized
  * behaviors are handled when actually calling the OS functions. Paths
  * are further massaged there. For example, the C: drive is treated as
  * the path "/C:", and is a directory like any other.
  *
- * @param currentPath RealPath of the current working directory
  * @param defaultPath RealPath of the default directory, usually user's
  * @param in          requested new path
  * @param out         output of real path cleanup
  * @param outSz       size in bytes of buffer 'out'
  * @return            WS_SUCCESS, WS_BAD_ARGUMENT, or WS_INVALID_PATH_E
  */
-int wolfSSH_RealPath(const char* currentPath, const char* defaultPath,
-        char* in, char* out, word32 outSz)
+int wolfSSH_RealPath(const char* defaultPath, char* in,
+        char* out, word32 outSz)
 {
     char* tail = NULL;
     char* seg;
     word32 inSz, segSz, curSz;
 
-    if (currentPath == NULL || defaultPath == NULL ||
-            in == NULL || out == NULL || outSz == 0)
+    if (in == NULL || out == NULL || outSz == 0) {
         return WS_BAD_ARGUMENT;
+    }
 
     WMEMSET(out, 0, outSz);
     inSz = (word32)WSTRLEN(in);
-    if (inSz == 0) {
-        WSTRNCPY(out, defaultPath, outSz);
-    }
-    else if (in[0] == '/') {
-        out[0] = '/';
-    }
-    else {
-        WSTRNCPY(out, currentPath, outSz);
+    out[0] = '/';
+    curSz = 1;
+    if (inSz == 0 || (!IS_DELIM(in[0]) && !IS_WINPATH(inSz, in))) {
+        if (defaultPath != NULL) {
+            curSz = (word32)WSTRLEN(defaultPath);
+            if (curSz >= outSz) {
+                return WS_INVALID_PATH_E;
+            }
+            WSTRNCPY(out, defaultPath, outSz);
+        }
     }
-    out[outSz - 1] = 0;
-    curSz = (word32)WSTRLEN(out);
+    out[curSz] = 0;
 
-    for (seg = WSTRTOK(in, "/", &tail); seg; seg = WSTRTOK(NULL, "/", &tail)) {
+    for (seg = WSTRTOK(in, DELIM, &tail);
+            seg;
+            seg = WSTRTOK(NULL, DELIM, &tail)) {
         segSz = (word32)WSTRLEN(seg);
 
         /* Try to match "." */
@@ -2349,6 +2356,10 @@ int wolfSSH_RealPath(const char* currentPath, const char* defaultPath,
         }
         /* Everything else is copied */
         else {
+            if (curSz >= outSz - segSz) {
+                return WS_INVALID_PATH_E;
+            }
+
             if (curSz != 1) {
                 WSTRNCAT(out, "/", outSz - curSz);
                 curSz++;