Skip to content

Commit a6b0cbe

Browse files
roherohe
committed
Applied isort and black.
1 parent a30ce79 commit a6b0cbe

File tree

10 files changed

+64
-72
lines changed

10 files changed

+64
-72
lines changed

‎src/cryptojwt/jwk/ec.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
from cryptography.hazmat.primitives import serialization
33
from cryptography.hazmat.primitives.asymmetric import ec
44

5-
from .asym import AsymmetricKey
6-
from .x509 import import_public_key_from_pem_data
7-
from .x509 import import_public_key_from_pem_file
85
from ..exception import DeSerializationNotPossible
96
from ..exception import JWKESTException
107
from ..exception import UnsupportedECurve
118
from ..utils import as_unicode
129
from ..utils import deser
1310
from ..utils import long_to_base64
11+
from .asym import AsymmetricKey
12+
from .x509 import import_public_key_from_pem_data
13+
from .x509 import import_public_key_from_pem_file
1414

1515
# This is used to translate between the curve representation in
1616
# Cryptography and the one used by NIST (and in RFC 7518)
@@ -125,7 +125,7 @@ class ECKey(AsymmetricKey):
125125
required = ["kty", "crv", "x", "y"]
126126

127127
def __init__(
128-
self, kty="EC", alg="", use="", kid="", crv="", x="", y="", d="", **kwargs
128+
self, kty="EC", alg="", use="", kid="", crv="", x="", y="", d="", **kwargs
129129
):
130130
AsymmetricKey.__init__(self, kty, alg, use, kid, **kwargs)
131131
self.crv = crv
@@ -331,7 +331,7 @@ def import_public_ec_key_from_file(filename):
331331
if isinstance(public_key, ec.EllipticCurvePublicKey):
332332
return public_key
333333
else:
334-
return ValueError('Not a Elliptic Curve key')
334+
return ValueError("Not a Elliptic Curve key")
335335

336336

337337
def import_ec_key(pem_data):
@@ -345,4 +345,4 @@ def import_ec_key(pem_data):
345345
if isinstance(public_key, ec.EllipticCurvePublicKey):
346346
return public_key
347347
else:
348-
return ValueError('Not a Elliptic Curve key')
348+
return ValueError("Not a Elliptic Curve key")

‎src/cryptojwt/jwk/rsa.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
from cryptography.hazmat.primitives import serialization
66
from cryptography.hazmat.primitives.asymmetric import rsa
77

8-
from . import JWK
9-
from .asym import AsymmetricKey
10-
from .x509 import der_cert
11-
from .x509 import import_private_key_from_pem_file
12-
from .x509 import import_public_key_from_pem_data
13-
from .x509 import import_public_key_from_pem_file
14-
from .x509 import x5t_calculation
158
from ..exception import DeSerializationNotPossible
169
from ..exception import JWKESTException
1710
from ..exception import SerializationNotPossible
1811
from ..exception import UnsupportedKeyType
1912
from ..utils import as_unicode
2013
from ..utils import deser
2114
from ..utils import long_to_base64
15+
from . import JWK
16+
from .asym import AsymmetricKey
17+
from .x509 import der_cert
18+
from .x509 import import_private_key_from_pem_file
19+
from .x509 import import_public_key_from_pem_data
20+
from .x509 import import_public_key_from_pem_file
21+
from .x509 import x5t_calculation
2222

2323
logger = logging.getLogger(__name__)
2424

@@ -73,7 +73,7 @@ def import_private_rsa_key_from_file(filename, passphrase=None):
7373
if isinstance(private_key, rsa.RSAPrivateKey):
7474
return private_key
7575
else:
76-
return ValueError('Not a RSA key')
76+
return ValueError("Not a RSA key")
7777

7878

7979
def import_public_rsa_key_from_file(filename):
@@ -88,7 +88,7 @@ def import_public_rsa_key_from_file(filename):
8888
if isinstance(public_key, rsa.RSAPublicKey):
8989
return public_key
9090
else:
91-
return ValueError('Not a RSA key')
91+
return ValueError("Not a RSA key")
9292

9393

9494
def import_rsa_key(pem_data):
@@ -102,7 +102,7 @@ def import_rsa_key(pem_data):
102102
if isinstance(public_key, rsa.RSAPublicKey):
103103
return public_key
104104
else:
105-
return ValueError('Not a RSA key')
105+
return ValueError("Not a RSA key")
106106

107107

108108
def import_rsa_key_from_cert_file(pem_file):
@@ -247,24 +247,24 @@ class RSAKey(AsymmetricKey):
247247
required = ["kty", "n", "e"]
248248

249249
def __init__(
250-
self,
251-
kty="RSA",
252-
alg="",
253-
use="",
254-
kid="",
255-
x5c=None,
256-
x5t="",
257-
x5u="",
258-
n="",
259-
e="",
260-
d="",
261-
p="",
262-
q="",
263-
dp="",
264-
dq="",
265-
di="",
266-
qi="",
267-
**kwargs
250+
self,
251+
kty="RSA",
252+
alg="",
253+
use="",
254+
kid="",
255+
x5c=None,
256+
x5t="",
257+
x5u="",
258+
n="",
259+
e="",
260+
d="",
261+
p="",
262+
q="",
263+
dp="",
264+
dq="",
265+
di="",
266+
qi="",
267+
**kwargs
268268
):
269269
AsymmetricKey.__init__(self, kty, alg, use, kid, x5c, x5t, x5u, **kwargs)
270270
self.n = n

‎src/cryptojwt/jwk/x509.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def load_x509_cert(url, httpc, spec2key, **get_args):
9797
if isinstance(public_key, rsa.RSAPublicKey):
9898
return {"rsa": public_key}
9999
elif isinstance(public_key, ec.EllipticCurvePublicKey):
100-
return {'ec': public_key}
100+
return {"ec": public_key}
101101
else:
102102
raise Exception("HTTP Get error: %s" % r.status_code)
103103
except Exception as err: # not a RSA key
@@ -119,4 +119,3 @@ def x5t_calculation(cert):
119119
der_cert = base64.b64decode(cert)
120120

121121
return b64e(hashlib.sha1(der_cert).digest())
122-

‎src/cryptojwt/key_bundle.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import time
77
from functools import cmp_to_key
88

9-
from cryptojwt.jwk.x509 import import_private_key_from_pem_file
109
import requests
1110

1211
from cryptojwt.jwk.ec import NIST2SEC
1312
from cryptojwt.jwk.hmac import new_sym_key
13+
from cryptojwt.jwk.x509 import import_private_key_from_pem_file
1414

1515
from .exception import JWKException
1616
from .exception import UnknownKeyType
@@ -40,11 +40,7 @@
4040
# raise excep(_err, 'application/json')
4141

4242
# Make sure the keys are all uppercase
43-
K2C = {
44-
"RSA": RSAKey,
45-
"EC": ECKey,
46-
"oct": SYMKey,
47-
}
43+
K2C = {"RSA": RSAKey, "EC": ECKey, "oct": SYMKey}
4844

4945
MAP = {"dec": "enc", "enc": "enc", "ver": "sig", "sig": "sig"}
5046

‎tests/test_02_jwk.py‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
from __future__ import print_function
44

55
import base64
6-
from collections import Counter
76
import json
87
import os.path
98
import struct
9+
from collections import Counter
1010

11+
import pytest
1112
from cryptography.hazmat.primitives.asymmetric import ec
1213
from cryptography.hazmat.primitives.asymmetric import rsa
13-
import pytest
1414

1515
from cryptojwt.exception import DeSerializationNotPossible
1616
from cryptojwt.exception import UnsupportedAlgorithm
@@ -27,14 +27,14 @@
2727
from cryptojwt.jwk.hmac import sha256_digest
2828
from cryptojwt.jwk.jwk import dump_jwk
2929
from cryptojwt.jwk.jwk import import_jwk
30-
from cryptojwt.jwk.x509 import import_public_key_from_pem_file
3130
from cryptojwt.jwk.jwk import jwk_wrap
3231
from cryptojwt.jwk.jwk import key_from_jwk_dict
3332
from cryptojwt.jwk.rsa import RSAKey
3433
from cryptojwt.jwk.rsa import import_private_rsa_key_from_file
3534
from cryptojwt.jwk.rsa import import_public_rsa_key_from_file
3635
from cryptojwt.jwk.rsa import import_rsa_key_from_cert_file
3736
from cryptojwt.jwk.rsa import new_rsa_key
37+
from cryptojwt.jwk.x509 import import_public_key_from_pem_file
3838
from cryptojwt.utils import as_bytes
3939
from cryptojwt.utils import as_unicode
4040
from cryptojwt.utils import b64e
@@ -123,8 +123,8 @@ def test_import_rsa_key():
123123

124124
assert _eq(djwk.keys(), ["kty", "e", "n", "p", "q", "d", "kid"])
125125
assert (
126-
djwk["n"] == "5zbNbHIYIkGGJ3RGdRKkYmF4gOorv5eDuUKTVtuu3VvxrpOWvwnFV"
127-
"-NY0LgqkQSMMyVzodJE3SUuwQTUHPXXY5784vnkFqzPRx6bHgPxKz7XfwQjEBTafQTMmOeYI8wFIOIHY5i0RWR-gxDbh_D5TXuUqScOOqR47vSpIbUH-nc"
126+
djwk["n"] == "5zbNbHIYIkGGJ3RGdRKkYmF4gOorv5eDuUKTVtuu3VvxrpOWvwnFV"
127+
"-NY0LgqkQSMMyVzodJE3SUuwQTUHPXXY5784vnkFqzPRx6bHgPxKz7XfwQjEBTafQTMmOeYI8wFIOIHY5i0RWR-gxDbh_D5TXuUqScOOqR47vSpIbUH-nc"
128128
)
129129
assert djwk["e"] == "AQAB"
130130

@@ -153,12 +153,10 @@ def test_serialize_rsa_priv_key():
153153

154154
ECKEY = {
155155
"crv": "P-521",
156-
"x":
157-
u"AekpBQ8ST8a8VcfVOTNl353vSrDCLLJXmPk06wTjxrrjcBpXp5EOnYG_NjFZ6OvLFV1jSfS9tsz4qUxcWceqwQGk",
156+
"x": u"AekpBQ8ST8a8VcfVOTNl353vSrDCLLJXmPk06wTjxrrjcBpXp5EOnYG_NjFZ6OvLFV1jSfS9tsz4qUxcWceqwQGk",
158157
"y": u"ADSmRA43Z1DSNx_RvcLI87cdL07l6jQyyBXMoxVg_l2Th"
159-
u"-x3S1WDhjDly79ajL4Kkd0AZMaZmh9ubmf63e3kyMj2",
160-
"d":
161-
u"AY5pb7A0UFiB3RELSD64fTLOSV_jazdF7fLYyuTw8lOfRhWg6Y6rUrPAxerEzgdRhajnu0ferB0d53vM9mE15j2C",
158+
u"-x3S1WDhjDly79ajL4Kkd0AZMaZmh9ubmf63e3kyMj2",
159+
"d": u"AY5pb7A0UFiB3RELSD64fTLOSV_jazdF7fLYyuTw8lOfRhWg6Y6rUrPAxerEzgdRhajnu0ferB0d53vM9mE15j2C",
162160
}
163161

164162

@@ -610,8 +608,8 @@ def test_thumbprint_rsa():
610608
"kty": "RSA",
611609
"e": "AQAB",
612610
"n": "3xIyjRLL1LYi2FULhN6koVwtsaixgXa5TBOMcq2EMsk_Fq"
613-
"-tSXmxA8ATYcUnuSGX3PGJ5pHwIF42eesIzQV5ypYklF0sLAkmkXow_TMDX0qoc4rdfc2prq"
614-
"-mzPWwGcYoRsjDKiSUFOUSKB41zQ6sMY2k4BWZVo1bEL0CVpVct1DDhqSME6uUKex9T2AbwWNvwFacrwJaWyKixBhiPSwVBn7dUWDnJiM39_4Lnw6JnriXcli-aJlPuXm5F_qspXL4Pfn9nR5Z9j9Qf7NFif7nVRyg8cx7OYTbbsoIbMYYG-boVPLL7ebEBZVIUysqH_WkNJlkl5m7gAs5DB_KfMx18Q",
611+
"-tSXmxA8ATYcUnuSGX3PGJ5pHwIF42eesIzQV5ypYklF0sLAkmkXow_TMDX0qoc4rdfc2prq"
612+
"-mzPWwGcYoRsjDKiSUFOUSKB41zQ6sMY2k4BWZVo1bEL0CVpVct1DDhqSME6uUKex9T2AbwWNvwFacrwJaWyKixBhiPSwVBn7dUWDnJiM39_4Lnw6JnriXcli-aJlPuXm5F_qspXL4Pfn9nR5Z9j9Qf7NFif7nVRyg8cx7OYTbbsoIbMYYG-boVPLL7ebEBZVIUysqH_WkNJlkl5m7gAs5DB_KfMx18Q",
615613
}
616614
)
617615
thumbprint = "Q1wZMrouq_iCnG7mr2y03Zxf7iE9mie-y_Mfh9-Cgk0"
@@ -666,9 +664,8 @@ def test_pem_to_x5c():
666664
x5c = pems_to_x5c([cert_chain])
667665
assert len(x5c) == 1
668666
assert (
669-
x5c[0]
670-
==
671-
"MIIB2jCCAUOgAwIBAgIBATANBgkqhkiG9w0BAQUFADA0MRgwFgYDVQQDEw9UaGUgY29kZSB0ZXN0ZXIxGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTAeFw0xMjEwMDQwMDIzMDNaFw0xMzEwMDQwMDIzMDNaMDIxCzAJBgNVBAYTAlNFMSMwIQYDVQQDExpPcGVuSUQgQ29ubmVjdCBUZXN0IFNlcnZlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwf+wiusGhA+gleZYQAOPQlNUIucPiqXdPVyieDqQbXXOPBe3nuggtVzeq7pVFH1dZz4dY2Q2LA5DaegvP8kRvoSB/87ds3dy3Rfym/GUSc5B0l1TgEobcyaep8jguRoHto6GWHfCfKqoUYZq4N8vh4LLMQwLR6zi6Jtu82nB5k8CAwEAATANBgkqhkiG9w0BAQUFAAOBgQCsTntG4dfW5kO/Qle6uBhIhZU+3IreIPmbwzpXoCbcgjRa01z6WiBLwDC1RLAL7ucaF/EVlUq4e0cNXKt4ESGNc1xHISOMLetwvS1SN5tKWA9HNua/SaqRtiShxLUjPjmrtpUgotLNDRvUYnTdTT1vhZar7TSPr1yObirjvz/qLw=="
667+
x5c[0]
668+
== "MIIB2jCCAUOgAwIBAgIBATANBgkqhkiG9w0BAQUFADA0MRgwFgYDVQQDEw9UaGUgY29kZSB0ZXN0ZXIxGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTAeFw0xMjEwMDQwMDIzMDNaFw0xMzEwMDQwMDIzMDNaMDIxCzAJBgNVBAYTAlNFMSMwIQYDVQQDExpPcGVuSUQgQ29ubmVjdCBUZXN0IFNlcnZlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwf+wiusGhA+gleZYQAOPQlNUIucPiqXdPVyieDqQbXXOPBe3nuggtVzeq7pVFH1dZz4dY2Q2LA5DaegvP8kRvoSB/87ds3dy3Rfym/GUSc5B0l1TgEobcyaep8jguRoHto6GWHfCfKqoUYZq4N8vh4LLMQwLR6zi6Jtu82nB5k8CAwEAATANBgkqhkiG9w0BAQUFAAOBgQCsTntG4dfW5kO/Qle6uBhIhZU+3IreIPmbwzpXoCbcgjRa01z6WiBLwDC1RLAL7ucaF/EVlUq4e0cNXKt4ESGNc1xHISOMLetwvS1SN5tKWA9HNua/SaqRtiShxLUjPjmrtpUgotLNDRvUYnTdTT1vhZar7TSPr1yObirjvz/qLw=="
672669
)
673670

674671

@@ -683,9 +680,9 @@ def test_certificate_fingerprint():
683680

684681
res = certificate_fingerprint(der)
685682
assert (
686-
res
687-
== "01:DF:F1:D4:5F:21:7B:2E:3A:A2:D8:CA:13:4C:41:66:03:A1:EF:3E:7B:5E:8B:69:04:5E"
688-
":80:8B:55:49:F1:48"
683+
res
684+
== "01:DF:F1:D4:5F:21:7B:2E:3A:A2:D8:CA:13:4C:41:66:03:A1:EF:3E:7B:5E:8B:69:04:5E"
685+
":80:8B:55:49:F1:48"
689686
)
690687

691688
res = certificate_fingerprint(der, "sha1")
@@ -707,13 +704,17 @@ def test_x5t_calculation():
707704

708705
x5t_s256 = calculate_x5t(der, "sha256")
709706
assert (
710-
x5t_s256 == b"MDFERkYxRDQ1RjIxN0IyRTNBQTJEOENBMTM0QzQxNjYwM0ExRUYzRTdCNUU4QjY5MDQ1RTgwOEI1NTQ5RjE0OA=="
707+
x5t_s256
708+
== b"MDFERkYxRDQ1RjIxN0IyRTNBQTJEOENBMTM0QzQxNjYwM0ExRUYzRTdCNUU4QjY5MDQ1RTgwOEI1NTQ5RjE0OA=="
711709
)
712710

713711

714712
@pytest.mark.parametrize(
715713
"filename,key_type",
716-
[("ec-public.pem", ec.EllipticCurvePublicKey), ("rsa-public.pem", rsa.RSAPublicKey)],
714+
[
715+
("ec-public.pem", ec.EllipticCurvePublicKey),
716+
("rsa-public.pem", rsa.RSAPublicKey),
717+
],
717718
)
718719
def test_import_public_key_from_pem_file(filename, key_type):
719720
_file = full_path(filename)

‎tests/test_04_key_issuer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ def test_load_unknown_keytype():
457457
assert len(issuer.all_keys()) == 1
458458

459459

460-
JWK_FP = {"keys": [{"e": "AQAB", "kty": "RSA", "kid": "rsa1"},]}
460+
JWK_FP = {"keys": [{"e": "AQAB", "kty": "RSA", "kid": "rsa1"}]}
461461

462462

463463
def test_load_missing_key_parameter():

‎tests/test_04_key_jar.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ def test_load_unknown_keytype():
543543
assert len(kj.get_issuer_keys("")) == 1
544544

545545

546-
JWK_FP = {"keys": [{"e": "AQAB", "kty": "RSA", "kid": "rsa1"},]}
546+
JWK_FP = {"keys": [{"e": "AQAB", "kty": "RSA", "kid": "rsa1"}]}
547547

548548

549549
def test_load_missing_key_parameter():
@@ -657,9 +657,7 @@ def setup(self):
657657
{"type": "RSA", "use": ["sig"]},
658658
]
659659

660-
skey = [
661-
{"type": "RSA", "use": ["sig"]},
662-
]
660+
skey = [{"type": "RSA", "use": ["sig"]}]
663661

664662
# Alice has multiple keys
665663
self.alice_keyjar = build_keyjar(mkey)

‎tests/test_06_jws.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ def test_jws_mm():
438438

439439
@pytest.mark.parametrize(
440440
"ec_func,alg",
441-
[(ec.SECP256R1, "ES256"), (ec.SECP384R1, "ES384"), (ec.SECP521R1, "ES512"),],
441+
[(ec.SECP256R1, "ES256"), (ec.SECP384R1, "ES384"), (ec.SECP521R1, "ES512")],
442442
)
443443
def test_signer_es(ec_func, alg):
444444
payload = "Please take a moment to register today"

‎tests/test_50_argument_alias.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ def setup(self):
5555
{"type": "RSA", "use": ["sig"]},
5656
]
5757

58-
skey = [
59-
{"type": "RSA", "use": ["sig"]},
60-
]
58+
skey = [{"type": "RSA", "use": ["sig"]}]
6159

6260
# Alice has multiple keys
6361
self.alice_keyjar = build_keyjar(mkey)

‎tests/test_vector.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
test_header_hmac = json.dumps({"typ": "JWT", "alg": "HS256"}, separators=(",", ":"))
120120

121121
test_payload = json.dumps(
122-
{"aud": "aud1", "sub": "subject1", "iss": "issuer1",}, separators=(",", ":")
122+
{"aud": "aud1", "sub": "subject1", "iss": "issuer1"}, separators=(",", ":")
123123
)
124124

125125
test_header_ecdsa_kid1 = json.dumps(

0 commit comments

Comments
 (0)