WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

SFTP Symlink 

1. When the server tries to open a file, get the attributes following
   links.
2. Add decoding links from the file attributes when making a long name.
3. When the server gets a file attributes for the file list, do not
   follow links.
4. When the client tries to stat a file before getting it, it should use
   the stat that follows links.
pull/711/head
John Safranek 2024-06-18 14:49:13 -07:00
parent e2aadb1c51
commit 9bfca14ac6
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wolfsftp.c
View File

@ -2051,9 +2051,9 @@ int wolfSSH_SFTP_RecvOpen(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
WS_SFTP_FILEATRB fileAtr; WS_SFTP_FILEATRB fileAtr;
WMEMSET(&fileAtr, 0, sizeof(fileAtr)); WMEMSET(&fileAtr, 0, sizeof(fileAtr));
if (SFTP_GetAttributes(ssh->fs, if (SFTP_GetAttributes(ssh->fs,
dir, &fileAtr, 1, ssh->ctx->heap) == WS_SUCCESS) { dir, &fileAtr, 0, ssh->ctx->heap) == WS_SUCCESS) {
if ((fileAtr.per & FILEATRB_PER_MASK_TYPE) != FILEATRB_PER_FILE) { if ((fileAtr.per & FILEATRB_PER_MASK_TYPE)
WLOG(WS_LOG_SFTP, "Not a file"); != FILEATRB_PER_FILE) {
ssh->error = WS_SFTP_NOT_FILE_E; ssh->error = WS_SFTP_NOT_FILE_E;
res = naf; res = naf;
@ -2607,7 +2607,15 @@ static int SFTP_CreateLongName(WS_SFTPNAME* name)
word32 tmp = atr->per; word32 tmp = atr->per;
i = 0; i = 0;
perm[i++] = (tmp & 0x4000)?'d':'-'; if (tmp & FILEATRB_PER_DIR) {
perm[i++] = 'd';
}
else if (tmp & FILEATRB_PER_LINK) {
perm[i++] = 'l';
}
else {
perm[i++] = '-';
}
perm[i++] = (tmp & 0x100)?'r':'-'; perm[i++] = (tmp & 0x100)?'r':'-';
perm[i++] = (tmp & 0x080)?'w':'-'; perm[i++] = (tmp & 0x080)?'w':'-';
perm[i++] = (tmp & 0x040)?'x':'-'; perm[i++] = (tmp & 0x040)?'x':'-';
@ -3153,7 +3161,7 @@ static int wolfSSH_SFTPNAME_readdir(WOLFSSH* ssh, WDIR* dir, WS_SFTPNAME* out,
return WS_FATAL_ERROR; return WS_FATAL_ERROR;
} }
if (SFTP_GetAttributes(ssh->fs, s, &out->atrb, 0, ssh->ctx->heap) if (SFTP_GetAttributes(ssh->fs, s, &out->atrb, 1, ssh->ctx->heap)
!= WS_SUCCESS) { != WS_SUCCESS) {
WLOG(WS_LOG_SFTP, "Unable to get attribute values for %s", WLOG(WS_LOG_SFTP, "Unable to get attribute values for %s",
out->fName); out->fName);
@ -8592,8 +8600,8 @@ int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
NO_BREAK; NO_BREAK;
case STATE_GET_LSTAT: case STATE_GET_LSTAT:
WLOG(WS_LOG_SFTP, "SFTP GET STATE: LSTAT"); WLOG(WS_LOG_SFTP, "SFTP GET STATE: STAT");
ret = wolfSSH_SFTP_LSTAT(ssh, from, &state->attrib); ret = wolfSSH_SFTP_STAT(ssh, from, &state->attrib);
if (ret != WS_SUCCESS) { if (ret != WS_SUCCESS) {
if (ssh->error == WS_WANT_READ || if (ssh->error == WS_WANT_READ ||
ssh->error == WS_WANT_WRITE) ssh->error == WS_WANT_WRITE)
@ -8603,7 +8611,9 @@ int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
continue; continue;
} }
if ((state->attrib.per & FILEATRB_PER_MASK_TYPE) if ((state->attrib.per & FILEATRB_PER_MASK_TYPE)
!= FILEATRB_PER_FILE) { != FILEATRB_PER_FILE
&& (state->attrib.per & FILEATRB_PER_MASK_TYPE)
!= FILEATRB_PER_LINK) {
WLOG(WS_LOG_SFTP, "Not a file"); WLOG(WS_LOG_SFTP, "Not a file");
ssh->error = WS_SFTP_NOT_FILE_E; ssh->error = WS_SFTP_NOT_FILE_E;
ret = WS_FATAL_ERROR; ret = WS_FATAL_ERROR;

1
wolfssh/wolfsftp.h
View File

@ -128,6 +128,7 @@ struct WS_SFTP_FILEATRB_EX {
#define FILEATRB_PER_MASK_TYPE 0770000 #define FILEATRB_PER_MASK_TYPE 0770000
#define FILEATRB_PER_FILE 0100000 #define FILEATRB_PER_FILE 0100000
#define FILEATRB_PER_LINK 0120000
#define FILEATRB_PER_DEV_CHAR 0020000 #define FILEATRB_PER_DEV_CHAR 0020000
#define FILEATRB_PER_DIR 0040000 #define FILEATRB_PER_DIR 0040000
#define FILEATRB_PER_DEV_BLOCK 0060000 #define FILEATRB_PER_DEV_BLOCK 0060000