Merge branch 'develop' into feature/300-incoming-webhook

2020-08-06 23:28:30 +09:00
parent 66322dfec0 65077571e7
commit 62a3e883e1
23 changed files with 751 additions and 442 deletions
--- a/app/Http/Controllers/Api/CardController.php
+++ b/app/Http/Controllers/Api/CardController.php
@@ -2,6 +2,7 @@

 namespace App\Http\Controllers\Api;

+use App\MetadataResolver\DeniedHostException;
 use App\Services\MetadataResolveService;
 use Illuminate\Http\Request;

@@ -13,7 +14,11 @@ class CardController
            'url:required|url'
        ]);

-        $metadata = $service->execute($request->input('url'));
+        try {
+            $metadata = $service->execute($request->input('url'));
+        } catch (DeniedHostException $e) {
+            abort(403, $e->getMessage());
+        }
        $metadata->load('tags');

        $response = response($metadata);