Email blacklists

app/Http/Requests/Account/CreateAccountRequest.php

@@ -12,7 +12,10 @@
 namespace App\Http\Requests\Account;
 
 use App\Http\Requests\Request;
+use App\Http\ValidationRules\Account\BlackListRule;
+use App\Http\ValidationRules\Account\EmailBlackListRule;
 use App\Http\ValidationRules\NewUniqueUserRule;
+use App\Utils\Ninja;
 
 class CreateAccountRequest extends Request
 {
@@ -33,13 +36,18 @@ class CreateAccountRequest extends Request
      */
     public function rules()
     {
+
+        if(Ninja::isHosted())
+            $email_rules = ['required', 'email:rfc,dns', new NewUniqueUserRule, new BlackListRule, new EmailBlackListRule];
+        else
+            $email_rules = ['required', 'email:rfc,dns', new NewUniqueUserRule];
+
+
         return [
             'first_name'        => 'string|max:100',
             'last_name'         =>  'string:max:100',
             'password'          => 'required|string|min:6|max:1000',
-            // 'email'             => 'bail|required|email:rfc,dns',
-            // 'email'             => new NewUniqueUserRule(),
-            'email'             =>  ['required', 'email:rfc,dns', new NewUniqueUserRule],
+            'email'             =>  $email_rules,
             'privacy_policy'    => 'required|boolean',
             'terms_of_service'  => 'required|boolean',
         ];

app/Http/Requests/Login/LoginRequest.php

@@ -14,6 +14,7 @@ namespace App\Http\Requests\Login;
 
 use App\Http\Requests\Request;
 use App\Http\ValidationRules\Account\BlackListRule;
+use App\Http\ValidationRules\Account\EmailBlackListRule;
 use App\Utils\Ninja;
 
 class LoginRequest extends Request
@@ -38,7 +39,7 @@ class LoginRequest extends Request
     {
 
         if(Ninja::isHosted())
-            $email_rules = ['required', new BlackListRule];
+            $email_rules = ['required', new BlackListRule, new EmailBlackListRule];
         else
             $email_rules = 'required';
 

app/Http/ValidationRules/Account/EmailBlackListRule.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\ValidationRules\Account;
+
+use App\Libraries\MultiDB;
+use Illuminate\Contracts\Validation\Rule;
+
+/**
+ * Class EmailBlackListRule.
+ */
+class EmailBlackListRule implements Rule
+{
+    public array $blacklist = [
+        
+    ];
+
+    /**
+     * @param string $attribute
+     * @param mixed $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        
+        return !in_array($value, $this->blacklist);
+
+    }
+
+    /**
+     * @return string
+     */
+    public function message()
+    {
+        return "This email address is blacklisted, if you think this is in error, please email contact@invoiceninja.com";
+    }
+
+
+}

tests/Unit/ValidationRules/EmailBlacklistValidationTest.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+namespace Tests\Unit\ValidationRules;
+
+use App\Http\ValidationRules\Account\BlackListRule;
+use App\Http\ValidationRules\Account\EmailBlackListRule;
+use App\Models\Invoice;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\MockAccountData;
+use Tests\TestCase;
+
+/**
+ * @test
+ * @covers App\Http\ValidationRules\Account\EmailBlackListRule
+ */
+class EmailBlacklistValidationTest extends TestCase
+{
+
+
+    public function setUp() :void
+    {
+        parent::setUp();
+
+    }
+
+    public function testValidEmailRule()
+    {
+        $email_rule = new EmailBlackListRule;
+        $email_rule->blacklist = ['gimmy@gmail.com'];
+
+        $rules = [
+            'email' => [$email_rule]
+        ];
+        
+        $data = [
+            'email' => "gimmy@gmail.com",
+        ];
+        
+        $v = $this->app['validator']->make($data, $rules);
+        $this->assertFalse($v->passes());
+    }
+
+
+    public function testInValidEmailRule()
+    {
+
+        $rules = [
+            'email' => [new EmailBlackListRule]
+        ];
+        
+        $data = [
+            'email' => "jimmy@candassociates.com",
+        ];
+        
+        $v = $this->app['validator']->make($data, $rules);
+        $this->assertTrue($v->passes());
+    }
+
+
+
+
+}