From cc65339a0127e7dc98466a8a4b25bc8aeb5e4bde Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 13 Sep 2021 12:07:27 +0545
Subject: [PATCH] fix range header and test

---
 app/controllers/api/storage.php            | 2 +-
 app/controllers/general.php                | 1 +
 tests/e2e/Services/Storage/StorageBase.php | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index e9580618b0..dc891b8bb5 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -1069,7 +1069,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
             list($unit, $range) = explode('=', $rangeHeader);
             if($unit == 'bytes' && !empty($range)) {
                 list($rangeStart, $rangeEnd) = explode('-', $range);
-                if(strlen($rangeStart) == 0) {
+                if(strlen($rangeStart) == 0 || strstr($range, '-') === false) {
                     throw new Exception('Invalid range', 416);
                 }
                 $rangeStart = (int) $rangeStart;
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 5f9117f900..27ddd31c91 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -338,6 +338,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
         case 404: // Error allowed publicly
         case 409: // Error allowed publicly
         case 412: // Error allowed publicly
+        case 416: // Error allowed publicly
         case 429: // Error allowed publicly
         case 501: // Error allowed publicly
         case 503: // Error allowed publicly
diff --git a/tests/e2e/Services/Storage/StorageBase.php b/tests/e2e/Services/Storage/StorageBase.php
index 53749b3f9c..d933451370 100644
--- a/tests/e2e/Services/Storage/StorageBase.php
+++ b/tests/e2e/Services/Storage/StorageBase.php
@@ -304,8 +304,8 @@ trait StorageBase
             'x-appwrite-project' => $this->getProject()['$id'],
             'Range' => 'bytes=0-',
         ], $this->getHeaders()));
-        
-        $this->assertEquals(400, $file52['headers']['status-code']);
+
+        $this->assertEquals(206, $file52['headers']['status-code']);
         
         // Test ranged download - with invalid range
         $file53 = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $data['fileId'] . '/download', array_merge([
@@ -314,7 +314,7 @@ trait StorageBase
             'Range' => 'bytes=988',
         ], $this->getHeaders()));
         
-        $this->assertEquals(400, $file53['headers']['status-code']);
+        $this->assertEquals(416, $file53['headers']['status-code']);
         
         // Test ranged download - with invalid range
         $file54 = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $data['fileId'] . '/download', array_merge([
@@ -323,7 +323,7 @@ trait StorageBase
             'Range' => 'bytes=-988',
         ], $this->getHeaders()));
         
-        $this->assertEquals(400, $file54['headers']['status-code']);
+        $this->assertEquals(416, $file54['headers']['status-code']);
         
         $file6 = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $data['fileId'] . '/view', array_merge([
             'content-type' => 'application/json',