Routes: Added throttling to a range of auth-related endpoints

Some already throttled in some means, but this adds a simple ip-based
non-request-specific layer to many endpoints.
Related to #4993
This commit is contained in:
Dan Brown 2024-05-20 14:00:58 +01:00
parent 72c5141dec
commit 69af9e0dbd
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
7 changed files with 109 additions and 12 deletions

View File

@ -6,6 +6,7 @@ use BookStack\Activity\ActivityType;
use BookStack\Http\Controller; use BookStack\Http\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password; use Illuminate\Support\Facades\Password;
use Illuminate\Support\Sleep;
class ForgotPasswordController extends Controller class ForgotPasswordController extends Controller
{ {
@ -32,6 +33,10 @@ class ForgotPasswordController extends Controller
'email' => ['required', 'email'], 'email' => ['required', 'email'],
]); ]);
// Add random pause to the response to help avoid time-base sniffing
// of valid resets via slower email send handling.
Sleep::for(random_int(1000, 3000))->milliseconds();
// We will send the password reset link to this user. Once we have attempted // We will send the password reset link to this user. Once we have attempted
// to send the link, we will examine the response then see the message we // to send the link, we will examine the response then see the message we
// need to show to the user. Finally, we'll send out a proper response. // need to show to the user. Finally, we'll send out a proper response.

View File

@ -15,14 +15,11 @@ use Illuminate\Validation\Rules\Password as PasswordRule;
class ResetPasswordController extends Controller class ResetPasswordController extends Controller
{ {
protected LoginService $loginService; public function __construct(
protected LoginService $loginService
public function __construct(LoginService $loginService) ) {
{
$this->middleware('guest'); $this->middleware('guest');
$this->middleware('guard:standard'); $this->middleware('guard:standard');
$this->loginService = $loginService;
} }
/** /**

View File

@ -81,5 +81,9 @@ class RouteServiceProvider extends ServiceProvider
RateLimiter::for('api', function (Request $request) { RateLimiter::for('api', function (Request $request) {
return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip()); return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
}); });
RateLimiter::for('public', function (Request $request) {
return Limit::perMinute(10)->by($request->ip());
});
} }
} }

View File

@ -317,8 +317,8 @@ Route::get('/register/confirm', [AccessControllers\ConfirmEmailController::class
Route::get('/register/confirm/awaiting', [AccessControllers\ConfirmEmailController::class, 'showAwaiting']); Route::get('/register/confirm/awaiting', [AccessControllers\ConfirmEmailController::class, 'showAwaiting']);
Route::post('/register/confirm/resend', [AccessControllers\ConfirmEmailController::class, 'resend']); Route::post('/register/confirm/resend', [AccessControllers\ConfirmEmailController::class, 'resend']);
Route::get('/register/confirm/{token}', [AccessControllers\ConfirmEmailController::class, 'showAcceptForm']); Route::get('/register/confirm/{token}', [AccessControllers\ConfirmEmailController::class, 'showAcceptForm']);
Route::post('/register/confirm/accept', [AccessControllers\ConfirmEmailController::class, 'confirm']); Route::post('/register/confirm/accept', [AccessControllers\ConfirmEmailController::class, 'confirm'])->middleware('throttle:public');
Route::post('/register', [AccessControllers\RegisterController::class, 'postRegister']); Route::post('/register', [AccessControllers\RegisterController::class, 'postRegister'])->middleware('throttle:public');
// SAML routes // SAML routes
Route::post('/saml2/login', [AccessControllers\Saml2Controller::class, 'login']); Route::post('/saml2/login', [AccessControllers\Saml2Controller::class, 'login']);
@ -338,16 +338,16 @@ Route::get('/oidc/callback', [AccessControllers\OidcController::class, 'callback
Route::post('/oidc/logout', [AccessControllers\OidcController::class, 'logout']); Route::post('/oidc/logout', [AccessControllers\OidcController::class, 'logout']);
// User invitation routes // User invitation routes
Route::get('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'showSetPassword']); Route::get('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'showSetPassword'])->middleware('throttle:public');
Route::post('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'setPassword']); Route::post('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'setPassword'])->middleware('throttle:public');
// Password reset link request routes // Password reset link request routes
Route::get('/password/email', [AccessControllers\ForgotPasswordController::class, 'showLinkRequestForm']); Route::get('/password/email', [AccessControllers\ForgotPasswordController::class, 'showLinkRequestForm']);
Route::post('/password/email', [AccessControllers\ForgotPasswordController::class, 'sendResetLinkEmail']); Route::post('/password/email', [AccessControllers\ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:public');
// Password reset routes // Password reset routes
Route::get('/password/reset/{token}', [AccessControllers\ResetPasswordController::class, 'showResetForm']); Route::get('/password/reset/{token}', [AccessControllers\ResetPasswordController::class, 'showResetForm']);
Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset']); Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset'])->middleware('throttle:public');
// Metadata routes // Metadata routes
Route::view('/help/wysiwyg', 'help.wysiwyg'); Route::view('/help/wysiwyg', 'help.wysiwyg');

View File

@ -203,4 +203,33 @@ class RegistrationTest extends TestCase
$resp = $this->followRedirects($resp); $resp = $this->followRedirects($resp);
$this->withHtml($resp)->assertElementExists('form input[name="username"].text-neg'); $this->withHtml($resp)->assertElementExists('form input[name="username"].text-neg');
} }
public function test_registration_endpoint_throttled()
{
$this->setSettings(['registration-enabled' => 'true']);
for ($i = 0; $i < 11; $i++) {
$response = $this->post('/register/', [
'name' => "Barry{$i}",
'email' => "barry{$i}@example.com",
'password' => "barryIsTheBest{$i}",
]);
auth()->logout();
}
$response->assertStatus(429);
}
public function test_registration_confirmation_throttled()
{
$this->setSettings(['registration-enabled' => 'true']);
for ($i = 0; $i < 11; $i++) {
$response = $this->post('/register/confirm/accept', [
'token' => "token{$i}",
]);
}
$response->assertStatus(429);
}
} }

View File

@ -4,11 +4,19 @@ namespace Tests\Auth;
use BookStack\Access\Notifications\ResetPasswordNotification; use BookStack\Access\Notifications\ResetPasswordNotification;
use BookStack\Users\Models\User; use BookStack\Users\Models\User;
use Carbon\CarbonInterval;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Sleep;
use Tests\TestCase; use Tests\TestCase;
class ResetPasswordTest extends TestCase class ResetPasswordTest extends TestCase
{ {
protected function setUp(): void
{
parent::setUp();
Sleep::fake();
}
public function test_reset_flow() public function test_reset_flow()
{ {
Notification::fake(); Notification::fake();
@ -75,6 +83,17 @@ class ResetPasswordTest extends TestCase
->assertSee('The password reset token is invalid for this email address.'); ->assertSee('The password reset token is invalid for this email address.');
} }
public function test_reset_request_with_not_found_user_still_has_delay()
{
$this->followingRedirects()->post('/password/email', [
'email' => 'barrynotfoundrandomuser@example.com',
]);
Sleep::assertSlept(function (CarbonInterval $duration): bool {
return $duration->totalMilliseconds > 999;
}, 1);
}
public function test_reset_page_shows_sign_links() public function test_reset_page_shows_sign_links()
{ {
$this->setSettings(['registration-enabled' => 'true']); $this->setSettings(['registration-enabled' => 'true']);
@ -98,4 +117,27 @@ class ResetPasswordTest extends TestCase
Notification::assertSentTimes(ResetPasswordNotification::class, 1); Notification::assertSentTimes(ResetPasswordNotification::class, 1);
$resp->assertSee('A password reset link will be sent to ' . $editor->email . ' if that email address is found in the system.'); $resp->assertSee('A password reset link will be sent to ' . $editor->email . ' if that email address is found in the system.');
} }
public function test_reset_request_with_not_found_user_is_throttled()
{
for ($i = 0; $i < 11; $i++) {
$response = $this->post('/password/email', [
'email' => 'barrynotfoundrandomuser@example.com',
]);
}
$response->assertStatus(429);
}
public function test_reset_call_is_throttled()
{
for ($i = 0; $i < 11; $i++) {
$response = $this->post('/password/reset', [
'email' => "arandomuser{$i}@example.com",
'token' => "randomtoken{$i}",
]);
}
$response->assertStatus(429);
}
} }

View File

@ -137,4 +137,24 @@ class UserInviteTest extends TestCase
$setPasswordPageResp->assertRedirect('/password/email'); $setPasswordPageResp->assertRedirect('/password/email');
$setPasswordPageResp->assertSessionHas('error', 'This invitation link has expired. You can instead try to reset your account password.'); $setPasswordPageResp->assertSessionHas('error', 'This invitation link has expired. You can instead try to reset your account password.');
} }
public function test_set_password_view_is_throttled()
{
for ($i = 0; $i < 11; $i++) {
$response = $this->get("/register/invite/tokenhere{$i}");
}
$response->assertStatus(429);
}
public function test_set_password_post_is_throttled()
{
for ($i = 0; $i < 11; $i++) {
$response = $this->post("/register/invite/tokenhere{$i}", [
'password' => 'my test password',
]);
}
$response->assertStatus(429);
}
} }