Add tests for captcha
This commit is contained in:
parent
e2c6028196
commit
aa30d5a41e
|
|
@ -18,7 +18,7 @@ use App\Exceptions\PrettyPageException;
|
||||||
|
|
||||||
class AuthController extends Controller
|
class AuthController extends Controller
|
||||||
{
|
{
|
||||||
public function handleLogin(Request $request)
|
public function handleLogin(Request $request, Captcha $captcha)
|
||||||
{
|
{
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'identification' => 'required',
|
'identification' => 'required',
|
||||||
|
|
@ -44,7 +44,7 @@ class AuthController extends Controller
|
||||||
$loginFails = (int) Cache::get($loginFailsCacheKey, 0);
|
$loginFails = (int) Cache::get($loginFailsCacheKey, 0);
|
||||||
|
|
||||||
if ($loginFails > 3) {
|
if ($loginFails > 3) {
|
||||||
$this->validate($request, ['captcha' => ['required', new Captcha]]);
|
$this->validate($request, ['captcha' => ['required', $captcha]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $user) {
|
if (! $user) {
|
||||||
|
|
@ -96,7 +96,7 @@ class AuthController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handleRegister(Request $request)
|
public function handleRegister(Request $request, Captcha $captcha)
|
||||||
{
|
{
|
||||||
if (! option('user_can_register')) {
|
if (! option('user_can_register')) {
|
||||||
return json(trans('auth.register.close'), 7);
|
return json(trans('auth.register.close'), 7);
|
||||||
|
|
@ -108,7 +108,7 @@ class AuthController extends Controller
|
||||||
$data = $this->validate($request, array_merge([
|
$data = $this->validate($request, array_merge([
|
||||||
'email' => 'required|email|unique:users',
|
'email' => 'required|email|unique:users',
|
||||||
'password' => 'required|min:8|max:32',
|
'password' => 'required|min:8|max:32',
|
||||||
'captcha' => ['required', new Captcha],
|
'captcha' => ['required', $captcha],
|
||||||
], $rule));
|
], $rule));
|
||||||
|
|
||||||
if (option('register_with_player_name')) {
|
if (option('register_with_player_name')) {
|
||||||
|
|
@ -173,10 +173,10 @@ class AuthController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handleForgot(Request $request)
|
public function handleForgot(Request $request, Captcha $captcha)
|
||||||
{
|
{
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'captcha' => ['required', new Captcha],
|
'captcha' => ['required', $captcha],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (! config('mail.driver')) {
|
if (! config('mail.driver')) {
|
||||||
|
|
|
||||||
|
|
@ -6,26 +6,31 @@ use Illuminate\Contracts\Validation\Rule;
|
||||||
|
|
||||||
class Captcha implements Rule
|
class Captcha implements Rule
|
||||||
{
|
{
|
||||||
|
protected $client;
|
||||||
|
|
||||||
|
public function __construct(\GuzzleHttp\Client $client)
|
||||||
|
{
|
||||||
|
$this->client = $client;
|
||||||
|
}
|
||||||
|
|
||||||
public function passes($attribute, $value)
|
public function passes($attribute, $value)
|
||||||
{
|
{
|
||||||
if (app()->environment('testing')) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$secretkey = option('recaptcha_secretkey');
|
$secretkey = option('recaptcha_secretkey');
|
||||||
if ($secretkey) {
|
if ($secretkey) {
|
||||||
$client = new \GuzzleHttp\Client();
|
try {
|
||||||
$response = $client->post('https://www.recaptcha.net/recaptcha/api/siteverify', [
|
$response = $this->client->post('https://www.recaptcha.net/recaptcha/api/siteverify', [
|
||||||
'form_params' => [
|
'form_params' => [
|
||||||
'secret' => $secretkey,
|
'secret' => $secretkey,
|
||||||
'response' => $value,
|
'response' => $value,
|
||||||
]
|
]
|
||||||
]);
|
]);
|
||||||
if ($response->getStatusCode() == 200) {
|
if ($response->getStatusCode() == 200) {
|
||||||
$body = json_decode((string) $response->getBody());
|
$body = json_decode((string) $response->getBody());
|
||||||
return $body->success;
|
return $body->success;
|
||||||
|
}
|
||||||
|
} catch (\GuzzleHttp\Exception\RequestException $e) {
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return captcha_check($value);
|
return captcha_check($value);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,19 @@ class AuthControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
use DatabaseTransactions;
|
use DatabaseTransactions;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
app()->instance(\App\Rules\Captcha::class, new class extends \App\Rules\Captcha {
|
||||||
|
public function __construct(\GuzzleHttp\Client $client = null) {}
|
||||||
|
|
||||||
|
public function passes($attribute, $value)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public function testLogin()
|
public function testLogin()
|
||||||
{
|
{
|
||||||
$this->get('/auth/login')->assertSee('Log in');
|
$this->get('/auth/login')->assertSee('Log in');
|
||||||
|
|
|
||||||
41
tests/RulesTest/CaptchaTest.php
Normal file
41
tests/RulesTest/CaptchaTest.php
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests;
|
||||||
|
|
||||||
|
use App\Rules\Captcha;
|
||||||
|
use GuzzleHttp\Client;
|
||||||
|
use GuzzleHttp\HandlerStack;
|
||||||
|
use GuzzleHttp\Psr7\Response;
|
||||||
|
use GuzzleHttp\Handler\MockHandler;
|
||||||
|
|
||||||
|
class CaptchaTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testCharactersCaptcha()
|
||||||
|
{
|
||||||
|
app()->instance('captcha', new class {
|
||||||
|
public function check()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
$rule = resolve(Captcha::class);
|
||||||
|
$this->assertTrue($rule->passes('captcha', 'any'));
|
||||||
|
$this->assertEquals(trans('validation.captcha'), $rule->message());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRecaptcha()
|
||||||
|
{
|
||||||
|
option(['recaptcha_secretkey' => 'secret']);
|
||||||
|
$mock = new MockHandler([
|
||||||
|
new Response(403),
|
||||||
|
new Response(200, [], json_encode(['success' => true]))
|
||||||
|
]);
|
||||||
|
$handler = HandlerStack::create($mock);
|
||||||
|
$client = new Client(['handler' => $handler]);
|
||||||
|
|
||||||
|
$rule = new Captcha($client);
|
||||||
|
$this->assertFalse($rule->passes('captcha', 'value'));
|
||||||
|
$this->assertTrue($rule->passes('captcha', 'value'));
|
||||||
|
$this->assertEquals(trans('validation.recaptcha'), $rule->message());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user