Skip to content

[3.x] Replace removeSpecialCharacters method with Str Helper Equivalent #219

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
merged 2 commits into from
Feb 5, 2022
Merged

[3.x] Replace removeSpecialCharacters method with Str Helper Equivalent #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b26f571
Bump support requirment to include new String transliteration helper
Feb 5, 2022
97008a3
Replace removeSpecialCharacters method with Str transliteration method
Feb 5, 2022
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
84 changes: 1 addition & 83 deletions auth-backend/ThrottlesLogins.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected function fireLockoutEvent(Request $request)
*/
protected function throttleKey(Request $request)
{
return $this->removeSpecialCharacters(Str::lower($request->input($this->username())).'|'.$request->ip());
return Str::transliterate(Str::lower($request->input($this->username())).'|'.$request->ip());
}

/**
Expand Down Expand Up @@ -121,86 +121,4 @@ public function decayMinutes()
{
return property_exists($this, 'decayMinutes') ? $this->decayMinutes : 1;
}

/**
* Remove special characters that may allow users to bypass rate limiting.
*
* @param string $key
* @return string
*/
protected function removeSpecialCharacters($key)
{
$values = [
'ⓐ' => 'a',
'ⓑ' => 'b',
'ⓒ' => 'c',
'ⓓ' => 'd',
'ⓔ' => 'e',
'ⓕ' => 'f',
'ⓖ' => 'g',
'ⓗ' => 'h',
'ⓘ' => 'i',
'ⓙ' => 'j',
'ⓚ' => 'k',
'ⓛ' => 'l',
'ⓜ' => 'm',
'ⓝ' => 'n',
'ⓞ' => 'o',
'ⓟ' => 'p',
'ⓠ' => 'q',
'ⓡ' => 'r',
'ⓢ' => 's',
'ⓣ' => 't',
'ⓤ' => 'u',
'ⓥ' => 'v',
'ⓦ' => 'w',
'ⓧ' => 'x',
'ⓨ' => 'y',
'ⓩ' => 'z',
'①' => '1',
'②' => '2',
'③' => '3',
'④' => '4',
'⑤' => '5',
'⑥' => '6',
'⑦' => '7',
'⑧' => '8',
'⑨' => '9',
'⑩' => '10',
'⑪' => '11',
'⑫' => '12',
'⑬' => '13',
'⑭' => '14',
'⑮' => '15',
'⑯' => '16',
'⑰' => '17',
'⑱' => '18',
'⑲' => '19',
'⑳' => '20',
'⓪' => '0',
'⓵' => '1',
'⓶' => '2',
'⓷' => '3',
'⓸' => '4',
'⓹' => '5',
'⓺' => '6',
'⓻' => '7',
'⓼' => '8',
'⓽' => '9',
'⓾' => '10',
'⓫' => '11',
'⓬' => '12',
'⓭' => '13',
'⓮' => '14',
'⓯' => '15',
'⓰' => '16',
'⓱' => '17',
'⓲' => '18',
'⓳' => '19',
'⓴' => '20',
'⓿' => '0',
];

return strtr($key, $values);
}
}
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"php": "^7.3|^8.0",
"illuminate/console": "^8.42|^9.0",
"illuminate/filesystem": "^8.42|^9.0",
"illuminate/support": "^8.42|^9.0",
"illuminate/support": "^8.82|^9.0",
"illuminate/validation": "^8.42|^9.0"
},
"require-dev": {
Expand Down
26 changes: 0 additions & 26 deletions tests/AuthBackend/ThrottleLoginsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,6 @@

class ThrottleLoginsTest extends TestCase
{
/**
* @test
* @dataProvider specialCharacterProvider
*/
public function it_can_replace_special_characters(string $value, string $expected): void
{
$throttle = $this->getMockForTrait(ThrottlesLogins::class);
$reflection = new \ReflectionClass($throttle);
$method = $reflection->getMethod('removeSpecialCharacters');
$method->setAccessible(true);

$this->assertSame($expected, $method->invoke($throttle, $value));
}

public function specialCharacterProvider(): array
{
return [
['ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ', 'abcdefghijklmnopqrstuvwxyz'],
['⓪①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳', '01234567891011121314151617181920'],
['⓵⓶⓷⓸⓹⓺⓻⓼⓽⓾', '12345678910'],
['⓿⓫⓬⓭⓮⓯⓰⓱⓲⓳⓴', '011121314151617181920'],
['abcdefghijklmnopqrstuvwxyz', 'abcdefghijklmnopqrstuvwxyz'],
['0123456789', '0123456789'],
];
}

/**
* @test
* @dataProvider emailProvider
Expand Down