UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-06 11:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve username validation error for restricted names

Browse source
This commit is contained in:
dx7 2020-07-08 23:24:36 -03:00 committed by dx7
parent 4762efe8ee
commit 693f530326
No known key found for this signature in database
GPG key ID: 3E85E7873311DF48
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/Auth/RegisterController.php
View file

@ -58,7 +58,6 @@ class RegisterController extends Controller
$data['email'] = strtolower($data['email']); $data['email'] = strtolower($data['email']);
} }
$this->validateUsername($data['username']);
$this->validateEmail($data['email']); $this->validateEmail($data['email']);
$usernameRules = [ $usernameRules = [
@ -87,6 +86,11 @@ class RegisterController extends Controller
if(!ctype_alnum($val)) { if(!ctype_alnum($val)) {
return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).'); return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).');
} }
$restricted = RestrictedNames::get();
if (in_array($value, $restricted)) {
return $fail('Username cannot be used.');
}
}, },
]; ];
@ -123,15 +127,6 @@ class RegisterController extends Controller
]); ]);
} }
public function validateUsername($username)
{
$restricted = RestrictedNames::get();
if (in_array($username, $restricted)) {
return abort(403);
}
}
public function validateEmail($email) public function validateEmail($email)
{ {
$banned = EmailService::isBanned($email); $banned = EmailService::isBanned($email);