From 597378bfb431fde6bf62ab182fbcbfaa1a14e803 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 Jul 2020 22:17:00 -0600 Subject: [PATCH] Update upload endpoints with MediaBlocklist checks --- app/Http/Controllers/Api/ApiV1Controller.php | 6 +++++- app/Http/Controllers/Api/BaseApiController.php | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index dd6112831..7bf0646e2 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -48,9 +48,11 @@ use App\Jobs\VideoPipeline\{ use App\Services\{ NotificationService, MediaPathService, - SearchApiV2Service + SearchApiV2Service, + MediaBlocklistService }; + class ApiV1Controller extends Controller { protected $fractal; @@ -1046,6 +1048,8 @@ class ApiV1Controller extends Controller $path = $photo->store($storagePath); $hash = \hash_file('sha256', $photo); + abort_if(MediaBlocklistService::exists($hash) == true, 451); + $media = new Media(); $media->status_id = null; $media->profile_id = $profile->id; diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 433841fbf..6c14d07a2 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -36,6 +36,7 @@ use App\Jobs\VideoPipeline\{ }; use App\Services\NotificationService; use App\Services\MediaPathService; +use App\Services\MediaBlocklistService; class BaseApiController extends Controller { @@ -247,6 +248,8 @@ class BaseApiController extends Controller $path = $photo->store($storagePath); $hash = \hash_file('sha256', $photo); + abort_if(MediaBlocklistService::exists($hash) == true, 451); + $media = new Media(); $media->status_id = null; $media->profile_id = $profile->id;