Skip to content

[stable27] SFTP improvements #40487

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

Merged
icewind1991 merged 9 commits into from
Sep 20, 2023
Merged

[stable27] SFTP improvements #40487

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7065891
clear sftp stat cache when opening a write stream
icewind1991 Aug 29, 2023
0a219b1
fix error during sftp stream close
icewind1991 Aug 29, 2023
6ab32b0
sftp optimize file_put_contents, writeStream and copy
icewind1991 Aug 29, 2023
02a50bd
more optimized getPermissions/getMetaData
icewind1991 Aug 31, 2023
373bd09
implement fseek for sftp read stream
icewind1991 Aug 31, 2023
e9227c2
add sftp ci test
icewind1991 Aug 31, 2023
b48f118
psalm suppress
icewind1991 Sep 1, 2023
656fd51
sftp psalm fixes
icewind1991 Sep 4, 2023
0a5ebef
improve s3 error handling
icewind1991 Sep 19, 2023
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
Prev Previous commit
Next Next commit
psalm suppress 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Sep 18, 2023
commit b48f118b659bb36ce99e45fe77fbadce1a0c132e
4 changes: 4 additions & 0 deletions apps/files_external/lib/Lib/Storage/SFTP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ public function constructUrl($path) {
}

public function file_put_contents($path, $data) {
/** @psalm-suppress InternalMethod */
$result = $this->getConnection()->put($this->absPath($path), $data);
if ($result) {
return strlen($data);
Expand All @@ -502,6 +503,7 @@ public function writeStream(string $path, $stream, int $size = null): int {
$size = $writtenSize;
});
}
/** @psalm-suppress InternalMethod */
$result = $this->getConnection()->put($this->absPath($path), $stream);
fclose($stream);
if ($result) {
Expand All @@ -524,10 +526,12 @@ public function copy($source, $target) {
return false;
}
for ($i = 0; $i < $size; $i += self::COPY_CHUNK_SIZE) {
/** @psalm-suppress InvalidArgument */
$chunk = $connection->get($absSource, false, $i, self::COPY_CHUNK_SIZE);
if ($chunk === false) {
return false;
}
/** @psalm-suppress InternalMethod */
if (!$connection->put($absTarget, $chunk, \phpseclib\Net\SFTP::SOURCE_STRING, $i)) {
return false;
}
Expand Down