pull/7309/head
Your Name 1 week ago
parent abb2d8e5e9
commit ababab30ed

@ -100,10 +100,6 @@ CAPTCHA_ENABLED_ON_FORGOT_PASSWORD=false
CAPTCHA_ENABLED_ON_PASSWORD_RESET=false CAPTCHA_ENABLED_ON_PASSWORD_RESET=false
CAPTCHA_ENABLED_ON_CURATED_REGISTER=false CAPTCHA_ENABLED_ON_CURATED_REGISTER=false
# Show a captcha on login only after N failed attempts
CAPTCHA_TRIGGERS_LOGIN_ENABLED=false
CAPTCHA_TRIGGERS_LOGIN_ATTEMPTS=2
# --- hCaptcha (driver: hcaptcha) --- # --- hCaptcha (driver: hcaptcha) ---
CAPTCHA_SECRET= CAPTCHA_SECRET=
CAPTCHA_SITEKEY= CAPTCHA_SITEKEY=

@ -12,7 +12,6 @@ use Illuminate\Support\Facades\Facade;
* @method static CaptchaDriver active() * @method static CaptchaDriver active()
* @method static bool enabled() * @method static bool enabled()
* @method static bool activeOn(string $surface) * @method static bool activeOn(string $surface)
* @method static bool activeOnLogin()
* @method static array available() * @method static array available()
* @method static array rules() * @method static array rules()
* @method static CaptchaDriver driver(string|null $driver = null) * @method static CaptchaDriver driver(string|null $driver = null)

@ -744,7 +744,6 @@ trait AdminSettingsController
ConfigCacheService::put('captcha.active.forgotpassword', $request->boolean('captcha_on_forgotpassword')); ConfigCacheService::put('captcha.active.forgotpassword', $request->boolean('captcha_on_forgotpassword'));
ConfigCacheService::put('captcha.active.password_reset', $request->boolean('captcha_on_password_reset')); ConfigCacheService::put('captcha.active.password_reset', $request->boolean('captcha_on_password_reset'));
ConfigCacheService::put('captcha.active.curated_register', $request->boolean('captcha_on_curated_register')); ConfigCacheService::put('captcha.active.curated_register', $request->boolean('captcha_on_curated_register'));
ConfigCacheService::put('captcha.triggers.login.enabled', $request->boolean('captcha_on_login'));
ConfigCacheService::put('captcha.enabled', true); ConfigCacheService::put('captcha.enabled', true);
} else { } else {
ConfigCacheService::put('captcha.enabled', false); ConfigCacheService::put('captcha.enabled', false);

@ -88,6 +88,4 @@ return [
'password_reset' => env('CAPTCHA_ENABLED_ON_PASSWORD_RESET', false), 'password_reset' => env('CAPTCHA_ENABLED_ON_PASSWORD_RESET', false),
'curated_register' => env('CAPTCHA_ENABLED_ON_CURATED_REGISTER', false), 'curated_register' => env('CAPTCHA_ENABLED_ON_CURATED_REGISTER', false),
], ],
/*
]; ];

@ -111,36 +111,6 @@ class CaptchaManagerTest extends TestCase
$this->assertTrue($manager->activeOn('curated_register')); $this->assertTrue($manager->activeOn('curated_register'));
} }
#[Test]
public function active_on_login_honors_surface_and_attempt_trigger(): void
{
// Surface directly active
config([
'captcha.enabled' => true,
'captcha.active.login' => true,
'captcha.triggers.login.enabled' => false,
]);
$this->assertTrue($this->manager()->activeOnLogin());
// Surface off, trigger disabled -> false
config(['captcha.active.login' => false]);
$this->assertFalse($this->manager()->activeOnLogin());
// Trigger enabled but below threshold -> false
config([
'captcha.triggers.login.enabled' => true,
'captcha.triggers.login.attempts' => 2,
]);
$session = $this->app['session']->driver();
request()->setLaravelSession($session);
$session->put('login_attempts', 1);
$this->assertFalse($this->manager()->activeOnLogin());
// Trigger enabled and at threshold -> true
$session->put('login_attempts', 2);
$this->assertTrue($this->manager()->activeOnLogin());
}
#[Test] #[Test]
public function cap_widget_defaults_to_latest_when_no_version_set(): void public function cap_widget_defaults_to_latest_when_no_version_set(): void
{ {

Loading…
Cancel
Save