Skip to content

wolfsftp: apply the attributes SETSTAT and FSETSTAT acknowledge #1197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yosuke-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
+461 −29
Open

wolfsftp: apply the attributes SETSTAT and FSETSTAT acknowledge #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,40 @@ int WS_DeleteFileA(const char* fileName, void* heap)
}



int WS_ChmodA(const char* fileName, int mode, void* heap)
{
int ret = -1;
wchar_t* unicodeFileName;
size_t unicodeFileNameSz = 0;
size_t returnSz = 0;
size_t fileNameSz = 0;
errno_t error;

fileNameSz = WSTRLEN(fileName);
fileName = TrimFileName(fileName, &fileNameSz);

error = mbstowcs_s(&unicodeFileNameSz, NULL, 0, fileName, 0);
if (error != 0)
return -1;

unicodeFileName = (wchar_t*)WMALLOC((unicodeFileNameSz+1)*sizeof(wchar_t),
heap, PORT_DYNTYPE_STRING);
if (unicodeFileName == NULL)
return -1;

error = mbstowcs_s(&returnSz, unicodeFileName, unicodeFileNameSz,
fileName, fileNameSz);

if (error == 0) {
ret = _wchmod(unicodeFileName, mode);
}

WFREE(unicodeFileName, heap, PORT_DYNTYPE_STRING);

return ret;
}

#endif /* USE_WINDOWS_API WOLFSSH_SFTP WOLFSSH_SCP */

#if !defined(NO_FILESYSTEM) && \
Expand Down
104 changes: 80 additions & 24 deletions src/wolfsftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6042,7 +6042,7 @@ int wolfSSH_SFTP_RecvLSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
return ret;
}

#if !defined(USE_WINDOWS_API) && !defined(WOLFSSH_ZEPHYR) \
#if !defined(_WIN32_WCE) && !defined(WOLFSSH_ZEPHYR) \
&& !defined(WOLFSSH_SFTP_SETMODE) && !defined(WOLFSSH_FATFS)
/* Set the files mode
* return WS_SUCCESS on success */
Expand Down Expand Up @@ -6078,29 +6078,47 @@ static int SFTP_SetFileAttributes(WOLFSSH* ssh,
char* name, WS_SFTP_FILEATRB* atr)
{
int ret = WS_SUCCESS;
#ifdef WTRUNCATE
word64 sz;
#endif

/* check if size attribute present */
if (atr->flags & WOLFSSH_FILEATRB_SIZE) {
/* @TODO set file size */
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_SIZE)) {
#ifdef WTRUNCATE
if (wResolveOffset(atr->sz, WOLFSSH_MAX_FILE_OFFSET, &sz) != 0
|| WTRUNCATE(ssh->fs, name, sz) != 0) {
ret = WS_BAD_FILE_E;
}
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

/* check if uid and gid attribute present */
if (atr->flags & WOLFSSH_FILEATRB_UIDGID) {
/* @TODO set group and user id */
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_UIDGID)) {
#ifdef WCHOWN
if (WCHOWN(ssh->fs, name, atr->uid, atr->gid) != 0) {
ret = WS_BAD_FILE_E;
}
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

#if !defined(USE_WINDOWS_API) && !defined(WOLFSSH_ZEPHYR)
/* check if permissions attribute present */
if (atr->flags & WOLFSSH_FILEATRB_PERM) {
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_PERM)) {
ret = SFTP_SetMode(ssh->fs, name, WOLFSSH_SFTP_SAFE_MODE(atr->per));
}
#endif

/* check if time attribute present */
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_TIME)) {
#ifdef WSETTIME
if (WSETTIME(ssh->fs, name, atr->atime, atr->mtime) != 0) {
ret = WS_BAD_FILE_E;
}
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

/* check if extended attributes are present */
Expand All @@ -6124,29 +6142,52 @@ static int SFTP_SetFileAttributesHandle(WOLFSSH* ssh,
WS_SFTP_FILEATRB* atr)
{
int ret = WS_SUCCESS;
#ifdef WFTRUNCATE
word64 sz;
#endif

/* check if size attribute present */
if (atr->flags & WOLFSSH_FILEATRB_SIZE) {
/* @TODO set file size */
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_SIZE)) {
#ifdef WFTRUNCATE
if (wResolveOffset(atr->sz, WOLFSSH_MAX_FILE_OFFSET, &sz) != 0
|| WFTRUNCATE(ssh->fs, handle, sz) != 0) {
ret = WS_BAD_FILE_E;
}
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

/* check if uid and gid attribute present */
if (atr->flags & WOLFSSH_FILEATRB_UIDGID) {
/* @TODO set group and user id */
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_UIDGID)) {
#ifdef WFCHOWN
if (WFCHOWN(ssh->fs, handle, atr->uid, atr->gid) != 0) {
ret = WS_BAD_FILE_E;
}
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

#ifndef USE_WINDOWS_API
/* check if permissions attribute present */
if (atr->flags & WOLFSSH_FILEATRB_PERM) {
ret = SFTP_SetModeHandle(ssh->fs, handle, WOLFSSH_SFTP_SAFE_MODE(atr->per));
}
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_PERM)) {
#ifndef USE_WINDOWS_API
ret = SFTP_SetModeHandle(ssh->fs, handle,
WOLFSSH_SFTP_SAFE_MODE(atr->per));
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

/* check if time attribute present */
if (ret == WS_SUCCESS && (atr->flags & WOLFSSH_FILEATRB_TIME)) {
#ifdef WFSETTIME
if (WFSETTIME(ssh->fs, handle, atr->atime, atr->mtime) != 0) {
ret = WS_BAD_FILE_E;
}
#else
ret = WS_UNIMPLEMENTED_E;
#endif
}

/* check if extended attributes are present */
Expand All @@ -6155,9 +6196,9 @@ static int SFTP_SetFileAttributesHandle(WOLFSSH* ssh,
}

(void)ssh;
#ifdef USE_WINDOWS_API
/* On Windows the only consumers (SFTP_SetModeHandle / WFSETTIME) are
* compiled out or no-ops, so the handle goes unused here. */
#if defined(USE_WINDOWS_API) && !defined(WFTRUNCATE) && !defined(WFCHOWN) \
&& !defined(WFSETTIME)
/* no consumer of the handle is compiled in on this port */
(void)handle;
#endif
return ret ;
Expand All @@ -6182,6 +6223,7 @@ int wolfSSH_SFTP_RecvSetSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
char ser[] = "Unable to set attributes error";
char per[] = "Unable to parse attributes error";
char pdn[] = "Permission denied";
char uns[] = "Attribute not supported";
char* res = suc;
byte type = WOLFSSH_FTP_OK;

Expand Down Expand Up @@ -6220,8 +6262,14 @@ int wolfSSH_SFTP_RecvSetSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
!= WS_SUCCESS) {
/* tell peer that was not ok */
WLOG(WS_LOG_SFTP, "Unable to get set attributes of file/directory");
type = WOLFSSH_FTP_FAILURE;
res = ser;
if (ret == WS_UNIMPLEMENTED_E) {
type = WOLFSSH_FTP_UNSUPPORTED;
res = uns;
}
else {
type = WOLFSSH_FTP_FAILURE;
res = ser;
}
ret = WS_BAD_FILE_E;
}

Expand Down Expand Up @@ -6257,6 +6305,7 @@ int wolfSSH_SFTP_RecvFSetSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
char suc[] = "Set Attributes";
char ser[] = "Unable to set attributes error";
char per[] = "Unable to parse attributes error";
char uns[] = "Attribute not supported";
char* res = suc;
byte type = WOLFSSH_FTP_OK;

Expand Down Expand Up @@ -6311,8 +6360,14 @@ int wolfSSH_SFTP_RecvFSetSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
!= WS_SUCCESS) {
/* tell peer that was not ok */
WLOG(WS_LOG_SFTP, "Unable to get set attributes of open file");
type = WOLFSSH_FTP_FAILURE;
res = ser;
if (ret == WS_UNIMPLEMENTED_E) {
type = WOLFSSH_FTP_UNSUPPORTED;
res = uns;
}
else {
type = WOLFSSH_FTP_FAILURE;
res = ser;
}
ret = WS_BAD_FILE_E;
}

Expand Down Expand Up @@ -7661,7 +7716,8 @@ int wolfSSH_SFTP_CHMOD(WOLFSSH* ssh, char* n, char* oct)
break;
}

/* update permissions */
/* only the permissions change here */
state->atr.flags = WOLFSSH_FILEATRB_PERM;
state->atr.per = mode;
state->state = STATE_CHMOD_SEND;
FALL_THROUGH;
Expand Down
Loading
Loading