0001-auth_fc-get-a-lock-on-the-sub-during-account-creatio.patch

Paul Marillonnet, 14 septembre 2022 09:11

Voir les différences: en ligne côte à côte

Subject: [PATCH] auth_fc: get a lock on the sub during account creation
 (#65411)

 src/authentic2/custom_user/managers.py | 14 +++++
 src/authentic2_auth_fc/views.py        | 75 ++++++++++++++------------
 2 files changed, 55 insertions(+), 34 deletions(-)

                 raise self.model.MultipleObjectsReturned
             return users[0]
         def filter_by_email(self, email):
             """
             Prevents unicode normalization collision attacks (see
             https://nvd.nist.gov/vuln/detail/CVE-2019-19844)
             """
             users = []
             for user in self.filter(email__iexact=email, is_active=True):
                 if (
                     unicodedata.normalize('NFKC', user.email).casefold()
                     == unicodedata.normalize('NFKC', email).casefold()
                 ):
                     users.append(user)
             return users
     class UserManager(BaseUserManager):
         def _create_user(self, username, email, password, is_staff, is_superuser, **extra_fields):

         def link(self, request):
             '''Request an access grant code and associate it to the current user'''
             Lock.lock_identifier(identifier=self.sub)
             try:
                 self.fc_account, created = models.FcAccount.objects.get_or_create(
                     sub=self.sub,
-...
                 user = User.objects.create(ou=get_default_ou())
                 created = True
             try:
                 if created:
                     user.set_unusable_password()
                     user.save()
                 # As we intercept IntegrityError and we can never be sure if we are
                 # in a transaction or not, we must use one to prevent later SQL
                 # queries to fail.
                 with transaction.atomic():
             if created:
                 user.set_unusable_password()
                 user.save()
             # As we intercept IntegrityError and we can never be sure if we are
             # in a transaction or not, we must use one to prevent later SQL
             # queries to fail.
             with transaction.atomic():
                 Lock.lock_identifier(identifier=sub)
                 # reshuffle existing accounts order
                 Lock.lock_email(email=user.email)
                 for account in models.FcAccount.objects.filter(user=user).order_by('-order'):
                     account.order += 1
                     account.save()
                 if not models.FcAccount.objects.filter(sub=sub).count():
                     models.FcAccount.objects.create(
                         user=user,
                         sub=sub,
-...
                         token=json.dumps(token),
                         user_info=json.dumps(user_info),
+                    )
             except IntegrityError:
                 # uniqueness check failed, as the user is new, it can only mean that the sub is not unique
                 # let's try again
                 if created:
                     user.delete()
                 return utils_misc.authenticate(request, sub=sub, token=token, user_info=user_info), False
             except Exception:
                 # if anything unexpected happen and user was created, delete it and re-raise
                 if created:
                     user.delete()
                 raise
             if created:
                 logger.info('auth_fc: new account "%s" created with FranceConnect sub "%s"', user, sub)
                 hooks.call_hooks('event', name='fc-create', user=user, sub=sub, request=request)
                 # FC account creation does not rely on the registration_completion generic view.
                 # Registration event has to be recorded here:
                 request.journal.record('user.registration', user=user, how='france-connect')
             else:
                 if created:
                     logger.info('auth_fc: new account "%s" created with FranceConnect sub "%s"', user, sub)
                     hooks.call_hooks('event', name='fc-create', user=user, sub=sub, request=request)
                     # FC account creation does not rely on the registration_completion generic view.
                     # Registration event has to be recorded here:
                     request.journal.record('user.registration', user=user, how='france-connect')
                 else:
                     logger.info('auth_fc: existing account "%s" linked to FranceConnect sub "%s"', user, sub)
                     hooks.call_hooks('event', name='fc-link', user=user, sub=sub, request=request)
                 logger.info('auth_fc: existing account "%s" linked to FranceConnect sub "%s"', user, sub)
                 hooks.call_hooks('event', name='fc-link', user=user, sub=sub, request=request)
             authenticated_user = utils_misc.authenticate(request, sub=sub, user_info=user_info, token=token)
             return authenticated_user, created
-...
             if not a2_app_settings.A2_EMAIL_IS_UNIQUE:
                 qs = qs.filter(ou=ou)
             Lock.lock_email(email)
             try:
                 user = qs.get_by_email(email)
             except User.DoesNotExist:
                 return User.objects.create(ou=ou, email=email), True
             with transaction.atomic():
                 Lock.lock_email(email)
                 users = qs.filter_by_email(email)
                 if not users:
                     return User.objects.create(ou=ou, email=email), True
             if len(users) > 1:
                 # oops, something went wrong there, several users with the same
                 # email within the same organization unit, aborting.
                 return None, False
             user = users[0]
             if user.ou != ou:
                 raise UserOutsideDefaultOu
             return user, False
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-auth_fc-get-a-lock-on-the-sub-during-account-creatio.patch