From 755b6b280252437b705b51670509fe7db7610cbe Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 21 Jan 2020 13:19:26 +0100 Subject: [PATCH 2/3] tests: pep8ness (#39136) --- tests/test_auth_oidc.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tests/test_auth_oidc.py b/tests/test_auth_oidc.py index 78c7a027..e4f2778f 100644 --- a/tests/test_auth_oidc.py +++ b/tests/test_auth_oidc.py @@ -37,8 +37,9 @@ from django.utils.six.moves.urllib import parse as urlparse from django_rbac.utils import get_ou_model -from authentic2_auth_oidc.utils import (parse_id_token, IDToken, get_providers, - has_providers, register_issuer, IDTokenError) +from authentic2_auth_oidc.utils import ( + parse_id_token, IDToken, get_providers, has_providers, register_issuer, + IDTokenError) from authentic2_auth_oidc.models import OIDCProvider, OIDCClaimMapping from authentic2.models import AttributeValue from authentic2.utils import timestamp_from_datetime, last_authentication_event @@ -195,8 +196,9 @@ def signature(oidc_provider): key = oidc_provider.jwkset.get_key(kid='1e9gdk7') header_decoded = header_rsa_decoded elif oidc_provider.idtoken_algo == OIDCProvider.ALGO_HMAC: - key = JWK(kty='oct', k=base64url_encode( - oidc_provider.client_secret.encode('utf-8'))) + key = JWK(kty='oct', + k=base64url_encode( + oidc_provider.client_secret.encode('utf-8'))) header_decoded = header_hmac_decoded jws = JWS(payload=json_encode(payload_decoded)) jws.add_signature(key=key, protected=header_decoded) @@ -397,7 +399,8 @@ def test_sso(app, caplog, code, oidc_provider, oidc_provider_jwkset, login_url, with oidc_provider_mock(oidc_provider, oidc_provider_jwkset, code, nonce=nonce): response = app.get(login_callback_url, params={'code': code, 'state': query['state']}) assert len(hooks.auth_oidc_backend_modify_user) == 1 - assert set(hooks.auth_oidc_backend_modify_user[0]['kwargs']) >= set(['user', 'provider', 'user_info', 'id_token', 'access_token']) + assert set(hooks.auth_oidc_backend_modify_user[0]['kwargs']) >= set( + ['user', 'provider', 'user_info', 'id_token', 'access_token']) assert urlparse.urlparse(response['Location']).path == '/admin/' assert User.objects.count() == 1 user = User.objects.get() @@ -526,17 +529,17 @@ def test_register_issuer(db, app, caplog, oidc_provider_jwkset): return oidc_provider_jwkset.export() with HTTMock(jwks_mock): - provider = register_issuer( - name='test_issuer', - issuer='https://default.issuer', - openid_configuration=oidc_conf) + register_issuer( + name='test_issuer', + issuer='https://default.issuer', + openid_configuration=oidc_conf) oidc_conf['id_token_signing_alg_values_supported'] = ['HS256'] with HTTMock(jwks_mock): - provider = register_issuer( - name='test_issuer_hmac_only', - issuer='https://hmac_only.issuer', - openid_configuration=oidc_conf) + register_issuer( + name='test_issuer_hmac_only', + issuer='https://hmac_only.issuer', + openid_configuration=oidc_conf) def test_required_keys(db, oidc_provider, header, signature, caplog): @@ -544,8 +547,8 @@ def test_required_keys(db, oidc_provider, header, signature, caplog): 'sub': '248289761001', 'iss': 'http://server.example.com', 'iat': 1311280970, - 'exp': 1311281970, # Missing 'aud' and 'nonce' required claims - 'extra_stuff': 'hi there', # Wrong claim + 'exp': 1311281970, # Missing 'aud' and 'nonce' required claims + 'extra_stuff': 'hi there', # Wrong claim })) with pytest.raises(IDTokenError): -- 2.24.0