fix: fix import vcard stability (#5160)

app/Exceptions/Handler.php

@@ -16,7 +16,6 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontReport = [
-        AccountLimitException::class,
         OAuthServerException::class,
         WrongIdException::class,
     ];

app/Http/Controllers/Api/Contact/ApiDocumentController.php

@@ -15,6 +15,17 @@
 
 class ApiDocumentController extends ApiController
 {
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('limitations')->only('store');
+        parent::__construct();
+    }
+
     /**
      * Get the list of documents.
      *

app/Http/Controllers/Contacts/DocumentsController.php

@@ -16,6 +16,16 @@ class DocumentsController extends Controller
 {
     use JsonRespondController;
 
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('limitations')->only('store');
+    }
+
     /**
      * Display the list of documents.
      *

app/Http/Controllers/SettingsController.php

@@ -22,15 +22,24 @@
 use LaravelWebauthn\Models\WebauthnKey;
 use App\Http\Requests\InvitationRequest;
 use App\Services\Contact\Tag\DestroyTag;
-use App\Exceptions\AccountLimitException;
 use App\Services\Account\Settings\ResetAccount;
 use App\Services\Account\Settings\DestroyAccount;
 use PragmaRX\Google2FALaravel\Facade as Google2FA;
 use App\Http\Resources\Contact\ContactShort as ContactResource;
 use App\Http\Resources\Settings\WebauthnKey\WebauthnKey as WebauthnKeyResource;
 
-class SettingsController
+class SettingsController extends Controller
 {
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('limitations')->only(['inviteUser', 'storeImport']);
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -233,16 +242,9 @@ public function upload()
 
     public function storeImport(ImportsRequest $request)
     {
-        $account = auth()->user()->account;
-        if (AccountHelper::hasReachedContactLimit($account)
-            && AccountHelper::hasLimitations($account)
-            && ! $account->legacy_free_plan_unlimited_contacts) {
-            throw new AccountLimitException();
-        }
-
         $filename = $request->file('vcard')->store('imports', config('filesystems.default'));
 
-        $importJob = $account->importjobs()->create([
+        $importJob = auth()->user()->account->importjobs()->create([
             'user_id' => auth()->user()->id,
             'type' => 'vcard',
             'filename' => $filename,
@@ -308,10 +310,6 @@ public function addUser()
      */
     public function inviteUser(InvitationRequest $request)
     {
-        if (AccountHelper::hasLimitations(auth()->user()->account)) {
-            throw new AccountLimitException();
-        }
-
         // Make sure the confirmation to invite has not been bypassed
         if (! $request->input('confirmation')) {
             return redirect()->back()->withErrors(trans('settings.users_error_please_confirm'))->withInput();

app/Models/Account/ImportJob.php

@@ -5,6 +5,7 @@
 use App\Models\User\User;
 use Sabre\VObject\Reader;
 use Illuminate\Support\Arr;
+use App\Helpers\AccountHelper;
 use Sabre\VObject\Component\VCard;
 use App\Services\VCard\ImportVCard;
 use Illuminate\Database\Eloquent\Model;
@@ -49,7 +50,7 @@ class ImportJob extends Model
      *
      * @var VCardReader
      */
-    public $entries;
+    public $entries = null;
 
     /**
      * The attributes that aren't mass assignable.
@@ -104,15 +105,17 @@ public function process($behaviour = ImportVCard::BEHAVIOUR_ADD)
     {
         $this->initJob();
 
-        $this->getPhysicalFile();
+        if (! $this->failed && $this->getPhysicalFile()) {
+            $this->getEntries();
 
-        $this->getEntries();
-
-        $this->processEntries($behaviour);
+            $this->processEntries($behaviour);
+        }
 
         $this->deletePhysicalFile();
 
-        $this->endJob();
+        if (! $this->failed) {
+            $this->endJob();
+        }
     }
 
     /**
@@ -122,6 +125,10 @@ public function process($behaviour = ImportVCard::BEHAVIOUR_ADD)
      */
     private function initJob(): void
     {
+        if (AccountHelper::hasLimitations($this->account)) {
+            $this->fail(trans('auth.not_authorized'));
+        }
+
         $this->started_at = now();
         $this->contacts_imported = 0;
         $this->contacts_skipped = 0;
@@ -149,36 +156,44 @@ private function endJob(): void
     private function fail(string $reason): void
     {
         $this->failed = true;
-        $this->failed_reason = $reason;
+        if (! $this->failed_reason) {
+            $this->failed_reason = $reason;
+        }
         $this->endJob();
     }
 
     /**
      * Get the physical file (the vCard file).
      *
-     * @return self
+     * @return bool
      */
-    private function getPhysicalFile()
+    private function getPhysicalFile(): bool
     {
         try {
             $this->physicalFile = Storage::disk(config('filesystems.default'))->readStream($this->filename);
         } catch (FileNotFoundException $exception) {
             $this->fail(trans('settings.import_vcard_file_not_found'));
+
+            return false;
         }
 
-        return $this;
+        return true;
     }
 
     /**
      * Delete the physical file from the disk.
      *
-     * @return void
+     * @return bool
      */
-    private function deletePhysicalFile(): void
+    private function deletePhysicalFile(): bool
     {
         if (! Storage::disk(config('filesystems.default'))->delete($this->filename)) {
             $this->fail(trans('settings.import_vcard_file_not_found'));
+
+            return false;
         }
+
+        return true;
     }
 
     /**
@@ -202,7 +217,7 @@ private function processEntries($behaviour = ImportVCard::BEHAVIOUR_ADD)
         while (true) {
             try {
                 /** @var VCard|null */
-                $entry = $this->entries->getNext();
+                $entry = $this->entries !== null ? $this->entries->getNext() : null;
                 if (! $entry) {
                     // file end
                     break;

app/Services/Contact/Contact/CreateContact.php

@@ -11,7 +11,6 @@
 use App\Models\Account\Account;
 use App\Models\Contact\Contact;
 use App\Jobs\AuditLog\LogAccountAudit;
-use App\Exceptions\AccountLimitException;
 use App\Jobs\Avatars\GenerateDefaultAvatar;
 use App\Jobs\Avatars\GetAvatarsFromInternet;
 
@@ -64,7 +63,7 @@ public function execute(array $data): Contact
         if (AccountHelper::hasReachedContactLimit($account)
             && AccountHelper::hasLimitations($account)
             && ! $account->legacy_free_plan_unlimited_contacts) {
-            throw new AccountLimitException();
+            abort(402);
         }
 
         // filter out the data that shall not be updated here

app/Services/Contact/Document/UploadDocument.php

@@ -7,7 +7,6 @@
 use App\Models\Account\Account;
 use App\Models\Contact\Contact;
 use App\Models\Contact\Document;
-use App\Exceptions\AccountLimitException;
 
 class UploadDocument extends BaseService
 {
@@ -36,10 +35,8 @@ public function execute(array $data): Document
         $this->validate($data);
 
         $account = Account::find($data['account_id']);
-        if (AccountHelper::hasReachedContactLimit($account)
-            && AccountHelper::hasLimitations($account)
-            && ! $account->legacy_free_plan_unlimited_contacts) {
-            throw new AccountLimitException();
+        if (AccountHelper::hasLimitations($account)) {
+            abort(402);
         }
 
         Contact::where('account_id', $data['account_id'])