Encrypt all queueable payloads

nielscil · Feb 18, 2021 · cd70b89 · cd70b89
1 parent 5bf9395
commit cd70b89
Show file tree

Hide file tree

Showing 13 changed files with 17,664 additions and 2,011 deletions.
diff --git a/app/Jobs/DeleteAccount.php b/app/Jobs/DeleteAccount.php
@@ -5,12 +5,13 @@
 use App\Models\DeletedUsername;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class DeleteAccount implements ShouldQueue
+class DeleteAccount implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

diff --git a/app/Mail/ForwardEmail.php b/app/Mail/ForwardEmail.php
@@ -10,6 +10,7 @@
 use App\Notifications\GpgKeyExpired;
 use App\Traits\CheckUserRules;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
@@ -18,7 +19,7 @@
 use Swift_Signers_DKIMSigner;
 use Swift_SwiftException;
 
-class ForwardEmail extends Mailable implements ShouldQueue
+class ForwardEmail extends Mailable implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable, SerializesModels, CheckUserRules;
 

diff --git a/app/Mail/ReplyToEmail.php b/app/Mail/ReplyToEmail.php
@@ -8,12 +8,13 @@
 use App\Models\User;
 use App\Traits\CheckUserRules;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 use Swift_Signers_DKIMSigner;
 
-class ReplyToEmail extends Mailable implements ShouldQueue
+class ReplyToEmail extends Mailable implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable, SerializesModels, CheckUserRules;
 

diff --git a/app/Mail/SendFromEmail.php b/app/Mail/SendFromEmail.php
@@ -8,12 +8,13 @@
 use App\Models\User;
 use App\Traits\CheckUserRules;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 use Swift_Signers_DKIMSigner;
 
-class SendFromEmail extends Mailable implements ShouldQueue
+class SendFromEmail extends Mailable implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable, SerializesModels, CheckUserRules;
 

diff --git a/app/Mail/TokenExpiringSoon.php b/app/Mail/TokenExpiringSoon.php
@@ -4,11 +4,12 @@
 
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
-class TokenExpiringSoon extends Mailable implements ShouldQueue
+class TokenExpiringSoon extends Mailable implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable, SerializesModels;
 

diff --git a/app/Notifications/GpgKeyExpired.php b/app/Notifications/GpgKeyExpired.php
@@ -3,11 +3,12 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-class GpgKeyExpired extends Notification implements ShouldQueue
+class GpgKeyExpired extends Notification implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable;
 

diff --git a/app/Notifications/NearBandwidthLimit.php b/app/Notifications/NearBandwidthLimit.php
@@ -3,11 +3,12 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-class NearBandwidthLimit extends Notification implements ShouldQueue
+class NearBandwidthLimit extends Notification implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable;
 

diff --git a/app/Notifications/UsernameReminder.php b/app/Notifications/UsernameReminder.php
@@ -3,11 +3,12 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-class UsernameReminder extends Notification implements ShouldQueue
+class UsernameReminder extends Notification implements ShouldQueue, ShouldBeEncrypted
 {
     use Queueable;
 

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3",
-        "asbiin/laravel-webauthn": "^0.9.0",
+        "asbiin/laravel-webauthn": "^1.0.0",
         "bacon/bacon-qr-code": "^2.0",
         "doctrine/dbal": "^2.9",
         "fideloper/proxy": "^4.2",
@@ -24,7 +24,6 @@
         "php-mime-mail-parser/php-mime-mail-parser": "^6.0",
         "pragmarx/google2fa-laravel": "^1.3",
         "pragmarx/version": "^1.2",
-        "predis/predis": "^1.1",
         "ramsey/uuid": "^4.0"
     },
     "require-dev": {