Skip to content

Don't break when the IP is empty #22774

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
MorrisJobke merged 1 commit into from
Sep 10, 2020
Merged

Don't break when the IP is empty #22774

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
4 changes: 4 additions & 0 deletions lib/private/Security/Bruteforce/Throttler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,10 @@ private function isIPWhitelisted(string $ip): bool {
* @return int
*/
public function getAttempts(string $ip, string $action = '', float $maxAgeHours = 12): int {
if ($ip === '') {
return 0;
}

$ipAddress = new IpAddress($ip);
if ($this->isIPWhitelisted((string)$ipAddress)) {
return 0;
Expand Down
24 changes: 22 additions & 2 deletions tests/lib/Security/Bruteforce/CapabilitiesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ protected function setUp(): void {
parent::setUp();

$this->request = $this->createMock(IRequest::class);
$this->request->method('getRemoteAddress')
->willReturn('10.10.10.10');

$this->throttler = $this->createMock(Throttler::class);

Expand All @@ -57,6 +55,9 @@ public function testGetCapabilities() {
->with('10.10.10.10')
->willReturn(42);

$this->request->method('getRemoteAddress')
->willReturn('10.10.10.10');

$expected = [
'bruteforce' => [
'delay' => 42
Expand All @@ -66,4 +67,23 @@ public function testGetCapabilities() {

$this->assertEquals($expected, $result);
}

public function testGetCapabilitiesOnCli() {
$this->throttler->expects($this->atLeastOnce())
->method('getDelay')
->with('')
->willReturn(0);

$this->request->method('getRemoteAddress')
->willReturn('');

$expected = [
'bruteforce' => [
'delay' => 0
]
];
$result = $this->capabilities->getCapabilities();

$this->assertEquals($expected, $result);
}
}