Throttle the token endpoint per account and address, not per address

POST /api/v1/auth/token was limited to 6 requests a minute per IP. The
deployed MCP server signs every user in from a single container, so
under a per-IP budget one person's mistyped password, or a stranger's
guesses, would lock every other user out of it.

The named `auth-token` limiter keys on the lower-cased username (or the
refresh token) plus the address, still 6 a minute, with a 30-a-minute
ceiling per address to bound how many accounts one client can try.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-09-27 21:58:13 +02:00
parent 5558db6d56
commit 5ca084bd4a
4 changed files with 51 additions and 3 deletions

View File

@@ -54,6 +54,21 @@ class AppServiceProvider extends ServiceProvider
RateLimiter::for('api', fn (Request $request) => Limit::perMinute(120) RateLimiter::for('api', fn (Request $request) => Limit::perMinute(120)
->by($request->user()?->id ?: $request->ip())); ->by($request->user()?->id ?: $request->ip()));
// Backs POST /api/v1/auth/token. Budgeted per account and address
// rather than per address alone, because the deployed MCP server
// (mcp/) signs everyone in from one container: per IP, one person's
// wrong password — or a stranger's guesses — would lock every other
// user out of it. The per-address ceiling still bounds how many
// accounts a single client can try.
RateLimiter::for('auth-token', fn (Request $request) => [
Limit::perMinute(6)->by('auth-token:'.sha1(
Str::lower((string) ($request->input('username') ?: $request->input('refresh_token')))
.'|'.$request->ip()
)),
Limit::perMinute(30)->by('auth-token-ip:'.$request->ip()),
]);
// The public API is a different problem. The public frontend renders // The public API is a different problem. The public frontend renders
// server-side, so every visitor's page view arrives from the same IP: // server-side, so every visitor's page view arrives from the same IP:
// a per-IP budget sized for one person would throttle the entire // a per-IP budget sized for one person would throttle the entire

View File

@@ -909,8 +909,9 @@ paths:
description: | description: |
Proxies the identity server's `password` and `refresh_token` grants so Proxies the identity server's `password` and `refresh_token` grants so
first-party clients need not embed the OAuth server's URL or secret. first-party clients need not embed the OAuth server's URL or secret.
Rate limited to 6 requests per minute. Browser clients should use Rate limited to 6 requests per minute per account and address, and 30
Authorization Code + PKCE instead. per address overall. Browser clients should use Authorization Code +
PKCE instead.
security: [] security: []
requestBody: requestBody:
required: true required: true

View File

@@ -152,7 +152,7 @@ Route::prefix('v1')->name('api.v1.')->group(function () {
// Convenience endpoint for first-party clients: exchanges credentials for // Convenience endpoint for first-party clients: exchanges credentials for
// a token upstream so they do not need to know the identity server's URL. // a token upstream so they do not need to know the identity server's URL.
Route::post('auth/token', [TokenController::class, 'store']) Route::post('auth/token', [TokenController::class, 'store'])
->middleware('throttle:6,1') ->middleware('throttle:auth-token')
->name('auth.token'); ->name('auth.token');
Route::middleware(['auth:api', 'throttle:api'])->group(function () { Route::middleware(['auth:api', 'throttle:api'])->group(function () {

View File

@@ -103,6 +103,38 @@ class TokenEndpointTest extends TestCase
->assertJsonValidationErrors('grant_type'); ->assertJsonValidationErrors('grant_type');
} }
#[Test]
public function one_account_exhausting_its_budget_does_not_lock_out_another_on_the_same_address(): void
{
// Everyone the MCP server signs in arrives from its one container.
// Registered first so it wins over fakePireon()'s token stub, which
// would otherwise accept every password.
Http::fake(["{$this->pireonServer}/oauth/token" => fn ($request) => $request['username'] === 'ada@example.com'
? Http::response(['access_token' => 'fake-access-token', 'token_type' => 'Bearer', 'expires_in' => 3600])
: Http::response(['error' => 'invalid_grant'], 400)]);
$this->fakePireon();
foreach (range(1, 6) as $attempt) {
$this->postJson('/api/v1/auth/token', [
'grant_type' => 'password',
'username' => 'mallory@example.com',
'password' => "guess-{$attempt}",
])->assertStatus(422);
}
$this->postJson('/api/v1/auth/token', [
'grant_type' => 'password',
'username' => 'MALLORY@example.com',
'password' => 'guess-7',
])->assertTooManyRequests();
$this->postJson('/api/v1/auth/token', [
'grant_type' => 'password',
'username' => 'ada@example.com',
'password' => 'secret',
])->assertOk();
}
#[Test] #[Test]
public function repeated_calls_with_the_same_token_hit_the_identity_server_once(): void public function repeated_calls_with_the_same_token_hit_the_identity_server_once(): void
{ {