Skip to content

Fix issue where nextcloud external storage cannot download files from Cloudflare R2 #35125

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

Closed
pserwylo wants to merge 1 commit into from
Closed

Fix issue where nextcloud external storage cannot download files from Cloudflare R2 #35125

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: 32 additions & 2 deletions lib/private/Files/Stream/SeekableHttpStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,40 @@ private function reconnect(int $start): bool {
$rangeHeaders = array_values(array_filter($responseHead, function ($v) {
return preg_match('#^content-range:#i', $v) === 1;
}));

if (!$rangeHeaders) {
$this->current = null;
return false;
// Some S3 servers (notably Cloudflare R2) respond to a "Range: bytes=0-" request with a "200 OK" containing the
// entire file contents. Others such as AWS S3 provide a "206 Partial Response" with a "Content-Range" header
// indicating the entire file is being returned.
//
// Strictly speaking, a "200" response is okay. Although RFC 7233 doesn't specify anything about the edge case
// of "bytes=0-" which really means the entire file, it does say:
//
// A server MAY ignore the Range header field
//
// https://www.rfc-editor.org/rfc/rfc7233#section-3.1
//
// Therefore, this special case will check for a "200" response, and if it exists, request a range that
// encompases the entire length of the file, as per the Content-Length header.
$httpLine = $responseHead[0];
if ($start === 0 && preg_match('#^HTTP/\d\.\d 200 OK#i', $httpLine) === 1) {
$lengthHeaders = array_values(array_filter($responseHead, function ($v) {
return preg_match('#^content-length:#i', $v) === 1;
}));
if (!$lengthHeaders) {
$this->current = null;
return false;
}
$contentLength = (int)trim(explode(':', $lengthHeaders[0])[1]);
$this->offset = 0;
$this->length = $contentLength;
return true;
} else {
$this->current = null;
return false;
}
}

$contentRange = $rangeHeaders[0];

$content = trim(explode(':', $contentRange)[1]);
Expand Down