Skip to content

Commit cb70424

Browse files
jschlyterjschlyter
committed
lint B904,SIM108
1 parent bbc4b62 commit cb70424

25 files changed

+66
-106
lines changed

‎src/cryptojwt/jwe/jwe.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,7 @@ def decrypt(self, token=None, keys=None, alg=None, cek=None):
191191
return msg
192192

193193
for key in keys:
194-
if isinstance(key, AsymmetricKey):
195-
_key = key.private_key()
196-
else:
197-
_key = key.key
194+
_key = key.private_key() if isinstance(key, AsymmetricKey) else key.key
198195

199196
try:
200197
msg = decrypter.decrypt(_jwe, _key)

‎src/cryptojwt/jwe/jwe_ec.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ def enc_setup(self, msg, key=None, auth_data=b"", **kwargs):
111111
if self.alg == "ECDH-ES":
112112
try:
113113
dk_len = KEY_LEN[self.enc]
114-
except KeyError:
115-
raise ValueError("Unknown key length for algorithm %s" % self.enc)
114+
except KeyError as exc:
115+
raise ValueError("Unknown key length for algorithm %s" % self.enc) from exc
116116

117117
cek = ecdh_derive_key(_epk, key.pub_key, apu, apv, str(self.enc).encode(), dk_len)
118118
elif self.alg in ["ECDH-ES+A128KW", "ECDH-ES+A192KW", "ECDH-ES+A256KW"]:
@@ -153,8 +153,8 @@ def dec_setup(self, token, key=None, **kwargs):
153153
if self.headers["alg"] == "ECDH-ES":
154154
try:
155155
dk_len = KEY_LEN[self.headers["enc"]]
156-
except KeyError:
157-
raise Exception("Unknown key length for algorithm")
156+
except KeyError as exc:
157+
raise Exception("Unknown key length for algorithm") from exc
158158

159159
self.cek = ecdh_derive_key(
160160
key,
@@ -211,10 +211,7 @@ def encrypt(self, key=None, iv="", cek="", **kwargs):
211211
return jwe.pack(parts=[iv, ctxt, tag])
212212

213213
def decrypt(self, token=None, **kwargs):
214-
if isinstance(token, JWEnc):
215-
jwe = token
216-
else:
217-
jwe = JWEnc().unpack(token)
214+
jwe = token if isinstance(token, JWEnc) else JWEnc().unpack(token)
218215

219216
if not self.cek:
220217
raise Exception("Content Encryption Key is Not Yet Set")

‎src/cryptojwt/jwe/jwe_hmac.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ def decrypt(self, token, key=None, cek=None):
6767
if not key and not cek:
6868
raise MissingKey("On of key or cek must be specified")
6969

70-
if isinstance(token, JWEnc):
71-
jwe = token
72-
else:
73-
jwe = JWEnc().unpack(token)
70+
jwe = token if isinstance(token, JWEnc) else JWEnc().unpack(token)
7471

7572
if len(jwe) != 5:
7673
raise WrongNumberOfParts(len(jwe))

‎src/cryptojwt/jwe/jwe_rsa.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ def decrypt(self, token, key, cek=None):
9292
:param cek: Ephemeral cipher key
9393
:return: The decrypted message
9494
"""
95-
if not isinstance(token, JWEnc):
96-
jwe = JWEnc().unpack(token)
97-
else:
98-
jwe = token
95+
jwe = JWEnc().unpack(token) if not isinstance(token, JWEnc) else token
9996

10097
self.jwt = jwe.encrypted_key()
10198
jek = jwe.encrypted_key()

‎src/cryptojwt/jwe/jwekey.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def _generate_key(encalg, cek=""):
2929
except KeyError:
3030
try:
3131
_key = get_random_bytes(KEY_LEN_BYTES[encalg])
32-
except KeyError:
33-
raise ValueError("Unsupported encryption algorithm %s" % encalg)
32+
except KeyError as exc:
33+
raise ValueError("Unsupported encryption algorithm %s" % encalg) from exc
3434

3535
return _key
3636

‎src/cryptojwt/jwe/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ def get_keys_seclen_dgst(key, iv):
1818
# Select the digest to use based on key length
1919
try:
2020
seclen, hash_method = LENMET[len(key)]
21-
except KeyError:
22-
raise Exception("Invalid CBC+HMAC key length: %s bytes" % len(key))
21+
except KeyError as exc:
22+
raise Exception("Invalid CBC+HMAC key length: %s bytes" % len(key)) from exc
2323

2424
# Split the key
2525
ka = key[:seclen]

‎src/cryptojwt/jwk/asym.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def appropriate_for(self, usage, **kwargs):
3838
"""
3939
try:
4040
_use = USE[usage]
41-
except KeyError:
42-
raise ValueError("Unknown key usage")
41+
except KeyError as exc:
42+
raise ValueError("Unknown key usage") from exc
4343
else:
4444
if usage in ["sign", "decrypt"]:
4545
if not self.use or _use == self.use:

‎src/cryptojwt/jwk/ec.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ def ec_construct_public(num):
4545
"""
4646
try:
4747
_sec_crv = NIST2SEC[as_unicode(num["crv"])]
48-
except KeyError:
49-
raise UnsupportedECurve("Unsupported elliptic curve: {}".format(num["crv"]))
48+
except KeyError as exc:
49+
raise UnsupportedECurve("Unsupported elliptic curve: {}".format(num["crv"])) from exc
5050

5151
ecpn = ec.EllipticCurvePublicNumbers(num["x"], num["y"], _sec_crv())
5252
return ecpn.public_key()
@@ -152,8 +152,8 @@ def deserialize(self):
152152
{"x": _x, "y": _y, "crv": self.crv, "d": _d}
153153
)
154154
self.pub_key = self.priv_key.public_key()
155-
except ValueError as err:
156-
raise DeSerializationNotPossible(str(err))
155+
except ValueError as exc:
156+
raise DeSerializationNotPossible(str(exc)) from exc
157157
else:
158158
self.pub_key = ec_construct_public({"x": _x, "y": _y, "crv": self.crv})
159159

‎src/cryptojwt/jwk/hmac.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ def appropriate_for(self, usage, alg="HS256"):
8181
"""
8282
try:
8383
_use = USE[usage]
84-
except:
85-
raise ValueError("Unknown key usage")
84+
except Exception as exc:
85+
raise ValueError("Unknown key usage") from exc
8686
else:
8787
if not self.use or self.use == _use:
8888
if _use == "sig":
@@ -106,8 +106,8 @@ def encryption_key(self, alg, **kwargs):
106106

107107
try:
108108
tsize = ALG2KEYLEN[alg]
109-
except KeyError:
110-
raise UnsupportedAlgorithm(alg)
109+
except KeyError as exc:
110+
raise UnsupportedAlgorithm(alg) from exc
111111

112112
if tsize <= 32:
113113
# SHA256

‎src/cryptojwt/jwk/okp.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,16 @@ def deserialize(self):
145145
if isinstance(self.d, (str, bytes)):
146146
try:
147147
self.priv_key = OKP_CRV2PRIVATE[self.crv].from_private_bytes(deser(self.d))
148-
except KeyError:
149-
raise UnsupportedOKPCurve(f"Unsupported OKP curve: {self.crv}")
148+
except KeyError as exc:
149+
raise UnsupportedOKPCurve(f"Unsupported OKP curve: {self.crv}") from exc
150150
self.pub_key = self.priv_key.public_key()
151-
except ValueError as err:
152-
raise DeSerializationNotPossible(str(err))
151+
except ValueError as exc:
152+
raise DeSerializationNotPossible(str(exc)) from exc
153153
else:
154154
try:
155155
self.pub_key = OKP_CRV2PUBLIC[self.crv].from_public_bytes(_x)
156-
except KeyError:
157-
raise UnsupportedOKPCurve(f"Unsupported OKP curve: {self.crv}")
156+
except KeyError as exc:
157+
raise UnsupportedOKPCurve(f"Unsupported OKP curve: {self.crv}") from exc
158158

159159
def _serialize_public(self, key):
160160
self.x = b64e(

0 commit comments

Comments
 (0)