0001-auth_oidc-avoid-user-messages-with-prompt-none-relat.patch

Paul Marillonnet, 16 décembre 2022 11:44

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

Subject: [PATCH] auth_oidc: avoid user messages with prompt=none related
 errors (#72538)

 src/authentic2_auth_oidc/views.py | 46 ++++++++++++++++++-------------
 tests/test_auth_oidc.py           | 10 +++++++
 2 files changed, 37 insertions(+), 19 deletions(-)

                 log_msg += ' see %s' % error_url
             logger.log(level, log_msg)
             if error_description:
                 message = _('%(error_description)s (%(error)s)') % {
                     'error_description': error_description,
                     'error': error,
+                }
                 messages.add_message(request, level, message)
             else:  # unexpected error code
                 message_params = {
                     'request_id': request.request_id,
                     'provider_name': provider and provider.name,
                     'error': error,
+                }
                 if provider:
                     message = _(
                         'Login with %(provider_name)s failed, report %(request_id)s to an administrator (%(error)s)'
+                    )
                 else:
                     message = _('Login with OpenID Connect failed, report %s to an administrator. (%(error)s)')
             if error not in (
                 'consent_required',
                 'login_required',
                 'account_selection_required',
                 'interaction_required',
             ):
                 if error_description:
                     message = _('%(error_description)s (%(error)s)') % {
                         'error_description': error_description,
                         'error': error,
+                    }
                     messages.add_message(request, level, message)
                 else:  # unexpected error code
                     message_params = {
                         'request_id': request.request_id,
                         'provider_name': provider and provider.name,
                         'error': error,
+                    }
                     if provider:
                         message = _(
                             'Login with %(provider_name)s failed, report %(request_id)s to an administrator (%(error)s)'
+                        )
                     else:
                         message = _(
                             'Login with OpenID Connect failed, report %s to an administrator. (%(error)s)'
+                        )
                 messages.warning(request, message % message_params)
                     messages.warning(request, message % message_params)
             return self.continue_to_next_url(request)

                     assert len(cookie) == 1
                     cookie = cookie[0].message
                 assert 'Authentication on Server failed with error' in cookie
         with utils.check_log(caplog, "'error': 'invalid request'"):
             with oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code):
                 response = app.get(
                     login_callback_url(oidc_provider), params={'code': 'yyyy', 'state': state, 'prompt': 'none'}
+                )
                 cookie = utils.decode_cookie(app.cookies['messages'])
                 if isinstance(cookie, list):
                     # prompt=none, no message displayed to end user
                     assert len(cookie) == 0
         with utils.check_log(caplog, 'invalid id_token'):
             with oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code, extra_id_token={'iss': None}):
                 response = app.get(login_callback_url(oidc_provider), params={'code': code, 'state': state})
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-auth_oidc-avoid-user-messages-with-prompt-none-relat.patch