Skip to content

Close remote handles after uploads #4

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

Draft
numbereleven-a wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Close remote handles after uploads #4

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
28 changes: 23 additions & 5 deletions src/core/SftpTransfer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,8 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
// Open remote
std::unique_ptr<ISftpHandle> sftpHandle;
std::unique_ptr<ISshChannel> scpHandle;
std::unique_ptr<RemoteSftpFile> remoteSftp;
std::unique_ptr<RemoteScpChannel> remoteScp;
int64_t resumeOffset = 0;

if (useScp) {
Expand All @@ -501,6 +503,7 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
SftpLogLastError("SCP upload error: ", cs->session->lastErrno());
return SFTP_READFAILED;
}
remoteScp = std::make_unique<RemoteScpChannel>(std::move(scpHandle), cs);
}
} else {
unsigned long flags = LIBSSH2_FXF_WRITE | LIBSSH2_FXF_CREAT;
Expand All @@ -510,6 +513,7 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
sftpHandle = OpenSftpFileWithRetry(cs, remotePath.c_str(), flags, 0644);
if (!sftpHandle)
return SFTP_WRITEFAILED;
remoteSftp = std::make_unique<RemoteSftpFile>(std::move(sftpHandle));

if (Resume) {
// Get remote size and seek
Expand All @@ -518,15 +522,15 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
attr.flags = LIBSSH2_SFTP_ATTR_PERMISSIONS | LIBSSH2_SFTP_ATTR_SIZE;
int rc;
do {
rc = sftpHandle->fstat(&attr, 0);
rc = remoteSftp->get()->fstat(&attr, 0);
if (rc == LIBSSH2_ERROR_EAGAIN)
IsSocketReadable(cs->sock);
} while (rc == LIBSSH2_ERROR_EAGAIN);
// Check if server actually returned size (some servers may not honor the flag)
if (rc == 0 && (attr.flags & LIBSSH2_SFTP_ATTR_SIZE) && attr.filesize > 0) {
int64_t remoteSize = static_cast<int64_t>(attr.filesize);
if (remoteSize <= filesize) {
sftpHandle->seek(static_cast<size_t>(remoteSize));
remoteSftp->get()->seek(static_cast<size_t>(remoteSize));
if (!local.Seek(remoteSize))
return SFTP_READFAILED;
resumeOffset = remoteSize;
Expand Down Expand Up @@ -556,9 +560,9 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
while (written < toWrite) {
int w = 0;
if (useScp)
w = static_cast<int>(scpHandle->write(data + written, toWrite - written));
w = static_cast<int>(remoteScp->get()->write(data + written, toWrite - written));
else
w = static_cast<int>(sftpHandle->write(data + written, toWrite - written));
w = static_cast<int>(remoteSftp->get()->write(data + written, toWrite - written));

if (w > 0) {
written += w;
Expand Down Expand Up @@ -589,6 +593,20 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
if (ret != SFTP_OK) break;
}

// Finalize the remote file before reporting upload completion. Destroying
// ISftpHandle/ISshChannel only deletes the C++ adapter; it does not close
// the underlying libssh2 handle. Leaving it open makes uploaded executables
// fail with ETXTBSY until the whole connection is disconnected.
if (remoteSftp) {
const int closeRc = remoteSftp->Close();
if (closeRc != 0 && ret == SFTP_OK) {
SftpLogLastError("SFTP upload close error: ", closeRc);
ret = SFTP_WRITEFAILED;
}
}
if (remoteScp)
remoteScp->Close();

if (ret == SFTP_OK && setattr) {
// Set timestamps/permissions
// Only for SFTP transfers (SCP already set timestamps at open)
Expand All @@ -612,4 +630,4 @@ int SftpUploadFileW(pConnectSettings cs, LPCWSTR LocalName, LPCWSTR RemoteName,
}

return ret;
}
}