Skip to content

Fix the thorrtler whitelist bitmask #14149

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
rullzer merged 1 commit into from
Feb 12, 2019
Merged

Fix the thorrtler whitelist bitmask #14149

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
Fix the thorrtler whitelist bitmask 
Before we actually didn't check each bit of the bitmask. Now we do.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Feb 11, 2019
commit f1ea56b5024729e01050249a0c4ee7ac28faca83
6 changes: 4 additions & 2 deletions lib/private/Security/Bruteforce/Throttler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,10 @@ private function isIPWhitelisted($ip) {
$part = ord($addr[(int)($i/8)]);
$orig = ord($ip[(int)($i/8)]);

$part = $part & (15 << (1 - ($i % 2)));
$orig = $orig & (15 << (1 - ($i % 2)));
$bitmask = 1 << (7 - ($i % 8));

$part = $part & $bitmask;
$orig = $orig & $bitmask;
Copy link
Contributor

@kesselb kesselb Feb 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$part &= $bitmask; and $orig &= $bitmask; would also work but is hard to read.


if ($part !== $orig) {
$valid = false;
Expand Down
29 changes: 29 additions & 0 deletions tests/lib/Security/Bruteforce/ThrottlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,27 @@ public function dataIsIPWhitelisted() {
],
true,
],
[
'10.10.10.10',
[
'whitelist_0' => '10.10.10.11/31',
],
true,
],
[
'10.10.10.10',
[
'whitelist_0' => '10.10.10.9/31',
],
false,
],
[
'10.10.10.10',
[
'whitelist_0' => '10.10.10.15/29',
],
true,
],
[
'dead:beef:cafe::1',
[
Expand Down Expand Up @@ -127,6 +148,14 @@ public function dataIsIPWhitelisted() {
],
true,
],
[
'dead:beef:cafe::1111',
[
'whitelist_0' => 'dead:beef:cafe::1100/123',

],
true,
],
[
'invalid',
[],
Expand Down