From bf08470bf50043abd16a7051988944d81a84b5d2 Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Thu, 21 May 2020 07:51:11 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- app/Console/Commands/EmailBlacklistUpdate.php | 4 +++- app/Helpers/EmailBlacklistUpdater.php | 2 +- .../Controllers/Auth/RegisterController.php | 10 ++++----- .../Staff/ApplicationController.php | 4 ++-- app/Http/Controllers/UserController.php | 4 ++-- .../EmailBlacklistServiceProvider.php | 6 ++--- app/Validators/EmailValidator.php | 22 +++++++++++-------- config/email-blacklist.php | 10 ++++----- 8 files changed, 34 insertions(+), 28 deletions(-) diff --git a/app/Console/Commands/EmailBlacklistUpdate.php b/app/Console/Commands/EmailBlacklistUpdate.php index e3b513c698..5dbca57751 100644 --- a/app/Console/Commands/EmailBlacklistUpdate.php +++ b/app/Console/Commands/EmailBlacklistUpdate.php @@ -53,12 +53,14 @@ public function handle() if ($count === false) { $this->warn('No domains retrieved. Check the email.blacklist.source key for validation config.'); + return; } if ($count === 0) { $this->info('Advice: Blacklist was retrieved from source but 0 domains were listed.'); + return; } $this->info("{$count} domains retrieved. Cache updated. You are good to go."); } -} \ No newline at end of file +} diff --git a/app/Helpers/EmailBlacklistUpdater.php b/app/Helpers/EmailBlacklistUpdater.php index 69c60bae01..3e3944ed95 100644 --- a/app/Helpers/EmailBlacklistUpdater.php +++ b/app/Helpers/EmailBlacklistUpdater.php @@ -35,4 +35,4 @@ public static function update() return $count; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index e362fe1bce..8ab3387349 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -97,13 +97,13 @@ public function register(Request $request, $code = null) $v = validator($request->all(), [ 'username' => 'required|alpha_dash|string|between:3,25|unique:users', 'password' => 'required|string|between:8,16', - 'email' => 'required|string|email|max:70|blacklist|unique:users' + 'email' => 'required|string|email|max:70|blacklist|unique:users', ]); } else { $v = validator($request->all(), [ 'username' => 'required|alpha_dash|string|between:3,25|unique:users', 'password' => 'required|string|between:8,16', - 'email' => 'required|string|email|max:70|blacklist|unique:users', + 'email' => 'required|string|email|max:70|blacklist|unique:users', 'captcha' => 'hiddencaptcha', ]); } @@ -112,14 +112,14 @@ public function register(Request $request, $code = null) $v = validator($request->all(), [ 'username' => 'required|alpha_dash|string|between:3,25|unique:users', 'password' => 'required|string|between:8,16', - 'email' => 'required|string|email|max:70|unique:users' + 'email' => 'required|string|email|max:70|unique:users', ]); } else { $v = validator($request->all(), [ 'username' => 'required|alpha_dash|string|between:3,25|unique:users', 'password' => 'required|string|between:6,16', - 'email' => 'required|string|email|max:70|unique:users', - 'captcha' => 'hiddencaptcha', + 'email' => 'required|string|email|max:70|unique:users', + 'captcha' => 'hiddencaptcha', ]); } } diff --git a/app/Http/Controllers/Staff/ApplicationController.php b/app/Http/Controllers/Staff/ApplicationController.php index 146e61fd24..42cb348c39 100644 --- a/app/Http/Controllers/Staff/ApplicationController.php +++ b/app/Http/Controllers/Staff/ApplicationController.php @@ -82,12 +82,12 @@ public function approve(Request $request, $id) if (config('email-blacklist.enabled') == true) { $v = validator($request->all(), [ - 'email' => 'required|string|email|max:70|blacklist|unique:users|unique:invites', + 'email' => 'required|string|email|max:70|blacklist|unique:users|unique:invites', 'approve' => 'required', ]); } else { $v = validator($request->all(), [ - 'email' => 'required|string|email|max:70|unique:users|unique:invites', + 'email' => 'required|string|email|max:70|unique:users|unique:invites', 'approve' => 'required', ]); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 04a3df246d..4a5c818acb 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -354,11 +354,11 @@ protected function changeEmail(Request $request, $username) if (config('email-blacklist.enabled') == true) { $v = validator($request->all(), [ - 'email' => 'required|string|email|max:70|blacklist|unique:users' + 'email' => 'required|string|email|max:70|blacklist|unique:users', ]); } else { $v = validator($request->all(), [ - 'email' => 'required|string|email|max:70|unique:users' + 'email' => 'required|string|email|max:70|unique:users', ]); } diff --git a/app/Providers/EmailBlacklistServiceProvider.php b/app/Providers/EmailBlacklistServiceProvider.php index b7c8620243..aff686237e 100644 --- a/app/Providers/EmailBlacklistServiceProvider.php +++ b/app/Providers/EmailBlacklistServiceProvider.php @@ -36,9 +36,9 @@ public function register() public function boot() { // Add custom validation rules - Validator::extend("blacklist", "App\Validators\EmailBlacklistValidator@validate"); + Validator::extend('blacklist', "App\Validators\EmailBlacklistValidator@validate"); // Add custom validation messages - Validator::replacer("blacklist", "App\Validators\EmailBlacklistValidator@message"); + Validator::replacer('blacklist', "App\Validators\EmailBlacklistValidator@message"); } -} \ No newline at end of file +} diff --git a/app/Validators/EmailValidator.php b/app/Validators/EmailValidator.php index 84e326d3a0..09fb6520a3 100644 --- a/app/Validators/EmailValidator.php +++ b/app/Validators/EmailValidator.php @@ -17,19 +17,21 @@ use Illuminate\Support\Str; use Psr\SimpleCache\InvalidArgumentException; -class EmailBlacklistValidator +class EmailValidator { /** - * Array of blacklisted domains + * Array of blacklisted domains. */ private $domains = []; /** - * Generate the error message on validation failure + * Generate the error message on validation failure. + * * @param $message * @param $attribute * @param $rule * @param $parameters + * * @return string */ public function message($message, $attribute, $rule, $parameters) @@ -44,9 +46,9 @@ public function message($message, $attribute, $rule, $parameters) * @param string $value * @param array $parameters * - * @return bool. - * * @throws \Exception + * + * @return bool. */ public function validate($attribute, $value, $parameters) { @@ -54,19 +56,20 @@ public function validate($attribute, $value, $parameters) $this->refresh(); // Extract domain from supplied email address - $domain = Str::after(strtolower($value), "@"); + $domain = Str::after(strtolower($value), '@'); // Run validation check return ! in_array($domain, $this->domains); } /** - * Retrive latest selection of blacklisted domains and cache them + * Retrive latest selection of blacklisted domains and cache them. * * @param null * - * @return void * @throws \Exception + * + * @return void */ public function refresh() { @@ -78,6 +81,7 @@ public function refresh() protected function shouldUpdate() { $autoupdate = config('email-blacklist.auto-update'); + try { if ($autoupdate && ! cache()->has(config('email-blacklist.cache-key'))) { EmailBlacklistUpdater::update(); @@ -95,4 +99,4 @@ protected function appendCustomDomains() $append_domains = explode('|', strtolower($append_list)); $this->domains = array_merge($this->domains, $append_domains); } -} \ No newline at end of file +} diff --git a/config/email-blacklist.php b/config/email-blacklist.php index fb7fc2a452..4ee8c72831 100644 --- a/config/email-blacklist.php +++ b/config/email-blacklist.php @@ -44,9 +44,9 @@ | Example: "example.com|example.net|foobar.com". | */ - 'enabled' => true, - 'source' => 'https://raw.githubusercontent.com/ivolo/disposable-email-domains/master/index.json', - 'cache-key' => 'email.domains.blacklist', + 'enabled' => true, + 'source' => 'https://raw.githubusercontent.com/ivolo/disposable-email-domains/master/index.json', + 'cache-key' => 'email.domains.blacklist', 'auto-update' => true, - 'append' => null, -]; \ No newline at end of file + 'append' => null, +];