X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/34d5b979dc34fbbd89e3f321024a1a79718d0e6e..e76a1923e813fdf1fd24115ad0f976d2df58cc6f:/Controller/DefaultController.php diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php index 41009f8..de4ff4e 100644 --- a/Controller/DefaultController.php +++ b/Controller/DefaultController.php @@ -1,181 +1,216 @@ - + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Rapsys\UserBundle\Controller; -use Rapsys\UserBundle\Utils\Slugger; +use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Symfony\Bridge\Twig\Mime\TemplatedEmail; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Form\FormError; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Mailer\Exception\TransportExceptionInterface; -use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Address; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -use Symfony\Component\Routing\RouterInterface; -use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; -use Symfony\Component\Translation\TranslatorInterface; +/** + * {@inheritdoc} + */ class DefaultController extends AbstractController { - //Config array - protected $config; + /** + * Confirm account from mail link + * + * @param Request $request The request + * @param string $hash The hashed password + * @param string $mail The shorted mail address + * @return Response The response + */ + public function confirm(Request $request, string $hash, string $mail): Response { + //With invalid hash + if ($hash != $this->slugger->hash($mail)) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash])); + } + + //Get mail + $mail = $this->slugger->unshort($smail = $mail); + + //Without valid mail + if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) { + //Throw bad request + //XXX: prevent slugger reverse engineering by not displaying decoded mail + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'mail', '%value%' => $smail])); + } + + //Without existing registrant + if (!($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) { + //Add error message mail already exists + //XXX: prevent slugger reverse engineering by not displaying decoded mail + $this->addFlash('error', $this->translator->trans('Account %mail% do not exists', ['%mail%' => $smail])); + + //Redirect to register view + return $this->redirectToRoute($this->config['route']['register']['name'], ['mail' => $smail, 'field' => $sfield = $this->slugger->serialize([]), 'hash' => $this->slugger->hash($smail.$sfield)]+$this->config['route']['register']['context']); + } + + //Set active + $user->setActive(true); + + //Persist user + $this->manager->persist($user); - //Translator instance - protected $translator; + //Send to database + $this->manager->flush(); + + //Add error message mail already exists + $this->addFlash('notice', $this->translator->trans('Your account has been activated')); + + //Redirect to user view + return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']); + } /** - * Constructor + * Edit account by shorted mail * - * @param ContainerInterface $container The containter instance - * @param RouterInterface $router The router instance - * @param TranslatorInterface $translator The translator instance + * @param Request $request The request + * @param string $hash The hashed password + * @param string $mail The shorted mail address + * @return Response The response */ - public function __construct(ContainerInterface $container, RouterInterface $router, TranslatorInterface $translator) { - //Retrieve config - $this->config = $container->getParameter($this->getAlias()); - - //Set the translator - $this->translator = $translator; - - //Get current action - //XXX: we don't use this as it would be too slow, maybe ??? - #$action = str_replace(self::getAlias().'_', '', $container->get('request_stack')->getCurrentRequest()->get('_route')); - - //Set translate array - $translates = []; - - //Look for keys to translate - if (!empty($this->config['translate'])) { - //Iterate on keys to translate - foreach($this->config['translate'] as $translate) { - //Set tmp - $tmp = null; - //Iterate on keys - foreach(array_reverse(explode('.', $translate)) as $curkey) { - $tmp = array_combine([$curkey], [$tmp]); - } - //Append tree - $translates = array_replace_recursive($translates, $tmp); - } + public function edit(Request $request, string $hash, string $mail): Response { + //With invalid hash + if ($hash != $this->slugger->hash($mail)) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash])); } - //Inject every requested route in view and mail context - foreach($this->config as $tag => $current) { - //Look for entry with route subkey - if (!empty($current['route'])) { - //Generate url for both view and mail - foreach(['view', 'mail'] as $view) { - //Check that context key is usable - if (isset($current[$view]['context']) && is_array($current[$view]['context'])) { - //Process every routes - foreach($current['route'] as $route => $key) { - //Skip recover_mail route as it requires some parameters - if ($route == 'recover_mail') { - continue; - } + //Get mail + $mail = $this->slugger->unshort($smail = $mail); - //Set value - $value = $router->generate( - $this->config['route'][$route]['name'], - $this->config['route'][$route]['context'], - //Generate absolute url for mails - $view=='mail'?UrlGeneratorInterface::ABSOLUTE_URL:UrlGeneratorInterface::ABSOLUTE_PATH - ); + //With existing subscriber + if (empty($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) { + //Throw not found + //XXX: prevent slugger reverse engineering by not displaying decoded mail + throw $this->createNotFoundException($this->translator->trans('Unable to find account %mail%', ['%mail%' => $smail])); + } - //Multi level key - if (strpos($key, '.') !== false) { - //Set tmp - $tmp = $value; + //Prevent access when not admin, user is not guest and not currently logged user + if (!$this->isGranted('ROLE_ADMIN') && $user != $this->getUser() || !$this->isGranted('IS_AUTHENTICATED_FULLY')) { + //Throw access denied + //XXX: prevent slugger reverse engineering by not displaying decoded mail + throw $this->createAccessDeniedException($this->translator->trans('Unable to access user: %mail%', ['%mail%' => $smail])); + } - //Iterate on key - foreach(array_reverse(explode('.', $key)) as $curkey) { - $tmp = array_combine([$curkey], [$tmp]); - } + //Create the RegisterType form and give the proper parameters + $edit = $this->createForm($this->config['edit']['view']['edit'], $user, [ + //Set action to register route name and context + 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']), + //Set civility class + 'civility_class' => $this->config['class']['civility'], + //Set civility default + 'civility_default' => $this->doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']), + //Disable mail + 'mail' => $this->isGranted('ROLE_ADMIN'), + //Disable password + 'password' => false, + //Set method + 'method' => 'POST' + ]+$this->config['edit']['field']); + + //With admin role + if ($this->isGranted('ROLE_ADMIN')) { + //Create the LoginType form and give the proper parameters + $reset = $this->createForm($this->config['edit']['view']['reset'], $user, [ + //Set action to register route name and context + 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']), + //Disable mail + 'mail' => false, + //Set method + 'method' => 'POST' + ]); - //Set value - $this->config[$tag][$view]['context'] = array_replace_recursive($this->config[$tag][$view]['context'], $tmp); - //Single level key - } else { - //Set value - $this->config[$tag][$view]['context'][$key] = $value; - } - } + //With post method + if ($request->isMethod('POST')) { + //Refill the fields in case the form is not valid. + $reset->handleRequest($request); - //Look for successful intersections - if (!empty(array_intersect_key($translates, $current[$view]['context']))) { - //Iterate on keys to translate - foreach($this->config['translate'] as $translate) { - //Set keys - $keys = explode('.', $translate); + //With reset submitted and valid + if ($reset->isSubmitted() && $reset->isValid()) { + //Set data + $data = $reset->getData(); - //Set tmp - $tmp = $current[$view]['context']; + //Set password + $data->setPassword($this->hasher->hashPassword($data, $data->getPassword())); - //Iterate on keys - foreach($keys as $curkey) { - //Get child key - $tmp = $tmp[$curkey]; - } + //Queue snippet save + $this->manager->persist($data); - //Translate tmp value - $tmp = $translator->trans($tmp); + //Flush to get the ids + $this->manager->flush(); - //Iterate on keys - foreach(array_reverse($keys) as $curkey) { - //Set parent key - $tmp = array_combine([$curkey], [$tmp]); - } + //Add notice + $this->addFlash('notice', $this->translator->trans('Account %mail% password updated', ['%mail%' => $mail = $data->getMail()])); - //Set value - $this->config[$tag][$view]['context'] = array_replace_recursive($this->config[$tag][$view]['context'], $tmp); - } - } + //Redirect to cleanup the form + return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $this->slugger->short($mail), 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']); + } + } - //Get current locale - $currentLocale = $router->getContext()->getParameters()['_locale']; + //Add reset view + $this->config['edit']['view']['context']['reset'] = $reset->createView(); + } - //Iterate on locales excluding current one - foreach($this->config['locales'] as $locale) { - //Set titles - $titles = []; + //With post method + if ($request->isMethod('POST')) { + //Refill the fields in case the form is not valid. + $edit->handleRequest($request); - //Iterate on other locales - foreach(array_diff($this->config['locales'], [$locale]) as $other) { - $titles[$other] = $translator->trans($this->config['languages'][$locale], [], null, $other); - } + //With edit submitted and valid + if ($edit->isSubmitted() && $edit->isValid()) { + //Set data + $data = $edit->getData(); - //Get context path - $path = $router->getContext()->getPathInfo(); - - //Retrieve route matching path - $route = $router->match($path); - - //Get route name - $name = $route['_route']; - - //Unset route name - unset($route['_route']); - - //With current locale - if ($locale == $currentLocale) { - //Set locale locales context - $this->config[$tag][$view]['context']['canonical'] = $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL); - } else { - //Set locale locales context - $this->config[$tag][$view]['context']['alternates'][] = [ - 'lang' => $locale, - 'absolute' => $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL), - 'relative' => $router->generate($name, ['_locale' => $locale]+$route), - 'title' => implode('/', $titles), - 'translated' => $translator->trans($this->config['languages'][$locale], [], null, $locale) - ]; - } - } - } + //Queue snippet save + $this->manager->persist($data); + + //Try saving in database + try { + //Flush to get the ids + $this->manager->flush(); + + //Add notice + $this->addFlash('notice', $this->translator->trans('Account %mail% updated', ['%mail%' => $mail = $data->getMail()])); + + //Redirect to cleanup the form + return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $this->slugger->short($mail), 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']); + //Catch double slug or mail + } catch (UniqueConstraintViolationException $e) { + //Add error message mail already exists + $this->addFlash('error', $this->translator->trans('Account %mail% already exists', ['%mail%' => $data->getMail()])); } } + //Without admin role + //XXX: prefer a reset on login to force user unspam action + } elseif (!$this->isGranted('ROLE_ADMIN')) { + //Add notice + $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure')); } + + //Render view + return $this->render( + //Template + $this->config['edit']['view']['name'], + //Context + ['edit' => $edit->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['edit']['view']['context'] + ); } /** @@ -183,21 +218,45 @@ class DefaultController extends AbstractController { * * @param Request $request The request * @param AuthenticationUtils $authenticationUtils The authentication utils + * @param ?string $hash The hashed password + * @param ?string $mail The shorted mail address * @return Response The response */ - public function login(Request $request, AuthenticationUtils $authenticationUtils) { + public function login(Request $request, AuthenticationUtils $authenticationUtils, ?string $hash, ?string $mail): Response { //Create the LoginType form and give the proper parameters $login = $this->createForm($this->config['login']['view']['form'], null, [ //Set action to login route name and context 'action' => $this->generateUrl($this->config['route']['login']['name'], $this->config['route']['login']['context']), + //Disable repeated password + 'password_repeated' => false, + //Set method 'method' => 'POST' ]); //Init context $context = []; + //With mail + if (!empty($mail) && !empty($hash)) { + //With invalid hash + if ($hash != $this->slugger->hash($mail)) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash])); + } + + //Get mail + $mail = $this->slugger->unshort($smail = $mail); + + //Without valid mail + if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'mail', '%value%' => $smail])); + } + + //Prefilled mail + $login->get('mail')->setData($mail); //Last username entered by the user - if ($lastUsername = $authenticationUtils->getLastUsername()) { + } elseif ($lastUsername = $authenticationUtils->getLastUsername()) { $login->get('mail')->setData($lastUsername); } @@ -209,10 +268,13 @@ class DefaultController extends AbstractController { //Add error message to mail field $login->get('mail')->addError(new FormError($error)); - //Create the RecoverType form and give the proper parameters + //Create the LoginType form and give the proper parameters $recover = $this->createForm($this->config['recover']['view']['form'], null, [ //Set action to recover route name and context 'action' => $this->generateUrl($this->config['route']['recover']['name'], $this->config['route']['recover']['context']), + //Without password + 'password' => false, + //Set method 'method' => 'POST' ]); @@ -225,6 +287,9 @@ class DefaultController extends AbstractController { //Add recover form to context $context['recover'] = $recover->createView(); + } else { + //Add notice + $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure')); } //Render view @@ -240,104 +305,197 @@ class DefaultController extends AbstractController { * Recover account * * @param Request $request The request - * @param Slugger $slugger The slugger - * @param MailerInterface $mailer The mailer + * @param ?string $hash The hashed password + * @param ?string $pass The shorted password + * @param ?string $mail The shorted mail address * @return Response The response */ - public function recover(Request $request, Slugger $slugger, MailerInterface $mailer) { - //Create the RecoverType form and give the proper parameters - $form = $this->createForm($this->config['recover']['view']['form'], null, array( + public function recover(Request $request, ?string $hash, ?string $pass, ?string $mail): Response { + //Without mail, pass and hash + if (empty($mail) && empty($pass) && empty($hash)) { + //Create the LoginType form and give the proper parameters + $form = $this->createForm($this->config['recover']['view']['form'], null, [ + //Set action to recover route name and context + 'action' => $this->generateUrl($this->config['route']['recover']['name'], $this->config['route']['recover']['context']), + //Without password + 'password' => false, + //Set method + 'method' => 'POST' + ]); + + //With post method + if ($request->isMethod('POST')) { + //Refill the fields in case the form is not valid. + $form->handleRequest($request); + + //With form submitted and valid + if ($form->isSubmitted() && $form->isValid()) { + //Set data + $data = $form->getData(); + + //Find user by data mail + if ($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($data['mail'])) { + //Set mail shortcut + $recoverMail =& $this->config['recover']['mail']; + + //Set mail + $mail = $this->slugger->short($user->getMail()); + + //Set pass + $pass = $this->slugger->hash($user->getPassword()); + + //Generate each route route + foreach($this->config['recover']['route'] as $route => $tag) { + //Only process defined routes + if (!empty($this->config['route'][$route])) { + //Process for recover mail url + if ($route == 'recover') { + //Set the url in context + $recoverMail['context'][$tag] = $this->router->generate( + $this->config['route'][$route]['name'], + //Prepend recover context with tag + [ + 'mail' => $mail, + 'pass' => $pass, + 'hash' => $this->slugger->hash($mail.$pass) + ]+$this->config['route'][$route]['context'], + UrlGeneratorInterface::ABSOLUTE_URL + ); + } + } + } + + //Set recipient_name + $recoverMail['context']['recipient_mail'] = $user->getMail(); + + //Set recipient_name + $recoverMail['context']['recipient_name'] = $user->getRecipientName(); + + //Init subject context + $subjectContext = $this->slugger->flatten(array_replace_recursive($this->config['recover']['view']['context'], $recoverMail['context']), null, '.', '%', '%'); + + //Translate subject + $recoverMail['subject'] = ucfirst($this->translator->trans($recoverMail['subject'], $subjectContext)); + + //Create message + $message = (new TemplatedEmail()) + //Set sender + ->from(new Address($this->config['contact']['mail'], $this->config['contact']['title'])) + //Set recipient + //XXX: remove the debug set in vendor/symfony/mime/Address.php +46 + ->to(new Address($recoverMail['context']['recipient_mail'], $recoverMail['context']['recipient_name'])) + //Set subject + ->subject($recoverMail['subject']) + + //Set path to twig templates + ->htmlTemplate($recoverMail['html']) + ->textTemplate($recoverMail['text']) + + //Set context + //XXX: require recursive merge to avoid loosing subkeys + //['subject' => $recoverMail['subject']]+$recoverMail['context']+$this->config['recover']['view']['context'] + ->context(array_replace_recursive($this->config['recover']['view']['context'], $recoverMail['context'], ['subject' => $recoverMail['subject']])); + + //Try sending message + //XXX: mail delivery may silently fail + try { + //Send message + $this->mailer->send($message); + + //Redirect on the same route with sent=1 to cleanup form + return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params')); + //Catch obvious transport exception + } catch(TransportExceptionInterface $e) { + //Add error message mail unreachable + $form->get('mail')->addError(new FormError($this->translator->trans('Account found but unable to contact: %mail%', array('%mail%' => $data['mail'])))); + } + //Accout not found + } else { + //Add error message to mail field + $form->get('mail')->addError(new FormError($this->translator->trans('Unable to find account %mail%', ['%mail%' => $data['mail']]))); + } + } + } + + //Render view + return $this->render( + //Template + $this->config['recover']['view']['name'], + //Context + ['form' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['recover']['view']['context'] + ); + } + + //With invalid hash + if ($hash != $this->slugger->hash($mail.$pass)) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash])); + } + + //Get mail + $mail = $this->slugger->unshort($smail = $mail); + + //Without valid mail + if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) { + //Throw bad request + //XXX: prevent slugger reverse engineering by not displaying decoded mail + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'mail', '%value%' => $smail])); + } + + //With existing subscriber + if (empty($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) { + //Throw not found + //XXX: prevent slugger reverse engineering by not displaying decoded mail + throw $this->createNotFoundException($this->translator->trans('Unable to find account %mail%', ['%mail%' => $smail])); + } + + //With unmatched pass + if ($pass != $this->slugger->hash($user->getPassword())) { + //Throw not found + //XXX: prevent use of outdated recover link + throw $this->createNotFoundException($this->translator->trans('Outdated recover link')); + } + + //Create the LoginType form and give the proper parameters + $form = $this->createForm($this->config['recover']['view']['form'], $user, [ //Set action to recover route name and context - 'action' => $this->generateUrl($this->config['route']['recover']['name'], $this->config['route']['recover']['context']), + 'action' => $this->generateUrl($this->config['route']['recover']['name'], ['mail' => $smail, 'pass' => $pass, 'hash' => $hash]+$this->config['route']['recover']['context']), + //Without mail + 'mail' => false, + //Set method 'method' => 'POST' - )); + ]); + //With post method if ($request->isMethod('POST')) { //Refill the fields in case the form is not valid. $form->handleRequest($request); - if ($form->isValid()) { - //Get doctrine - $doctrine = $this->getDoctrine(); - + //With form submitted and valid + if ($form->isSubmitted() && $form->isValid()) { //Set data $data = $form->getData(); - //Try to find user - if ($user = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($data['mail'])) { - //Set mail shortcut - $mail =& $this->config['recover']['mail']; - - //Generate each route route - foreach($this->config['recover']['route'] as $route => $tag) { - //Only process defined routes - if (empty($mail['context'][$tag]) && !empty($this->config['route'][$route])) { - //Process for recover mail url - if ($route == 'recover_mail') { - //Set the url in context - $mail['context'][$tag] = $this->get('router')->generate( - $this->config['route'][$route]['name'], - //Prepend recover context with tag - [ - 'recipient' => $slugger->short($user->getMail()), - 'hash' => $slugger->hash($user->getPassword()) - ]+$this->config['route'][$route]['context'], - UrlGeneratorInterface::ABSOLUTE_URL - ); - } - } - } - - //Set recipient_name - $mail['context']['recipient_mail'] = $data['mail']; + //Set hashed password + $hashed = $this->hasher->hashPassword($user, $user->getPassword()); - //Set recipient_name - $mail['context']['recipient_name'] = trim($user->getForename().' '.$user->getSurname().($user->getPseudonym()?' ('.$user->getPseudonym().')':'')); + //Update pass + $pass = $this->slugger->hash($hashed); - //Init subject context - $subjectContext = $this->flatten(array_replace_recursive($this->config['recover']['view']['context'], $mail['context']), null, '.', '%', '%'); + //Set user password + $user->setPassword($hashed); - //Translate subject - $mail['subject'] = ucfirst($this->translator->trans($mail['subject'], $subjectContext)); - - //Create message - $message = (new TemplatedEmail()) - //Set sender - ->from(new Address($this->config['contact']['mail'], $this->config['contact']['name'])) - //Set recipient - //XXX: remove the debug set in vendor/symfony/mime/Address.php +46 - ->to(new Address($mail['context']['recipient_mail'], $mail['context']['recipient_name'])) - //Set subject - ->subject($mail['subject']) + //Persist user + $this->manager->persist($user); - //Set path to twig templates - ->htmlTemplate($mail['html']) - ->textTemplate($mail['text']) + //Send to database + $this->manager->flush(); - //Set context - //XXX: require recursive merge to avoid loosing subkeys - //['subject' => $mail['subject']]+$mail['context']+$this->config['recover']['view']['context'] - ->context(array_replace_recursive($this->config['recover']['view']['context'], $mail['context'], ['subject' => $mail['subject']])); + //Add notice + $this->addFlash('notice', $this->translator->trans('Account %mail% password updated', ['%mail%' => $mail])); - //Try sending message - //XXX: mail delivery may silently fail - try { - //Send message - $mailer->send($message); - - //Redirect on the same route with sent=1 to cleanup form - #return $this->redirectToRoute('rapsys_user_register', array('sent' => 1)); - return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params')); - //Catch obvious transport exception - } catch(TransportExceptionInterface $e) { - //Add error message mail unreachable - $form->get('mail')->addError(new FormError($this->translator->trans('Account found but unable to contact: %mail%', array('%mail%' => $data['mail'])))); - } - //Accout not found - } else { - //Add error message to mail field - $form->get('mail')->addError(new FormError($this->translator->trans('Unable to find account %mail%', ['%mail%' => $data['mail']]))); - } + //Redirect to user login + return $this->redirectToRoute($this->config['route']['login']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['login']['context']); } } @@ -351,282 +509,338 @@ class DefaultController extends AbstractController { } /** - * Recover account with mail link + * Register an account * * @param Request $request The request - * @param UserPasswordEncoderInterface $encoder The password encoder - * @param Slugger $slugger The slugger - * @param MailerInterface $mailer The mailer - * @param string $recipient The shorted recipient mail address - * @param string $hash The hashed password + * @param ?string $hash The hashed serialized field array + * @param ?string $field The serialized then shorted form field array + * @param ?string $mail The shorted mail address * @return Response The response */ - public function recoverMail(Request $request, UserPasswordEncoderInterface $encoder, Slugger $slugger, MailerInterface $mailer, $recipient, $hash) { - //Create the RecoverType form and give the proper parameters - $form = $this->createForm($this->config['recover_mail']['view']['form'], null, array( - //Set action to recover route name and context - 'action' => $this->generateUrl($this->config['route']['recover_mail']['name'], ['recipient' => $recipient, 'hash' => $hash]+$this->config['route']['recover_mail']['context']), - 'method' => 'POST' - )); - - //Get doctrine - $doctrine = $this->getDoctrine(); - - //Init found - $found = false; - - //Retrieve user - if (($user = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($slugger->unshort($recipient))) && $found = ($hash == $slugger->hash($user->getPassword()))) { - if ($request->isMethod('POST')) { - //Refill the fields in case the form is not valid. - $form->handleRequest($request); - - if ($form->isValid()) { - //Set data - $data = $form->getData(); + public function register(Request $request, ?string $hash, ?string $field, ?string $mail): Response { + //With mail + if (!empty($_POST['register']['mail'])) { + //Log new user infos + $this->logger->emergency( + $this->translator->trans( + 'register: mail=%mail% locale=%locale% confirm=%confirm%', + [ + '%mail%' => $postMail = $_POST['register']['mail'], + '%locale%' => $request->getLocale(), + '%confirm%' => $this->router->generate( + $this->config['route']['confirm']['name'], + //Prepend subscribe context with tag + [ + 'mail' => $postSmail = $this->slugger->short($postMail), + 'hash' => $this->slugger->hash($postSmail) + ]+$this->config['route']['confirm']['context'], + UrlGeneratorInterface::ABSOLUTE_URL + ) + ] + ) + ); + } - //set encoded password - $encoded = $encoder->encodePassword($user, $data['password']); + //With mail and field + if (!empty($field) && !empty($hash)) { + //With invalid hash + if ($hash != $this->slugger->hash($mail.$field)) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash])); + } - //Set user password - $user->setPassword($encoded); + //With mail + if (!empty($mail)) { + //Get mail + $mail = $this->slugger->unshort($smail = $mail); - //Get manager - $manager = $doctrine->getManager(); + //Without valid mail + if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) { + //Throw bad request + //XXX: prevent slugger reverse engineering by not displaying decoded mail + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'mail', '%value%' => $smail])); + } - //Persist user - $manager->persist($user); + //With existing registrant + if ($existing = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail)) { + //With disabled existing + if ($existing->isDisabled()) { + //Render view + $response = $this->render( + //Template + $this->config['register']['view']['name'], + //Context + ['title' => $this->translator->trans('Access denied'), 'disabled' => 1]+$this->config['register']['view']['context'] + ); - //Send to database - $manager->flush(); - - //Set mail shortcut - $mail =& $this->config['recover_mail']['mail']; - - //Regen hash - $hash = $slugger->hash($encoded); - - //Generate each route route - foreach($this->config['recover_mail']['route'] as $route => $tag) { - //Only process defined routes - if (empty($mail['context'][$tag]) && !empty($this->config['route'][$route])) { - //Process for recover mail url - if ($route == 'recover_mail') { - //Prepend recover context with tag - $this->config['route'][$route]['context'] = [ - 'recipient' => $recipient, - 'hash' => $hash - ]+$this->config['route'][$route]['context']; + //Set 403 + $response->setStatusCode(403); + + //Return response + return $response; + //With unactivated existing + } elseif (!$existing->isActivated()) { + //Set mail shortcut + $activateMail =& $this->config['register']['mail']; + + //Generate each route route + foreach($this->config['register']['route'] as $route => $tag) { + //Only process defined routes + if (!empty($this->config['route'][$route])) { + //Process for confirm url + if ($route == 'confirm') { + //Set the url in context + $activateMail['context'][$tag] = $this->router->generate( + $this->config['route'][$route]['name'], + //Prepend subscribe context with tag + [ + 'mail' => $smail = $this->slugger->short($existing->getMail()), + 'hash' => $this->slugger->hash($smail) + ]+$this->config['route'][$route]['context'], + UrlGeneratorInterface::ABSOLUTE_URL + ); + } } - //Set the url in context - $mail['context'][$tag] = $this->get('router')->generate( - $this->config['route'][$route]['name'], - $this->config['route'][$route]['context'], - UrlGeneratorInterface::ABSOLUTE_URL - ); } - } - - //Set recipient_name - $mail['context']['recipient_mail'] = $user->getMail(); - - //Set recipient_name - $mail['context']['recipient_name'] = trim($user->getForename().' '.$user->getSurname().($user->getPseudonym()?' ('.$user->getPseudonym().')':'')); - - //Init subject context - $subjectContext = $this->flatten(array_replace_recursive($this->config['recover_mail']['view']['context'], $mail['context']), null, '.', '%', '%'); - - //Translate subject - $mail['subject'] = ucfirst($this->translator->trans($mail['subject'], $subjectContext)); - - //Create message - $message = (new TemplatedEmail()) - //Set sender - ->from(new Address($this->config['contact']['mail'], $this->config['contact']['name'])) - //Set recipient - //XXX: remove the debug set in vendor/symfony/mime/Address.php +46 - ->to(new Address($mail['context']['recipient_mail'], $mail['context']['recipient_name'])) - //Set subject - ->subject($mail['subject']) - //Set path to twig templates - ->htmlTemplate($mail['html']) - ->textTemplate($mail['text']) + //Set recipient_name + $activateMail['context']['recipient_mail'] = $existing->getMail(); + + //Set recipient name + $activateMail['context']['recipient_name'] = $existing->getRecipientName(); + + //Init subject context + $subjectContext = $this->slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $activateMail['context']), null, '.', '%', '%'); + + //Translate subject + $activateMail['subject'] = ucfirst($this->translator->trans($activateMail['subject'], $subjectContext)); + + //Create message + $message = (new TemplatedEmail()) + //Set sender + ->from(new Address($this->config['contact']['mail'], $this->config['contact']['title'])) + //Set recipient + //XXX: remove the debug set in vendor/symfony/mime/Address.php +46 + ->to(new Address($activateMail['context']['recipient_mail'], $activateMail['context']['recipient_name'])) + //Set subject + ->subject($activateMail['subject']) + + //Set path to twig templates + ->htmlTemplate($activateMail['html']) + ->textTemplate($activateMail['text']) + + //Set context + ->context(['subject' => $activateMail['subject']]+$activateMail['context']); + + //Try sending message + //XXX: mail delivery may silently fail + try { + //Send message + $this->mailer->send($message); + //Catch obvious transport exception + } catch(TransportExceptionInterface $e) { + //Add error message mail unreachable + $this->addFlash('error', $this->translator->trans('Account %mail% tried activate but unable to contact', ['%mail%' => $existing->getMail()])); + } - //Set context - //XXX: require recursive merge to avoid loosing subkeys - //['subject' => $mail['subject']]+$mail['context']+$this->config['recover_mail']['view']['context'] - ->context(array_replace_recursive($this->config['recover_mail']['view']['context'], $mail['context'], ['subject' => $mail['subject']])); + //Get route params + $routeParams = $request->get('_route_params'); - //Try sending message - //XXX: mail delivery may silently fail - try { - //Send message - $mailer->send($message); + //Remove mail, field and hash from route params + unset($routeParams['mail'], $routeParams['field'], $routeParams['hash']); //Redirect on the same route with sent=1 to cleanup form - return $this->redirectToRoute($request->get('_route'), ['recipient' => $recipient, 'hash' => $hash, 'sent' => 1]+$request->get('_route_params')); - //Catch obvious transport exception - } catch(TransportExceptionInterface $e) { - //Add error message mail unreachable - $form->get('password')->get('first')->addError(new FormError($this->translator->trans('Account %mail% updated but unable to contact', array('%mail%' => $mail['context']['recipient_mail'])))); + return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$routeParams); } + + //Add error message mail already exists + $this->addFlash('warning', $this->translator->trans('Account %mail% already exists', ['%mail%' => $existing->getMail()])); + + //Redirect to user view + return $this->redirectToRoute( + $this->config['route']['edit']['name'], + [ + 'mail' => $smail = $this->slugger->short($existing->getMail()), + 'hash' => $this->slugger->hash($smail) + ]+$this->config['route']['edit']['context'] + ); } + //Without mail + } else { + //Set smail + $smail = $mail; + } + + //Try + try { + //Unshort then unserialize field + $field = $this->slugger->unserialize($sfield = $field); + //Catch type error + } catch (\Error|\Exception $e) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'field', '%value%' => $field]), $e); } - //Accout not found + + //With non array field + if (!is_array($field)) { + //Throw bad request + throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'field', '%value%' => $field])); + } + //Without field and hash } else { - //Add error in flash message - //XXX: prevent slugger reverse engineering by not displaying decoded recipient - #$this->addFlash('error', $this->translator->trans('Unable to find account %mail%', ['%mail%' => $slugger->unshort($recipient)])); + //Set smail + $smail = $mail; + + //Set smail + $sfield = $field; + + //Reset field + $field = []; } - //Render view - return $this->render( - //Template - $this->config['recover_mail']['view']['name'], - //Context - ['form' => $form->createView(), 'sent' => $request->query->get('sent', 0), 'found' => $found]+$this->config['recover_mail']['view']['context'] - ); - } + //Init reflection + $reflection = new \ReflectionClass($this->config['class']['user']); - /** - * Register an account - * - * @todo: activation link - * - * @param Request $request The request - * @param UserPasswordEncoderInterface $encoder The password encoder - * @param MailerInterface $mailer The mailer - * @return Response The response - */ - public function register(Request $request, UserPasswordEncoderInterface $encoder, MailerInterface $mailer) { - //Get doctrine - $doctrine = $this->getDoctrine(); + //Create new user + $user = $reflection->newInstance(strval($mail)); //Create the RegisterType form and give the proper parameters - $form = $this->createForm($this->config['register']['view']['form'], null, array( - 'class_title' => $this->config['class']['title'], - 'title' => $doctrine->getRepository($this->config['class']['title'])->findOneByTitle($this->config['default']['title']), + $form = $this->createForm($this->config['register']['view']['form'], $user, $field+[ //Set action to register route name and context - 'action' => $this->generateUrl($this->config['route']['register']['name'], $this->config['route']['register']['context']), + 'action' => $this->generateUrl($this->config['route']['register']['name'], ['mail' => $smail, 'field' => $sfield, 'hash' => $hash]+$this->config['route']['register']['context']), + //Set civility class + 'civility_class' => $this->config['class']['civility'], + //Set civility default + 'civility_default' => $this->doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']), + //With mail + 'mail' => true, + //Set method 'method' => 'POST' - )); + ]+$this->config['register']['field']); + //With post method if ($request->isMethod('POST')) { //Refill the fields in case the form is not valid. $form->handleRequest($request); - if ($form->isValid()) { + //With form submitted and valid + if ($form->isSubmitted() && $form->isValid()) { //Set data $data = $form->getData(); + //With existing registrant + if ($this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail = $data->getMail())) { + //Add error message mail already exists + $this->addFlash('warning', $this->translator->trans('Account %mail% already exists', ['%mail%' => $mail])); + + //Redirect to user view + return $this->redirectToRoute( + $this->config['route']['edit']['name'], + [ + 'mail' => $smail = $this->slugger->short($mail), + 'hash' => $this->slugger->hash($smail) + ]+$this->config['route']['edit']['context'] + ); + } + //Set mail shortcut - $mail =& $this->config['register']['mail']; + $registerMail =& $this->config['register']['mail']; + + //Set password + $user->setPassword($this->hasher->hashPassword($user, $user->getPassword())); + + //Persist user + $this->manager->persist($user); + + //Iterate on default group + foreach($this->config['default']['group'] as $i => $groupTitle) { + //Fetch group + if (($group = $this->doctrine->getRepository($this->config['class']['group'])->findOneByTitle($groupTitle))) { + //Set default group + //XXX: see vendor/symfony/security-core/Role/Role.php + $user->addGroup($group); + //Group not found + } else { + //Throw exception + //XXX: consider missing group as fatal + throw new \Exception(sprintf('Group from rapsys_user.default.group[%d] not found by title: %s', $i, $groupTitle)); + } + } //Generate each route route foreach($this->config['register']['route'] as $route => $tag) { - if (empty($mail['context'][$tag]) && !empty($this->config['route'][$route])) { - $mail['context'][$tag] = $this->get('router')->generate( - $this->config['route'][$route]['name'], - $this->config['route'][$route]['context'], - UrlGeneratorInterface::ABSOLUTE_URL - ); + //Only process defined routes + if (!empty($this->config['route'][$route])) { + //Process for confirm url + if ($route == 'confirm') { + //Set the url in context + $registerMail['context'][$tag] = $this->router->generate( + $this->config['route'][$route]['name'], + //Prepend subscribe context with tag + [ + 'mail' => $smail = $this->slugger->short($data->getMail()), + 'hash' => $this->slugger->hash($smail) + ]+$this->config['route'][$route]['context'], + UrlGeneratorInterface::ABSOLUTE_URL + ); + } } } //Set recipient_name - $mail['context']['recipient_mail'] = $data['mail']; + $registerMail['context']['recipient_mail'] = $data->getMail(); - //Set recipient_name - $mail['context']['recipient_name'] = trim($data['forename'].' '.$data['surname'].($data['pseudonym']?' ('.$data['pseudonym'].')':'')); + //Set recipient name + $registerMail['context']['recipient_name'] = $data->getRecipientName(); //Init subject context - $subjectContext = $this->flatten(array_replace_recursive($this->config['register']['view']['context'], $mail['context']), null, '.', '%', '%'); + $subjectContext = $this->slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $registerMail['context']), null, '.', '%', '%'); //Translate subject - $mail['subject'] = ucfirst($this->translator->trans($mail['subject'], $subjectContext)); + $registerMail['subject'] = ucfirst($this->translator->trans($registerMail['subject'], $subjectContext)); //Create message $message = (new TemplatedEmail()) //Set sender - ->from(new Address($this->config['contact']['mail'], $this->config['contact']['name'])) + ->from(new Address($this->config['contact']['mail'], $this->config['contact']['title'])) //Set recipient //XXX: remove the debug set in vendor/symfony/mime/Address.php +46 - ->to(new Address($mail['context']['recipient_mail'], $mail['context']['recipient_name'])) + ->to(new Address($registerMail['context']['recipient_mail'], $registerMail['context']['recipient_name'])) //Set subject - ->subject($mail['subject']) + ->subject($registerMail['subject']) //Set path to twig templates - ->htmlTemplate($mail['html']) - ->textTemplate($mail['text']) + ->htmlTemplate($registerMail['html']) + ->textTemplate($registerMail['text']) //Set context - //XXX: require recursive merge to avoid loosing subkeys - //['subject' => $mail['subject']]+$mail['context']+$this->config['register']['view']['context'] - ->context(array_replace_recursive($this->config['register']['view']['context'], $mail['context'], ['subject' => $mail['subject']])); - - //Get manager - $manager = $doctrine->getManager(); - - //Init reflection - $reflection = new \ReflectionClass($this->config['class']['user']); - - //Create new user - $user = $reflection->newInstance(); - - $user->setMail($data['mail']); - $user->setPseudonym($data['pseudonym']); - $user->setForename($data['forename']); - $user->setSurname($data['surname']); - $user->setPhone($data['phone']); - $user->setPassword($encoder->encodePassword($user, $data['password'])); - $user->setActive(true); - $user->setTitle($data['title']); - - //Iterate on default group - foreach($this->config['default']['group'] as $i => $groupTitle) { - //Fetch group - if (($group = $doctrine->getRepository($this->config['class']['group'])->findOneByTitle($groupTitle))) { - //Set default group - //XXX: see vendor/symfony/security-core/Role/Role.php - $user->addGroup($group); - //Group not found - } else { - //Throw exception - //XXX: consider missing group as fatal - throw new \Exception(sprintf('Group from rapsys_user.default.group[%d] not found by title: %s', $i, $groupTitle)); - } - } - - $user->setCreated(new \DateTime('now')); - $user->setUpdated(new \DateTime('now')); - - //Persist user - $manager->persist($user); + ->context(['subject' => $registerMail['subject']]+$registerMail['context']); //Try saving in database try { //Send to database - $manager->flush(); + $this->manager->flush(); + + //Add error message mail already exists + $this->addFlash('notice', $this->translator->trans('Your account has been created')); //Try sending message //XXX: mail delivery may silently fail try { //Send message - $mailer->send($message); + $this->mailer->send($message); //Redirect on the same route with sent=1 to cleanup form - #return $this->redirectToRoute('rapsys_user_register', array('sent' => 1)); return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params')); //Catch obvious transport exception } catch(TransportExceptionInterface $e) { //Add error message mail unreachable - $form->get('mail')->addError(new FormError($this->translator->trans('Account %mail% created but unable to contact', array('%mail%' => $data['mail'])))); + $form->get('mail')->addError(new FormError($this->translator->trans('Account %mail% tried subscribe but unable to contact', ['%mail%' => $data->getMail()]))); } //Catch double subscription - } catch (\Doctrine\DBAL\Exception\UniqueConstraintViolationException $e) { + } catch (UniqueConstraintViolationException $e) { //Add error message mail already exists - $form->get('mail')->addError(new FormError($this->translator->trans('Account %mail% already exists', ['%mail%' => $data['mail']]))); + $this->addFlash('error', $this->translator->trans('Account %mail% already exists', ['%mail%' => $mail])); } } } @@ -639,42 +853,4 @@ class DefaultController extends AbstractController { ['form' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['register']['view']['context'] ); } - - /** - * Recursively flatten an array - * - * @param array $data The data tree - * @param string|null $current The current prefix - * @param string $sep The key separator - * @param string $prefix The key prefix - * @param string $suffix The key suffix - * @return array The flattened data - */ - protected function flatten($data, $current = null, $sep = '.', $prefix = '', $suffix = '') { - //Init result - $ret = []; - - //Look for data array - if (is_array($data)) { - //Iteare on each pair - foreach($data as $k => $v) { - //Merge flattened value in return array - $ret += $this->flatten($v, empty($current) ? $k : $current.$sep.$k, $sep, $prefix, $suffix); - } - //Look flat data - } else { - //Store data in flattened key - $ret[$prefix.$current.$suffix] = $data; - } - - //Return result - return $ret; - } - - /** - * {@inheritdoc} - */ - public function getAlias() { - return 'rapsys_user'; - } }