mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-18 04:21:27 +00:00
Merge pull request #5214 from pixelfed/staging
Update RegisterController, update username constraints, require atlea…
This commit is contained in:
daniel
GitHub
commit
a342a6a981
1 changed files with 198 additions and 193 deletions
|
|
@ -3,234 +3,239 @@
|
||||||
namespace App\Http\Controllers\Auth;
|
namespace App\Http\Controllers\Auth;
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Services\BouncerService;
|
||||||
|
use App\Services\EmailService;
|
||||||
use App\User;
|
use App\User;
|
||||||
use Purify;
|
|
||||||
use App\Util\Lexer\RestrictedNames;
|
use App\Util\Lexer\RestrictedNames;
|
||||||
|
use Illuminate\Auth\Events\Registered;
|
||||||
use Illuminate\Foundation\Auth\RegistersUsers;
|
use Illuminate\Foundation\Auth\RegistersUsers;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Illuminate\Auth\Events\Registered;
|
use Purify;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use App\Services\EmailService;
|
|
||||||
use App\Services\BouncerService;
|
|
||||||
|
|
||||||
class RegisterController extends Controller
|
class RegisterController extends Controller
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Register Controller
|
| Register Controller
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This controller handles the registration of new users as well as their
|
| This controller handles the registration of new users as well as their
|
||||||
| validation and creation. By default this controller uses a trait to
|
| validation and creation. By default this controller uses a trait to
|
||||||
| provide this functionality without requiring any additional code.
|
| provide this functionality without requiring any additional code.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use RegistersUsers;
|
use RegistersUsers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Where to redirect users after registration.
|
* Where to redirect users after registration.
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
protected $redirectTo = '/i/web';
|
protected $redirectTo = '/i/web';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new controller instance.
|
* Create a new controller instance.
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->middleware('guest');
|
$this->middleware('guest');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getRegisterToken()
|
public function getRegisterToken()
|
||||||
{
|
{
|
||||||
return \Cache::remember('pf:register:rt', 900, function() {
|
return \Cache::remember('pf:register:rt', 900, function () {
|
||||||
return str_random(40);
|
return str_random(40);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a validator for an incoming registration request.
|
* Get a validator for an incoming registration request.
|
||||||
*
|
*
|
||||||
* @param array $data
|
*
|
||||||
*
|
* @return \Illuminate\Contracts\Validation\Validator
|
||||||
* @return \Illuminate\Contracts\Validation\Validator
|
*/
|
||||||
*/
|
public function validator(array $data)
|
||||||
public function validator(array $data)
|
{
|
||||||
{
|
if (config('database.default') == 'pgsql') {
|
||||||
if(config('database.default') == 'pgsql') {
|
$data['username'] = strtolower($data['username']);
|
||||||
$data['username'] = strtolower($data['username']);
|
$data['email'] = strtolower($data['email']);
|
||||||
$data['email'] = strtolower($data['email']);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$usernameRules = [
|
$usernameRules = [
|
||||||
'required',
|
'required',
|
||||||
'min:2',
|
'min:2',
|
||||||
'max:15',
|
'max:15',
|
||||||
'unique:users',
|
'unique:users',
|
||||||
function ($attribute, $value, $fail) {
|
function ($attribute, $value, $fail) {
|
||||||
$dash = substr_count($value, '-');
|
$dash = substr_count($value, '-');
|
||||||
$underscore = substr_count($value, '_');
|
$underscore = substr_count($value, '_');
|
||||||
$period = substr_count($value, '.');
|
$period = substr_count($value, '.');
|
||||||
|
|
||||||
if(ends_with($value, ['.php', '.js', '.css'])) {
|
if (ends_with($value, ['.php', '.js', '.css'])) {
|
||||||
return $fail('Username is invalid.');
|
return $fail('Username is invalid.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if(($dash + $underscore + $period) > 1) {
|
if (($dash + $underscore + $period) > 1) {
|
||||||
return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
|
return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ctype_alnum($value[0])) {
|
if (! ctype_alnum($value[0])) {
|
||||||
return $fail('Username is invalid. Must start with a letter or number.');
|
return $fail('Username is invalid. Must start with a letter or number.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ctype_alnum($value[strlen($value) - 1])) {
|
if (! ctype_alnum($value[strlen($value) - 1])) {
|
||||||
return $fail('Username is invalid. Must end with a letter or number.');
|
return $fail('Username is invalid. Must end with a letter or number.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$val = str_replace(['_', '.', '-'], '', $value);
|
$val = str_replace(['_', '.', '-'], '', $value);
|
||||||
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 (! preg_match('/[a-zA-Z]/', $value)) {
|
||||||
if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
|
return $fail('Username is invalid. Must contain at least one alphabetical character.');
|
||||||
return $fail('Username cannot be used.');
|
}
|
||||||
}
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
$emailRules = [
|
$restricted = RestrictedNames::get();
|
||||||
'required',
|
if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
|
||||||
'string',
|
return $fail('Username cannot be used.');
|
||||||
'email',
|
}
|
||||||
'max:255',
|
},
|
||||||
'unique:users',
|
];
|
||||||
function ($attribute, $value, $fail) {
|
|
||||||
$banned = EmailService::isBanned($value);
|
|
||||||
if($banned) {
|
|
||||||
return $fail('Email is invalid.');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
$rt = [
|
$emailRules = [
|
||||||
'required',
|
'required',
|
||||||
function ($attribute, $value, $fail) {
|
'string',
|
||||||
if($value !== $this->getRegisterToken()) {
|
'email',
|
||||||
return $fail('Something went wrong');
|
'max:255',
|
||||||
}
|
'unique:users',
|
||||||
}
|
function ($attribute, $value, $fail) {
|
||||||
];
|
$banned = EmailService::isBanned($value);
|
||||||
|
if ($banned) {
|
||||||
|
return $fail('Email is invalid.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
$rules = [
|
$rt = [
|
||||||
'agecheck' => 'required|accepted',
|
'required',
|
||||||
'rt' => $rt,
|
function ($attribute, $value, $fail) {
|
||||||
'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'),
|
if ($value !== $this->getRegisterToken()) {
|
||||||
'username' => $usernameRules,
|
return $fail('Something went wrong');
|
||||||
'email' => $emailRules,
|
}
|
||||||
'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
if((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {
|
$rules = [
|
||||||
$rules['h-captcha-response'] = 'required|captcha';
|
'agecheck' => 'required|accepted',
|
||||||
}
|
'rt' => $rt,
|
||||||
|
'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'),
|
||||||
|
'username' => $usernameRules,
|
||||||
|
'email' => $emailRules,
|
||||||
|
'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
|
||||||
|
];
|
||||||
|
|
||||||
return Validator::make($data, $rules);
|
if ((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {
|
||||||
}
|
$rules['h-captcha-response'] = 'required|captcha';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
return Validator::make($data, $rules);
|
||||||
* Create a new user instance after a valid registration.
|
}
|
||||||
*
|
|
||||||
* @param array $data
|
|
||||||
*
|
|
||||||
* @return \App\User
|
|
||||||
*/
|
|
||||||
public function create(array $data)
|
|
||||||
{
|
|
||||||
if(config('database.default') == 'pgsql') {
|
|
||||||
$data['username'] = strtolower($data['username']);
|
|
||||||
$data['email'] = strtolower($data['email']);
|
|
||||||
}
|
|
||||||
|
|
||||||
return User::create([
|
/**
|
||||||
'name' => Purify::clean($data['name']),
|
* Create a new user instance after a valid registration.
|
||||||
'username' => $data['username'],
|
*
|
||||||
'email' => $data['email'],
|
*
|
||||||
'password' => Hash::make($data['password']),
|
* @return \App\User
|
||||||
'app_register_ip' => request()->ip()
|
*/
|
||||||
]);
|
public function create(array $data)
|
||||||
}
|
{
|
||||||
|
if (config('database.default') == 'pgsql') {
|
||||||
|
$data['username'] = strtolower($data['username']);
|
||||||
|
$data['email'] = strtolower($data['email']);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
return User::create([
|
||||||
* Show the application registration form.
|
'name' => Purify::clean($data['name']),
|
||||||
*
|
'username' => $data['username'],
|
||||||
* @return \Illuminate\Http\Response
|
'email' => $data['email'],
|
||||||
*/
|
'password' => Hash::make($data['password']),
|
||||||
public function showRegistrationForm()
|
'app_register_ip' => request()->ip(),
|
||||||
{
|
]);
|
||||||
if((bool) config_cache('pixelfed.open_registration')) {
|
}
|
||||||
if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
|
|
||||||
abort_if(BouncerService::checkIp(request()->ip()), 404);
|
|
||||||
}
|
|
||||||
$hasLimit = config('pixelfed.enforce_max_users');
|
|
||||||
if($hasLimit) {
|
|
||||||
$limit = config('pixelfed.max_users');
|
|
||||||
$count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
|
|
||||||
if($limit <= $count) {
|
|
||||||
return redirect(route('help.instance-max-users-limit'));
|
|
||||||
}
|
|
||||||
abort_if($limit <= $count, 404);
|
|
||||||
return view('auth.register');
|
|
||||||
} else {
|
|
||||||
return view('auth.register');
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if((bool) config_cache('instance.curated_registration.enabled') && config('instance.curated_registration.state.fallback_on_closed_reg')) {
|
|
||||||
return redirect('/auth/sign_up');
|
|
||||||
} else {
|
|
||||||
abort(404);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle a registration request for the application.
|
* Show the application registration form.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @return \Illuminate\Http\Response
|
||||||
* @return \Illuminate\Http\Response
|
*/
|
||||||
*/
|
public function showRegistrationForm()
|
||||||
public function register(Request $request)
|
{
|
||||||
{
|
if ((bool) config_cache('pixelfed.open_registration')) {
|
||||||
abort_if(config_cache('pixelfed.open_registration') == false, 400);
|
if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
|
||||||
|
abort_if(BouncerService::checkIp(request()->ip()), 404);
|
||||||
|
}
|
||||||
|
$hasLimit = config('pixelfed.enforce_max_users');
|
||||||
|
if ($hasLimit) {
|
||||||
|
$limit = config('pixelfed.max_users');
|
||||||
|
$count = User::where(function ($q) {
|
||||||
|
return $q->whereNull('status')->orWhereNotIn('status', ['deleted', 'delete']);
|
||||||
|
})->count();
|
||||||
|
if ($limit <= $count) {
|
||||||
|
return redirect(route('help.instance-max-users-limit'));
|
||||||
|
}
|
||||||
|
abort_if($limit <= $count, 404);
|
||||||
|
|
||||||
if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
|
return view('auth.register');
|
||||||
abort_if(BouncerService::checkIp($request->ip()), 404);
|
} else {
|
||||||
}
|
return view('auth.register');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if ((bool) config_cache('instance.curated_registration.enabled') && config('instance.curated_registration.state.fallback_on_closed_reg')) {
|
||||||
|
return redirect('/auth/sign_up');
|
||||||
|
} else {
|
||||||
|
abort(404);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$hasLimit = config('pixelfed.enforce_max_users');
|
/**
|
||||||
if($hasLimit) {
|
* Handle a registration request for the application.
|
||||||
$count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
|
*
|
||||||
$limit = config('pixelfed.max_users');
|
* @return \Illuminate\Http\Response
|
||||||
|
*/
|
||||||
|
public function register(Request $request)
|
||||||
|
{
|
||||||
|
abort_if(config_cache('pixelfed.open_registration') == false, 400);
|
||||||
|
|
||||||
if($limit && $limit <= $count) {
|
if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
|
||||||
return redirect(route('help.instance-max-users-limit'));
|
abort_if(BouncerService::checkIp($request->ip()), 404);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
$hasLimit = config('pixelfed.enforce_max_users');
|
||||||
|
if ($hasLimit) {
|
||||||
|
$count = User::where(function ($q) {
|
||||||
|
return $q->whereNull('status')->orWhereNotIn('status', ['deleted', 'delete']);
|
||||||
|
})->count();
|
||||||
|
$limit = config('pixelfed.max_users');
|
||||||
|
|
||||||
$this->validator($request->all())->validate();
|
if ($limit && $limit <= $count) {
|
||||||
|
return redirect(route('help.instance-max-users-limit'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
event(new Registered($user = $this->create($request->all())));
|
$this->validator($request->all())->validate();
|
||||||
|
|
||||||
$this->guard()->login($user);
|
event(new Registered($user = $this->create($request->all())));
|
||||||
|
|
||||||
return $this->registered($request, $user)
|
$this->guard()->login($user);
|
||||||
?: redirect($this->redirectPath());
|
|
||||||
}
|
return $this->registered($request, $user)
|
||||||
|
?: redirect($this->redirectPath());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue