forked from GNUsocial/gnu-social
[CONTROLLER][Security] Refactor and make clearer errors with duplicate nicknames and emails. Return notes as a callable, since they're not used in the default template, in the login and register pages
This commit is contained in:
parent
bff65afe5d
commit
176d604abb
@ -6,6 +6,7 @@ use App\Core\Controller;
|
|||||||
use App\Core\DB\DB;
|
use App\Core\DB\DB;
|
||||||
use App\Core\Form;
|
use App\Core\Form;
|
||||||
use function App\Core\I18n\_m;
|
use function App\Core\I18n\_m;
|
||||||
|
use App\Core\Log;
|
||||||
use App\Core\VisibilityScope;
|
use App\Core\VisibilityScope;
|
||||||
use App\Entity\Follow;
|
use App\Entity\Follow;
|
||||||
use App\Entity\GSActor;
|
use App\Entity\GSActor;
|
||||||
@ -14,7 +15,9 @@ use App\Entity\Note;
|
|||||||
use App\Security\Authenticator;
|
use App\Security\Authenticator;
|
||||||
use App\Security\EmailVerifier;
|
use App\Security\EmailVerifier;
|
||||||
use app\Util\Common;
|
use app\Util\Common;
|
||||||
|
use App\Util\Exception\EmailTakenException;
|
||||||
use App\Util\Exception\NicknameTakenException;
|
use App\Util\Exception\NicknameTakenException;
|
||||||
|
use App\Util\Exception\ServerException;
|
||||||
use App\Util\Nickname;
|
use App\Util\Nickname;
|
||||||
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\EmailType;
|
use Symfony\Component\Form\Extension\Core\Type\EmailType;
|
||||||
@ -41,11 +44,19 @@ class Security extends Controller
|
|||||||
// get the login error if there is one
|
// get the login error if there is one
|
||||||
$error = $authenticationUtils->getLastAuthenticationError();
|
$error = $authenticationUtils->getLastAuthenticationError();
|
||||||
// last username entered by the user
|
// last username entered by the user
|
||||||
$last_username = $authenticationUtils->getLastUsername();
|
$last_login_id = $authenticationUtils->getLastUsername();
|
||||||
|
|
||||||
return ['_template' => 'security/login.html.twig', 'last_username' => $last_username, 'error' => $error, 'notes' => Note::getAllNotes(VisibilityScope::$instance_scope)];
|
return [
|
||||||
|
'_template' => 'security/login.html.twig',
|
||||||
|
'last_login_id' => $last_login_id,
|
||||||
|
'error' => $error,
|
||||||
|
'notes_fn' => fn () => Note::getAllNotes(VisibilityScope::$instance_scope),
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @codeCoverageIgnore
|
||||||
|
*/
|
||||||
public function logout()
|
public function logout()
|
||||||
{
|
{
|
||||||
throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
|
throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
|
||||||
@ -74,7 +85,7 @@ class Security extends Controller
|
|||||||
]],
|
]],
|
||||||
['email', EmailType::class, [
|
['email', EmailType::class, [
|
||||||
'label' => _m('Email'),
|
'label' => _m('Email'),
|
||||||
'constraints' => [ new NotBlank(['message' => _m('Please enter an email') ])]
|
'constraints' => [ new NotBlank(['message' => _m('Please enter an email') ])],
|
||||||
]],
|
]],
|
||||||
['password', PasswordType::class, [
|
['password', PasswordType::class, [
|
||||||
'label' => _m('Password'),
|
'label' => _m('Password'),
|
||||||
@ -94,12 +105,24 @@ class Security extends Controller
|
|||||||
$data = $form->getData();
|
$data = $form->getData();
|
||||||
$data['password'] = $form->get('password')->getData();
|
$data['password'] = $form->get('password')->getData();
|
||||||
|
|
||||||
$valid_nickname = Nickname::normalize($data['nickname'], check_already_used: true);
|
// This will throw the appropriate errors, result ignored
|
||||||
|
$user = LocalUser::findByNicknameOrEmail($data['nickname'], $data['email']);
|
||||||
|
if ($user !== null) {
|
||||||
|
// If we do find something, there's a duplicate
|
||||||
|
if ($user->getNickname() == $data['nickname']) {
|
||||||
|
throw new NicknameTakenException;
|
||||||
|
} else {
|
||||||
|
throw new EmailTakenException;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$valid_nickname = Nickname::validate($data['nickname'], check_already_used: false);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$actor = GSActor::create(['nickname' => $data['nickname'], 'normalized_nickname' => Nickname::normalize($data['nickname'], check_already_used: true)]);
|
// This already checks if the nickname is being used
|
||||||
|
$actor = GSActor::create(['nickname' => $valid_nickname]);
|
||||||
$user = LocalUser::create([
|
$user = LocalUser::create([
|
||||||
'nickname' => $data['nickname'],
|
'nickname' => $valid_nickname,
|
||||||
'outgoing_email' => $data['email'],
|
'outgoing_email' => $data['email'],
|
||||||
'incoming_email' => $data['email'],
|
'incoming_email' => $data['email'],
|
||||||
'password' => LocalUser::hashPassword($data['password']),
|
'password' => LocalUser::hashPassword($data['password']),
|
||||||
@ -112,7 +135,10 @@ class Security extends Controller
|
|||||||
);
|
);
|
||||||
DB::flush();
|
DB::flush();
|
||||||
} catch (UniqueConstraintViolationException $e) {
|
} catch (UniqueConstraintViolationException $e) {
|
||||||
throw new NicknameTakenException;
|
// _something_ was duplicated, but since we already check if nickname is in use, we can't tell what went wrong
|
||||||
|
$e = 'An error occurred while trying to register';
|
||||||
|
Log::critical($e . " with nickname: '{$valid_nickname}' and email '{$data['email']}'");
|
||||||
|
throw new ServerException(_m($e));
|
||||||
}
|
}
|
||||||
|
|
||||||
// generate a signed url and email it to the user
|
// generate a signed url and email it to the user
|
||||||
@ -141,7 +167,7 @@ class Security extends Controller
|
|||||||
return [
|
return [
|
||||||
'_template' => 'security/register.html.twig',
|
'_template' => 'security/register.html.twig',
|
||||||
'registration_form' => $form->createView(),
|
'registration_form' => $form->createView(),
|
||||||
'notes' => Note::getAllNotes(VisibilityScope::$instance_scope),
|
'notes_fn' => fn () => Note::getAllNotes(VisibilityScope::$instance_scope),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user