Update captcha, use config_cache helper

dansup · dansup · commit 8a89e3c96371 · 2024-03-11T21:25:04.000-06:00
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -62,7 +62,7 @@ public function validateEmail(Request $request)
 
 		usleep(random_int(100000, 3000000));
 
-    	if(config('captcha.enabled')) {
+    	if((bool) config_cache('captcha.enabled')) {
             $rules = [
 	    		'email' => 'required|email',
             	'h-captcha-response' => 'required|captcha'
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -74,10 +74,10 @@ public function validateLogin($request)
         $messages = [];
 
         if(
-        	config('captcha.enabled') ||
-        	config('captcha.active.login') ||
+        	(bool) config_cache('captcha.enabled') &&
+        	(bool) config_cache('captcha.active.login') ||
         	(
-				config('captcha.triggers.login.enabled') &&
+				(bool) config_cache('captcha.triggers.login.enabled') &&
 				request()->session()->has('login_attempts') &&
 				request()->session()->get('login_attempts') >= config('captcha.triggers.login.attempts')
 			)
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -137,7 +137,7 @@ function ($attribute, $value, $fail) {
 			'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
 		];
 
-		if(config('captcha.enabled') || config('captcha.active.register')) {
+		if((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {
 			$rules['h-captcha-response'] = 'required|captcha';
 		}
 
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -50,7 +50,7 @@ protected function rules()
     {
     	usleep(random_int(100000, 3000000));
 
-        if(config('captcha.enabled')) {
+        if((bool) config_cache('captcha.enabled')) {
             return [
 	            'token' => 'required',
 	            'email' => 'required|email',
diff --git a/app/Http/Controllers/UserEmailForgotController.php b/app/Http/Controllers/UserEmailForgotController.php
@@ -34,7 +34,7 @@ public function store(Request $request)
             'username.exists' => 'This username is no longer active or does not exist!'
         ];
 
-        if(config('captcha.enabled') || config('captcha.active.login') || config('captcha.active.register')) {
+        if((bool) config_cache('captcha.enabled')) {
             $rules['h-captcha-response'] = 'required|captcha';
             $messages['h-captcha-response.required'] = 'You need to complete the captcha!';
         }
diff --git a/app/Services/ConfigCacheService.php b/app/Services/ConfigCacheService.php
@@ -89,6 +89,14 @@ public static function get($key)
                 'pixelfed.app_registration_confirm_rate_limit_decay',
                 'instance.embed.profile',
                 'instance.embed.post',
+
+                'captcha.enabled',
+                'captcha.secret',
+                'captcha.sitekey',
+                'captcha.active.login',
+                'captcha.active.register',
+                'captcha.triggers.login.enabled',
+                'captcha.triggers.login.attempts',
                 // 'system.user_mode'
             ];
 
diff --git a/resources/views/auth/email/forgot.blade.php b/resources/views/auth/email/forgot.blade.php
@@ -65,7 +65,7 @@ class="form-control form-control-lg bg-glass text-white"
                                 </div>
                             </div>
 
-                            @if(config('captcha.enabled') || config('captcha.active.login') || config('captcha.active.register'))
+                            @if((bool) config_cache('captcha.enabled'))
                             <label class="font-weight-bold small text-muted">Captcha</label>
                             <div class="d-flex flex-grow-1">
                                 {!! Captcha::display(['data-theme' => 'dark']) !!}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -76,10 +76,10 @@
                         </div>
 
                         @if(
-                        	config('captcha.enabled') ||
-                        	config('captcha.active.login') ||
+                        	(bool) config_cache('captcha.enabled') &&
+                        	(bool) config_cache('captcha.active.login') ||
                         	(
-                        		config('captcha.triggers.login.enabled') &&
+                        		(bool) config_cache('captcha.triggers.login.enabled') &&
                         		request()->session()->has('login_attempts') &&
                         		request()->session()->get('login_attempts') >= config('captcha.triggers.login.attempts')
                         	)
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
@@ -54,7 +54,7 @@ class="form-control form-control-lg bg-glass text-white"
 	                            </div>
 	                        </div>
 
-							@if(config('captcha.enabled'))
+							@if((bool) config_cache('captcha.enabled'))
 							<label class="font-weight-bold small text-muted">Captcha</label>
 	                        <div class="d-flex flex-grow-1">
 	                            {!! Captcha::display(['data-theme' => 'dark']) !!}
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
@@ -109,7 +109,7 @@ class="form-control form-control-lg bg-glass text-white{{ $errors->has('password
 	                            </div>
 	                        </div>
 
-							@if(config('captcha.enabled'))
+							@if((bool) config_cache('captcha.enabled'))
 							<label class="font-weight-bold small pt-3 text-muted">Captcha</label>
 	                        <div class="d-flex flex-grow-1">
 	                            {!! Captcha::display(['data-theme' => 'dark']) !!}
diff --git a/resources/views/settings/parental-controls/invite-register-form.blade.php b/resources/views/settings/parental-controls/invite-register-form.blade.php
@@ -91,7 +91,7 @@ class="rounded-circle mr-2"
                             </div>
                         </div>
 
-                        @if(config('captcha.enabled') || config('captcha.active.register'))
+                        @if((bool) config_cache('captcha.enabled'))
                         <div class="d-flex justify-content-center my-3">
                             {!! Captcha::display() !!}
                         </div>

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,10 @@ public function validateLogin($request)`
`74`	`74`	`$messages = [];`
`75`	`75`
`76`	`76`	`if(`
`77`		`- config('captcha.enabled') \|\|`
`78`		`- config('captcha.active.login') \|\|`
	`77`	`+ (bool) config_cache('captcha.enabled') &&`
	`78`	`+ (bool) config_cache('captcha.active.login') \|\|`
`79`	`79`	`(`
`80`		`- config('captcha.triggers.login.enabled') &&`
	`80`	`+ (bool) config_cache('captcha.triggers.login.enabled') &&`
`81`	`81`	`request()->session()->has('login_attempts') &&`
`82`	`82`	`request()->session()->get('login_attempts') >= config('captcha.triggers.login.attempts')`
`83`	`83`	`)`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ function ($attribute, $value, $fail) {`
`137`	`137`	`'password' => 'required\|string\|min:'.config('pixelfed.min_password_length').'\|confirmed',`
`138`	`138`	`];`
`139`	`139`
`140`		`- if(config('captcha.enabled') \|\| config('captcha.active.register')) {`
	`140`	`+ if((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {`
`141`	`141`	`$rules['h-captcha-response'] = 'required\|captcha';`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected function rules()`
`50`	`50`	`{`
`51`	`51`	`usleep(random_int(100000, 3000000));`
`52`	`52`
`53`		`- if(config('captcha.enabled')) {`
	`53`	`+ if((bool) config_cache('captcha.enabled')) {`
`54`	`54`	`return [`
`55`	`55`	`'token' => 'required',`
`56`	`56`	`'email' => 'required\|email',`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function store(Request $request)`
`34`	`34`	`'username.exists' => 'This username is no longer active or does not exist!'`
`35`	`35`	`];`
`36`	`36`
`37`		`- if(config('captcha.enabled') \|\| config('captcha.active.login') \|\| config('captcha.active.register')) {`
	`37`	`+ if((bool) config_cache('captcha.enabled')) {`
`38`	`38`	`$rules['h-captcha-response'] = 'required\|captcha';`
`39`	`39`	`$messages['h-captcha-response.required'] = 'You need to complete the captcha!';`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,10 @@`
`76`	`76`	`</div>`
`77`	`77`
`78`	`78`	`@if(`
`79`		`- config('captcha.enabled') \|\|`
`80`		`- config('captcha.active.login') \|\|`
	`79`	`+ (bool) config_cache('captcha.enabled') &&`
	`80`	`+ (bool) config_cache('captcha.active.login') \|\|`
`81`	`81`	`(`
`82`		`- config('captcha.triggers.login.enabled') &&`
	`82`	`+ (bool) config_cache('captcha.triggers.login.enabled') &&`
`83`	`83`	`request()->session()->has('login_attempts') &&`
`84`	`84`	`request()->session()->get('login_attempts') >= config('captcha.triggers.login.attempts')`
`85`	`85`	`)`