From 77e7de630452c7047ea97e46d07f01d854b200e6 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 15 Jul 2021 15:25:41 +0545 Subject: [PATCH] use range parser from framewwork --- app/controllers/api/storage.php | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 513a20bd5e..7c4bdf197c 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -317,26 +317,13 @@ App::post('/v1/storage/buckets/:bucketId/files') $chunks = 1; if (!empty($contentRange)) { + $start = $request->getContentRangeStart(); + $end = $request->getContentRangeEnd(); + $size = $request->getContentRangeSize(); + $fileId = $request->getHeader('x-appwrite-file-id', $fileId); - $contentRange = explode(" ", $contentRange); - if (count($contentRange) != 2) { - throw new Exception('Invalid content-range header', 400); - } - - $rangeData = explode("/", $contentRange[1]); - if (count($rangeData) != 2) { - throw new Exception('Invalid content-range header', 400); - } - - $size = (int) $rangeData[1]; - $parts = explode("-", $rangeData[0]); - if (count($parts) != 2) { - throw new Exception('Invalid content-range header', 400); - } - - $start = (int) $parts[0]; - $end = (int) $parts[1]; - if ($start > $end || $end > $size) { + + if(empty($start) || empty($end) || empty($size)) { throw new Exception('Invalid content-range header', 400); }