summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-03-19 15:28:02 +0100
committerRobin Appelman <robin@icewind.nl>2020-04-01 15:23:05 +0200
commit3ba46f3b50645c563c45996e5ccea884129ee187 (patch)
tree7a8d82ff84fa474dd772a7d471c1af3ecfba45e0 /lib
parent7b07e7251c8a92e95da922f34dde158ddffbeeee (diff)
downloadnextcloud-server-3ba46f3b50645c563c45996e5ccea884129ee187.tar.gz
nextcloud-server-3ba46f3b50645c563c45996e5ccea884129ee187.zip
add basic tests for s3 seeking and add some error handling if reopen return the wrong range
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Stream/SeekableHttpStream.php26
1 files changed, 18 insertions, 8 deletions
diff --git a/lib/private/Files/Stream/SeekableHttpStream.php b/lib/private/Files/Stream/SeekableHttpStream.php
index 80f05f7ea09..8fe54839e25 100644
--- a/lib/private/Files/Stream/SeekableHttpStream.php
+++ b/lib/private/Files/Stream/SeekableHttpStream.php
@@ -76,7 +76,8 @@ class SeekableHttpStream implements File {
/** @var int */
private $offset = 0;
- private function reconnect($range) {
+ private function reconnect(int $start) {
+ $range = $start . '-';
if ($this->current != null) {
fclose($this->current);
}
@@ -88,14 +89,23 @@ class SeekableHttpStream implements File {
}
$responseHead = stream_get_meta_data($this->current)['wrapper_data'];
- $contentRange = array_values(array_filter($responseHead, function ($v) {
+ $rangeHeaders = array_values(array_filter($responseHead, function ($v) {
return preg_match('#^content-range:#i', $v) === 1;
- }))[0];
+ }));
+ if (!$rangeHeaders) {
+ return false;
+ }
+ $contentRange = $rangeHeaders[0];
$content = trim(explode(':', $contentRange)[1]);
$range = trim(explode(' ', $content)[1]);
- $begin = explode('-', $range)[0];
- $this->offset = intval($begin);
+ $begin = intval(explode('-', $range)[0]);
+
+ if ($begin !== $start) {
+ return false;
+ }
+
+ $this->offset = $begin;
return true;
}
@@ -104,7 +114,7 @@ class SeekableHttpStream implements File {
$options = stream_context_get_options($this->context)[self::PROTOCOL];
$this->openCallback = $options['callback'];
- return $this->reconnect('0-');
+ return $this->reconnect(0);
}
function stream_read($count) {
@@ -122,12 +132,12 @@ class SeekableHttpStream implements File {
if ($offset === $this->offset) {
return true;
}
- return $this->reconnect($offset . '-');
+ return $this->reconnect($offset);
case SEEK_CUR:
if ($offset === 0) {
return true;
}
- return $this->reconnect(($this->offset + $offset) . '-');
+ return $this->reconnect($this->offset + $offset);
case SEEK_END:
return false;
}