From 8dab47edf9e72d541f53f7a7a2bd4a30660827ca Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 19 Oct 2020 11:46:54 +0200 Subject: [PATCH 2/2] tests: PEP8 (#47825) --- tests/test_auth_oidc.py | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/tests/test_auth_oidc.py b/tests/test_auth_oidc.py index dec31d8d..b83a2240 100644 --- a/tests/test_auth_oidc.py +++ b/tests/test_auth_oidc.py @@ -261,8 +261,7 @@ def oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code, extra_id_token if extra_id_token: id_token.update(extra_id_token) - if oidc_provider.idtoken_algo in (OIDCProvider.ALGO_RSA, - OIDCProvider.ALGO_EC): + if oidc_provider.idtoken_algo in (OIDCProvider.ALGO_RSA, OIDCProvider.ALGO_EC): alg = { OIDCProvider.ALGO_RSA: 'RS256', OIDCProvider.ALGO_EC: 'ES256', @@ -270,9 +269,9 @@ def oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code, extra_id_token jwk = None for key in oidc_provider_jwkset['keys']: if key.key_type == { - OIDCProvider.ALGO_RSA: 'RSA', - OIDCProvider.ALGO_EC: 'EC', - }.get(oidc_provider.idtoken_algo): + OIDCProvider.ALGO_RSA: 'RSA', + OIDCProvider.ALGO_EC: 'EC', + }.get(oidc_provider.idtoken_algo): jwk = key break if provides_kid_header: @@ -281,7 +280,7 @@ def oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code, extra_id_token header = {'alg': alg, 'kid': jwk.key_id} jwt = JWT(header=header, claims=id_token) jwt.make_signed_token(jwk) - else: # hmac + else: # hmac jwt = JWT(header={'alg': 'HS256'}, claims=id_token) k = base64url_encode(oidc_provider.client_secret.encode('utf-8')) @@ -381,7 +380,7 @@ def test_providers_on_login_page(oidc_provider, app): def test_login_with_conditional_authenticators(oidc_provider, app, settings, caplog): - oidc2_provider = OIDCProvider.objects.create( + OIDCProvider.objects.create( id=2, ou=get_default_ou(), name='My IDP', @@ -482,7 +481,6 @@ def test_login_autorun(oidc_provider, app, settings): assert response['Location'] == '/accounts/oidc/login/%s/' % oidc_provider.pk - def test_sso(app, caplog, code, oidc_provider, oidc_provider_jwkset, hooks): OU = get_ou_model() cassis = OU.objects.create(name='Cassis', slug='cassis') @@ -751,13 +749,19 @@ def test_invalid_kid(app, caplog, code, oidc_provider_rsa, # test invalid kid with utils.check_log(caplog, message='not in key set', levelname='WARNING'): - with oidc_provider_mock(oidc_provider_rsa, oidc_provider_jwkset, code, nonce=nonce, provides_kid_header=True, kid='coin'): - response = app.get(login_callback_url(oidc_provider_rsa), params={'code': code, 'state': query['state']}) + with oidc_provider_mock(oidc_provider_rsa, oidc_provider_jwkset, code, + nonce=nonce, provides_kid_header=True, + kid='coin'): + response = app.get(login_callback_url(oidc_provider_rsa), + params={'code': code, 'state': query['state']}) # test missing kid with utils.check_log(caplog, message='Key ID None not in key set', levelname='WARNING'): - with oidc_provider_mock(oidc_provider_rsa, oidc_provider_jwkset, code, nonce=nonce, provides_kid_header=True, kid=None): - response = app.get(login_callback_url(oidc_provider_rsa), params={'code': code, 'state': query['state']}) + with oidc_provider_mock(oidc_provider_rsa, oidc_provider_jwkset, code, + nonce=nonce, provides_kid_header=True, + kid=None): + response = app.get(login_callback_url(oidc_provider_rsa), + params={'code': code, 'state': query['state']}) def test_templated_claim_mapping(app, caplog, code, oidc_provider, oidc_provider_jwkset): @@ -816,7 +820,8 @@ def test_templated_claim_mapping(app, caplog, code, oidc_provider, oidc_provider nonce = app.session['auth_oidc'][state]['request']['nonce'] with oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code, nonce=nonce): - response = app.get(login_callback_url(oidc_provider), params={'code': code, 'state': query['state']}).maybe_follow() + response = app.get(login_callback_url(oidc_provider), + params={'code': code, 'state': query['state']}).maybe_follow() assert User.objects.count() == 1 user = User.objects.first() -- 2.28.0