db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00
Code Issues Releases Activity

Fix recursive path remove in SFTP storage driver.

Browse Source 
storageSftpPathRemove() used LIBSSH2_FX_FAILURE to determine when it was attempting to unlink a directory, but it appears that LIBSSH2_FX_PERMISSION_DENIED is also valid for this case.

Update storageSftpPathRemove() to accept either error and adjust tests.
This commit is contained in:
Reid Thompson
2023-11-18 08:47:58 -05:00
committed by GitHub
parent e2b734eff9
commit c4dc4665f8
4 changed files with 80 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/storage/sftp/storage.c
View File

@@ -952,14 +952,22 @@ storageSftpPathRemove(THIS_VOID, const String *const path, const bool recurse, c
if (rc == LIBSSH2_ERROR_EAGAIN)
THROW_FMT(PathRemoveError, "timeout removing file '%s'", strZ(file));
// Attempting to unlink a directory appears to return LIBSSH2_FX_FAILURE
if (rc == LIBSSH2_ERROR_SFTP_PROTOCOL &&
libssh2_sftp_last_error(this->sftpSession) == LIBSSH2_FX_FAILURE)
// Attempting to unlink a directory appears to return LIBSSH2_FX_FAILURE or LIBSSH2_FX_PERMISSION_DENIED
if (rc == LIBSSH2_ERROR_SFTP_PROTOCOL)
{
storageInterfacePathRemoveP(this, file, true);
const uint64_t sftpErrno = libssh2_sftp_last_error(this->sftpSession);
if (sftpErrno == LIBSSH2_FX_FAILURE || sftpErrno == LIBSSH2_FX_PERMISSION_DENIED)
storageInterfacePathRemoveP(this, file, true);
else
{
THROW_FMT(
PathRemoveError, STORAGE_ERROR_PATH_REMOVE_FILE " libssh sftp [%" PRIu64 "]", strZ(file),
sftpErrno);
}
}
else
THROW_FMT(PathRemoveError, STORAGE_ERROR_PATH_REMOVE_FILE, strZ(file));
THROW_FMT(PathRemoveError, STORAGE_ERROR_PATH_REMOVE_FILE " libssh ssh [%d]", strZ(file), rc);
}
// Reset the memory context occasionally so we don't use too much memory or slow down processing
@@ -986,8 +994,10 @@ storageSftpPathRemove(THIS_VOID, const String *const path, const bool recurse, c
if (rc == LIBSSH2_ERROR_SFTP_PROTOCOL)
{
if (libssh2_sftp_last_error(this->sftpSession) != LIBSSH2_FX_NO_SUCH_FILE)
THROW_FMT(PathRemoveError, STORAGE_ERROR_PATH_REMOVE, strZ(path));
const uint64_t sftpErrno = libssh2_sftp_last_error(this->sftpSession);
if (sftpErrno != LIBSSH2_FX_NO_SUCH_FILE)
THROW_FMT(PathRemoveError, STORAGE_ERROR_PATH_REMOVE " sftp error [%" PRIu64 "]", strZ(path), sftpErrno);
// Path does not exist
result = false;