chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update config() to config_cache()

This commit is contained in:
Daniel Supernault 2021-05-10 23:23:09 -06:00
parent c0e693cc73
commit 27b722e7a7
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
5 changed files with 158 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -967,7 +967,7 @@ class ApiV1Controller extends Controller
'short_description' => 'Pixelfed - Photo sharing for everyone', 'short_description' => 'Pixelfed - Photo sharing for everyone',
'languages' => ['en'], 'languages' => ['en'],
'max_toot_chars' => (int) config('pixelfed.max_caption_length'), 'max_toot_chars' => (int) config('pixelfed.max_caption_length'),
'registrations' => config('pixelfed.open_registration'), 'registrations' => config_cache('pixelfed.open_registration'),
'stats' => [ 'stats' => [
'user_count' => 0, 'user_count' => 0,
'status_count' => 0, 'status_count' => 0,

308
app/Http/Controllers/Auth/RegisterController.php
View File

@ -14,183 +14,183 @@ use App\Services\EmailService;
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 = '/'; protected $redirectTo = '/';
/** /**
* 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');
} }
/** /**
* Get a validator for an incoming registration request. * Get a validator for an incoming registration request.
* *
* @param array $data * @param array $data
* *
* @return \Illuminate\Contracts\Validation\Validator * @return \Illuminate\Contracts\Validation\Validator
*/ */
protected function validator(array $data) protected 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_alpha($value[0])) { if (!ctype_alpha($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(); $restricted = RestrictedNames::get();
if (in_array(strtolower($value), array_map('strtolower', $restricted))) { if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
return $fail('Username cannot be used.'); return $fail('Username cannot be used.');
} }
}, },
]; ];
$emailRules = [ $emailRules = [
'required', 'required',
'string', 'string',
'email', 'email',
'max:255', 'max:255',
'unique:users', 'unique:users',
function ($attribute, $value, $fail) { function ($attribute, $value, $fail) {
$banned = EmailService::isBanned($value); $banned = EmailService::isBanned($value);
if($banned) { if($banned) {
return $fail('Email is invalid.'); return $fail('Email is invalid.');
} }
}, },
]; ];
$rules = [ $rules = [
'agecheck' => 'required|accepted', 'agecheck' => 'required|accepted',
'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'), 'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'),
'username' => $usernameRules, 'username' => $usernameRules,
'email' => $emailRules, 'email' => $emailRules,
'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed', 'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
]; ];
if(config('captcha.enabled')) { if(config('captcha.enabled')) {
$rules['h-captcha-response'] = 'required|captcha'; $rules['h-captcha-response'] = 'required|captcha';
} }
return Validator::make($data, $rules); return Validator::make($data, $rules);
} }
/** /**
* Create a new user instance after a valid registration. * Create a new user instance after a valid registration.
* *
* @param array $data * @param array $data
* *
* @return \App\User * @return \App\User
*/ */
protected function create(array $data) protected function create(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']);
} }
return User::create([ return User::create([
'name' => $data['name'], 'name' => $data['name'],
'username' => $data['username'], 'username' => $data['username'],
'email' => $data['email'], 'email' => $data['email'],
'password' => Hash::make($data['password']), 'password' => Hash::make($data['password']),
]); ]);
} }
/** /**
* Show the application registration form. * Show the application registration form.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function showRegistrationForm() public function showRegistrationForm()
{ {
if(config('pixelfed.open_registration')) { if(config_cache('pixelfed.open_registration')) {
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
if($limit) { if($limit) {
abort_if($limit <= User::count(), 404); abort_if($limit <= User::count(), 404);
return view('auth.register'); return view('auth.register');
} else { } else {
return view('auth.register'); return view('auth.register');
} }
} else { } else {
abort(404); abort(404);
} }
} }
/** /**
* Handle a registration request for the application. * Handle a registration request for the application.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function register(Request $request) public function register(Request $request)
{ {
abort_if(config('pixelfed.open_registration') == false, 400); abort_if(config_cache('pixelfed.open_registration') == false, 400);
$count = User::count(); $count = User::count();
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
if(false == config('pixelfed.open_registration') || $limit && $limit <= $count) { if(false == config_cache('pixelfed.open_registration') || $limit && $limit <= $count) {
return abort(403); return abort(403);
} }
$this->validator($request->all())->validate(); $this->validator($request->all())->validate();
event(new Registered($user = $this->create($request->all()))); event(new Registered($user = $this->create($request->all())));
$this->guard()->login($user); $this->guard()->login($user);
return $this->registered($request, $user) return $this->registered($request, $user)
?: redirect($this->redirectPath()); ?: redirect($this->redirectPath());
} }
} }

2
app/Util/Site/Config.php
View File

@ -10,7 +10,7 @@ class Config {
public static function get() { public static function get() {
return Cache::remember('api:site:configuration:_v0.2', now()->addMinutes(5), function() { return Cache::remember('api:site:configuration:_v0.2', now()->addMinutes(5), function() {
return [ return [
'open_registration' => config('pixelfed.open_registration'), 'open_registration' => (bool) config_cache('pixelfed.open_registration'),
'uploader' => [ 'uploader' => [
'max_photo_size' => config('pixelfed.max_photo_size'), 'max_photo_size' => config('pixelfed.max_photo_size'),
'max_caption_length' => config('pixelfed.max_caption_length'), 'max_caption_length' => config('pixelfed.max_caption_length'),

2
app/Util/Site/Nodeinfo.php
View File

@ -70,7 +70,7 @@ class Nodeinfo {
'version' => '2.0', 'version' => '2.0',
]; ];
}); });
$res['openRegistrations'] = config('pixelfed.open_registration'); $res['openRegistrations'] = (bool) config_cache('pixelfed.open_registration');
return $res; return $res;
} }

2
resources/views/layouts/partial/nav.blade.php
View File

@ -22,7 +22,7 @@
{{ __('Login') }} {{ __('Login') }}
</a> </a>
</li> </li>
@if(config('pixelfed.open_registration') && config('instance.restricted.enabled') == false) @if(config_cache('pixelfed.open_registration') && config('instance.restricted.enabled') == false)
<li> <li>
<a class="ml-3 nav-link font-weight-bold text-dark" href="{{ route('register') }}" title="Register"> <a class="ml-3 nav-link font-weight-bold text-dark" href="{{ route('register') }}" title="Register">
{{ __('Register') }} {{ __('Register') }}