Skip to content

fix(frontpage): Don't bruteforce protect "undefined" #12029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Apr 10, 2024
Merged

fix(frontpage): Don't bruteforce protect "undefined" #12029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,11 @@ protected function pageHandler(string $token = '', string $callUser = '', string
}
} catch (RoomNotFoundException $e) {
// Room not found, redirect to main page
$throttle = $token !== 'undefined';
if ($token === 'undefined') {
$this->logger->debug('User "' . ($this->userId ?? 'ANONYMOUS') . '" tried to access "undefined"', ['app' => 'spreed-bfp']);
}
$token = '';
$throttle = true;
}

if ($room instanceof Room && $room->hasPassword()) {
Expand Down Expand Up @@ -361,7 +364,13 @@ protected function guestEnterRoom(string $token, string $password): Response {
$response = new RedirectResponse($this->url->linkToRoute('core.login.showLoginForm', [
'redirect_url' => $redirectUrl,
]));
$response->throttle(['token' => $token, 'action' => 'talkRoomToken']);
if ($token !== 'undefined') {
// Logged-in user tried to access a chat they can not access
$this->logger->debug('User "' . ($this->userId ?? 'ANONYMOUS') . '" throttled for accessing "' . $token . '"', ['app' => 'spreed-bfp']);
$response->throttle(['token' => $token, 'action' => 'talkRoomToken']);
} else {
$this->logger->debug('User "' . ($this->userId ?? 'ANONYMOUS') . '" tried to access "undefined"', ['app' => 'spreed-bfp']);
}
return $response;
}

Expand Down
6 changes: 6 additions & 0 deletions tests/integration/features/conversation-1/bruteforce-protection.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ Feature: conversation/bruteforce-protection
When user "participant2" views call-URL of room "invalid" with 200
When user "participant2" views call-URL of room "invalid" with 200
When user "participant2" views call-URL of room "invalid" with 200
When user "participant2" views call-URL of room "undefined" with 200
When user "participant2" views call-URL of room "undefined" with 200
When user "participant2" views call-URL of room "undefined" with 200
When user "participant2" views call-URL of room "undefined" with 200
When user "participant2" views call-URL of room "undefined" with 200
When user "participant2" views call-URL of room "undefined" with 200
When user "participant2" views call-URL of room "invalid" with 200
When user "participant2" views call-URL of room "invalid" with 200
When user "participant2" views call-URL of room "invalid" with 200
Expand Down