github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-06 05:01:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump pyjwt from 2.9.0 to 2.10.0 (#2441)

Browse source 
* Bump pyjwt from 2.9.0 to 2.10.0

Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jpadilla/pyjwt/compare/2.9.0...2.10.0)

---
updated-dependencies:
- dependency-name: pyjwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update pyjwt==2.10.0

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>

[skip ci]
This commit is contained in:
dependabot[bot] 2024-11-19 10:01:27 -08:00 • committed by GitHub
parent feca713b76
commit dd9a35df51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 152 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/jwt/__init__.py
View file

@ -6,7 +6,7 @@ from .api_jws import (
register_algorithm, register_algorithm,
unregister_algorithm, unregister_algorithm,
) )
from .api_jwt import PyJWT, decode, encode from .api_jwt import PyJWT, decode, decode_complete, encode
from .exceptions import ( from .exceptions import (
DecodeError, DecodeError,
ExpiredSignatureError, ExpiredSignatureError,
@ -27,7 +27,7 @@ from .exceptions import (
) )
from .jwks_client import PyJWKClient from .jwks_client import PyJWKClient
__version__ = "2.9.0" __version__ = "2.10.0"
__title__ = "PyJWT" __title__ = "PyJWT"
__description__ = "JSON Web Token implementation in Python" __description__ = "JSON Web Token implementation in Python"
@ -49,6 +49,7 @@ __all__ = [
"PyJWK", "PyJWK",
"PyJWKSet", "PyJWKSet",
"decode", "decode",
"decode_complete",
"encode", "encode",
"get_unverified_header", "get_unverified_header",
"register_algorithm", "register_algorithm",

47
lib/jwt/algorithms.py
View file

@ -297,7 +297,7 @@ class HMACAlgorithm(Algorithm):
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
raise InvalidKeyError("Key is not valid JSON") raise InvalidKeyError("Key is not valid JSON") from None
if obj.get("kty") != "oct": if obj.get("kty") != "oct":
raise InvalidKeyError("Not an HMAC key") raise InvalidKeyError("Not an HMAC key")
@ -346,7 +346,9 @@ if has_crypto:
try: try:
return cast(RSAPublicKey, load_pem_public_key(key_bytes)) return cast(RSAPublicKey, load_pem_public_key(key_bytes))
except (ValueError, UnsupportedAlgorithm): except (ValueError, UnsupportedAlgorithm):
raise InvalidKeyError("Could not parse the provided public key.") raise InvalidKeyError(
"Could not parse the provided public key."
) from None
@overload @overload
@staticmethod @staticmethod
@ -409,10 +411,10 @@ if has_crypto:
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
raise InvalidKeyError("Key is not valid JSON") raise InvalidKeyError("Key is not valid JSON") from None
if obj.get("kty") != "RSA": if obj.get("kty") != "RSA":
raise InvalidKeyError("Not an RSA key") raise InvalidKeyError("Not an RSA key") from None
if "d" in obj and "e" in obj and "n" in obj: if "d" in obj and "e" in obj and "n" in obj:
# Private key # Private key
@ -428,7 +430,7 @@ if has_crypto:
if any_props_found and not all(props_found): if any_props_found and not all(props_found):
raise InvalidKeyError( raise InvalidKeyError(
"RSA key must include all parameters if any are present besides d" "RSA key must include all parameters if any are present besides d"
) ) from None
public_numbers = RSAPublicNumbers( public_numbers = RSAPublicNumbers(
from_base64url_uint(obj["e"]), from_base64url_uint(obj["e"]),
@ -520,7 +522,7 @@ if has_crypto:
): ):
raise InvalidKeyError( raise InvalidKeyError(
"Expecting a EllipticCurvePrivateKey/EllipticCurvePublicKey. Wrong key provided for ECDSA algorithms" "Expecting a EllipticCurvePrivateKey/EllipticCurvePublicKey. Wrong key provided for ECDSA algorithms"
) ) from None
return crypto_key return crypto_key
@ -581,13 +583,20 @@ if has_crypto:
obj: dict[str, Any] = { obj: dict[str, Any] = {
"kty": "EC", "kty": "EC",
"crv": crv, "crv": crv,
"x": to_base64url_uint(public_numbers.x).decode(), "x": to_base64url_uint(
"y": to_base64url_uint(public_numbers.y).decode(), public_numbers.x,
bit_length=key_obj.curve.key_size,
).decode(),
"y": to_base64url_uint(
public_numbers.y,
bit_length=key_obj.curve.key_size,
).decode(),
} }
if isinstance(key_obj, EllipticCurvePrivateKey): if isinstance(key_obj, EllipticCurvePrivateKey):
obj["d"] = to_base64url_uint( obj["d"] = to_base64url_uint(
key_obj.private_numbers().private_value key_obj.private_numbers().private_value,
bit_length=key_obj.curve.key_size,
).decode() ).decode()
if as_dict: if as_dict:
@ -605,13 +614,13 @@ if has_crypto:
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
raise InvalidKeyError("Key is not valid JSON") raise InvalidKeyError("Key is not valid JSON") from None
if obj.get("kty") != "EC": if obj.get("kty") != "EC":
raise InvalidKeyError("Not an Elliptic curve key") raise InvalidKeyError("Not an Elliptic curve key") from None
if "x" not in obj or "y" not in obj: if "x" not in obj or "y" not in obj:
raise InvalidKeyError("Not an Elliptic curve key") raise InvalidKeyError("Not an Elliptic curve key") from None
x = base64url_decode(obj.get("x")) x = base64url_decode(obj.get("x"))
y = base64url_decode(obj.get("y")) y = base64url_decode(obj.get("y"))
@ -623,17 +632,23 @@ if has_crypto:
if len(x) == len(y) == 32: if len(x) == len(y) == 32:
curve_obj = SECP256R1() curve_obj = SECP256R1()
else: else:
raise InvalidKeyError("Coords should be 32 bytes for curve P-256") raise InvalidKeyError(
"Coords should be 32 bytes for curve P-256"
) from None
elif curve == "P-384": elif curve == "P-384":
if len(x) == len(y) == 48: if len(x) == len(y) == 48:
curve_obj = SECP384R1() curve_obj = SECP384R1()
else: else:
raise InvalidKeyError("Coords should be 48 bytes for curve P-384") raise InvalidKeyError(
"Coords should be 48 bytes for curve P-384"
) from None
elif curve == "P-521": elif curve == "P-521":
if len(x) == len(y) == 66: if len(x) == len(y) == 66:
curve_obj = SECP521R1() curve_obj = SECP521R1()
else: else:
raise InvalidKeyError("Coords should be 66 bytes for curve P-521") raise InvalidKeyError(
"Coords should be 66 bytes for curve P-521"
) from None
elif curve == "secp256k1": elif curve == "secp256k1":
if len(x) == len(y) == 32: if len(x) == len(y) == 32:
curve_obj = SECP256K1() curve_obj = SECP256K1()
@ -834,7 +849,7 @@ if has_crypto:
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
raise InvalidKeyError("Key is not valid JSON") raise InvalidKeyError("Key is not valid JSON") from None
if obj.get("kty") != "OKP": if obj.get("kty") != "OKP":
raise InvalidKeyError("Not an Octet Key Pair") raise InvalidKeyError("Not an Octet Key Pair")

27
lib/jwt/api_jws.py
View file

@ -3,6 +3,7 @@ from __future__ import annotations
import binascii import binascii
import json import json
import warnings import warnings
from collections.abc import Sequence
from typing import TYPE_CHECKING, Any from typing import TYPE_CHECKING, Any
from .algorithms import ( from .algorithms import (
@ -30,7 +31,7 @@ class PyJWS:
def __init__( def __init__(
self, self,
algorithms: list[str] | None = None, algorithms: Sequence[str] | None = None,
options: dict[str, Any] | None = None, options: dict[str, Any] | None = None,
) -> None: ) -> None:
self._algorithms = get_default_algorithms() self._algorithms = get_default_algorithms()
@ -104,8 +105,8 @@ class PyJWS:
def encode( def encode(
self, self,
payload: bytes, payload: bytes,
key: AllowedPrivateKeys | str | bytes, key: AllowedPrivateKeys | PyJWK | str | bytes,
algorithm: str | None = "HS256", algorithm: str | None = None,
headers: dict[str, Any] | None = None, headers: dict[str, Any] | None = None,
json_encoder: type[json.JSONEncoder] | None = None, json_encoder: type[json.JSONEncoder] | None = None,
is_payload_detached: bool = False, is_payload_detached: bool = False,
@ -114,7 +115,13 @@ class PyJWS:
segments = [] segments = []
# declare a new var to narrow the type for type checkers # declare a new var to narrow the type for type checkers
algorithm_: str = algorithm if algorithm is not None else "none" if algorithm is None:
if isinstance(key, PyJWK):
algorithm_ = key.algorithm_name
else:
algorithm_ = "HS256"
else:
algorithm_ = algorithm
# Prefer headers values if present to function parameters. # Prefer headers values if present to function parameters.
if headers: if headers:
@ -158,6 +165,8 @@ class PyJWS:
signing_input = b".".join(segments) signing_input = b".".join(segments)
alg_obj = self.get_algorithm_by_name(algorithm_) alg_obj = self.get_algorithm_by_name(algorithm_)
if isinstance(key, PyJWK):
key = key.key
key = alg_obj.prepare_key(key) key = alg_obj.prepare_key(key)
signature = alg_obj.sign(signing_input, key) signature = alg_obj.sign(signing_input, key)
@ -174,7 +183,7 @@ class PyJWS:
self, self,
jwt: str | bytes, jwt: str | bytes,
key: AllowedPublicKeys | PyJWK | str | bytes = "", key: AllowedPublicKeys | PyJWK | str | bytes = "",
algorithms: list[str] | None = None, algorithms: Sequence[str] | None = None,
options: dict[str, Any] | None = None, options: dict[str, Any] | None = None,
detached_payload: bytes | None = None, detached_payload: bytes | None = None,
**kwargs, **kwargs,
@ -185,6 +194,7 @@ class PyJWS:
"and will be removed in pyjwt version 3. " "and will be removed in pyjwt version 3. "
f"Unsupported kwargs: {tuple(kwargs.keys())}", f"Unsupported kwargs: {tuple(kwargs.keys())}",
RemovedInPyjwt3Warning, RemovedInPyjwt3Warning,
stacklevel=2,
) )
if options is None: if options is None:
options = {} options = {}
@ -219,7 +229,7 @@ class PyJWS:
self, self,
jwt: str | bytes, jwt: str | bytes,
key: AllowedPublicKeys | PyJWK | str | bytes = "", key: AllowedPublicKeys | PyJWK | str | bytes = "",
algorithms: list[str] | None = None, algorithms: Sequence[str] | None = None,
options: dict[str, Any] | None = None, options: dict[str, Any] | None = None,
detached_payload: bytes | None = None, detached_payload: bytes | None = None,
**kwargs, **kwargs,
@ -230,6 +240,7 @@ class PyJWS:
"and will be removed in pyjwt version 3. " "and will be removed in pyjwt version 3. "
f"Unsupported kwargs: {tuple(kwargs.keys())}", f"Unsupported kwargs: {tuple(kwargs.keys())}",
RemovedInPyjwt3Warning, RemovedInPyjwt3Warning,
stacklevel=2,
) )
decoded = self.decode_complete( decoded = self.decode_complete(
jwt, key, algorithms, options, detached_payload=detached_payload jwt, key, algorithms, options, detached_payload=detached_payload
@ -291,14 +302,14 @@ class PyJWS:
header: dict[str, Any], header: dict[str, Any],
signature: bytes, signature: bytes,
key: AllowedPublicKeys | PyJWK | str | bytes = "", key: AllowedPublicKeys | PyJWK | str | bytes = "",
algorithms: list[str] | None = None, algorithms: Sequence[str] | None = None,
) -> None: ) -> None:
if algorithms is None and isinstance(key, PyJWK): if algorithms is None and isinstance(key, PyJWK):
algorithms = [key.algorithm_name] algorithms = [key.algorithm_name]
try: try:
alg = header["alg"] alg = header["alg"]
except KeyError: except KeyError:
raise InvalidAlgorithmError("Algorithm not specified") raise InvalidAlgorithmError("Algorithm not specified") from None
if not alg or (algorithms is not None and alg not in algorithms): if not alg or (algorithms is not None and alg not in algorithms):
raise InvalidAlgorithmError("The specified alg value is not allowed") raise InvalidAlgorithmError("The specified alg value is not allowed")

94
lib/jwt/api_jwt.py
View file

@ -3,9 +3,9 @@ from __future__ import annotations
import json import json
import warnings import warnings
from calendar import timegm from calendar import timegm
from collections.abc import Iterable from collections.abc import Iterable, Sequence
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from typing import TYPE_CHECKING, Any, List from typing import TYPE_CHECKING, Any
from . import api_jws from . import api_jws
from .exceptions import ( from .exceptions import (
@ -15,6 +15,8 @@ from .exceptions import (
InvalidAudienceError, InvalidAudienceError,
InvalidIssuedAtError, InvalidIssuedAtError,
InvalidIssuerError, InvalidIssuerError,
InvalidJTIError,
InvalidSubjectError,
MissingRequiredClaimError, MissingRequiredClaimError,
) )
from .warnings import RemovedInPyjwt3Warning from .warnings import RemovedInPyjwt3Warning
@ -39,14 +41,16 @@ class PyJWT:
"verify_iat": True, "verify_iat": True,
"verify_aud": True, "verify_aud": True,
"verify_iss": True, "verify_iss": True,
"verify_sub": True,
"verify_jti": True,
"require": [], "require": [],
} }
def encode( def encode(
self, self,
payload: dict[str, Any], payload: dict[str, Any],
key: AllowedPrivateKeys | str | bytes, key: AllowedPrivateKeys | PyJWK | str | bytes,
algorithm: str | None = "HS256", algorithm: str | None = None,
headers: dict[str, Any] | None = None, headers: dict[str, Any] | None = None,
json_encoder: type[json.JSONEncoder] | None = None, json_encoder: type[json.JSONEncoder] | None = None,
sort_headers: bool = True, sort_headers: bool = True,
@ -102,7 +106,7 @@ class PyJWT:
self, self,
jwt: str | bytes, jwt: str | bytes,
key: AllowedPublicKeys | PyJWK | str | bytes = "", key: AllowedPublicKeys | PyJWK | str | bytes = "",
algorithms: list[str] | None = None, algorithms: Sequence[str] | None = None,
options: dict[str, Any] | None = None, options: dict[str, Any] | None = None,
# deprecated arg, remove in pyjwt3 # deprecated arg, remove in pyjwt3
verify: bool | None = None, verify: bool | None = None,
@ -111,7 +115,8 @@ class PyJWT:
# passthrough arguments to _validate_claims # passthrough arguments to _validate_claims
# consider putting in options # consider putting in options
audience: str | Iterable[str] | None = None, audience: str | Iterable[str] | None = None,
issuer: str | List[str] | None = None, issuer: str | Sequence[str] | None = None,
subject: str | None = None,
leeway: float | timedelta = 0, leeway: float | timedelta = 0,
# kwargs # kwargs
**kwargs: Any, **kwargs: Any,
@ -122,6 +127,7 @@ class PyJWT:
"and will be removed in pyjwt version 3. " "and will be removed in pyjwt version 3. "
f"Unsupported kwargs: {tuple(kwargs.keys())}", f"Unsupported kwargs: {tuple(kwargs.keys())}",
RemovedInPyjwt3Warning, RemovedInPyjwt3Warning,
stacklevel=2,
) )
options = dict(options or {}) # shallow-copy or initialize an empty dict options = dict(options or {}) # shallow-copy or initialize an empty dict
options.setdefault("verify_signature", True) options.setdefault("verify_signature", True)
@ -135,6 +141,7 @@ class PyJWT:
"The equivalent is setting `verify_signature` to False in the `options` dictionary. " "The equivalent is setting `verify_signature` to False in the `options` dictionary. "
"This invocation has a mismatch between the kwarg and the option entry.", "This invocation has a mismatch between the kwarg and the option entry.",
category=DeprecationWarning, category=DeprecationWarning,
stacklevel=2,
) )
if not options["verify_signature"]: if not options["verify_signature"]:
@ -143,11 +150,8 @@ class PyJWT:
options.setdefault("verify_iat", False) options.setdefault("verify_iat", False)
options.setdefault("verify_aud", False) options.setdefault("verify_aud", False)
options.setdefault("verify_iss", False) options.setdefault("verify_iss", False)
options.setdefault("verify_sub", False)
if options["verify_signature"] and not algorithms: options.setdefault("verify_jti", False)
raise DecodeError(
'It is required that you pass in a value for the "algorithms" argument when calling decode().'
)
decoded = api_jws.decode_complete( decoded = api_jws.decode_complete(
jwt, jwt,
@ -161,7 +165,12 @@ class PyJWT:
merged_options = {**self.options, **options} merged_options = {**self.options, **options}
self._validate_claims( self._validate_claims(
payload, merged_options, audience=audience, issuer=issuer, leeway=leeway payload,
merged_options,
audience=audience,
issuer=issuer,
leeway=leeway,
subject=subject,
) )
decoded["payload"] = payload decoded["payload"] = payload
@ -178,7 +187,7 @@ class PyJWT:
try: try:
payload = json.loads(decoded["payload"]) payload = json.loads(decoded["payload"])
except ValueError as e: except ValueError as e:
raise DecodeError(f"Invalid payload string: {e}") raise DecodeError(f"Invalid payload string: {e}") from e
if not isinstance(payload, dict): if not isinstance(payload, dict):
raise DecodeError("Invalid payload string: must be a json object") raise DecodeError("Invalid payload string: must be a json object")
return payload return payload
@ -187,7 +196,7 @@ class PyJWT:
self, self,
jwt: str | bytes, jwt: str | bytes,
key: AllowedPublicKeys | PyJWK | str | bytes = "", key: AllowedPublicKeys | PyJWK | str | bytes = "",
algorithms: list[str] | None = None, algorithms: Sequence[str] | None = None,
options: dict[str, Any] | None = None, options: dict[str, Any] | None = None,
# deprecated arg, remove in pyjwt3 # deprecated arg, remove in pyjwt3
verify: bool | None = None, verify: bool | None = None,
@ -196,7 +205,8 @@ class PyJWT:
# passthrough arguments to _validate_claims # passthrough arguments to _validate_claims
# consider putting in options # consider putting in options
audience: str | Iterable[str] | None = None, audience: str | Iterable[str] | None = None,
issuer: str | List[str] | None = None, subject: str | None = None,
issuer: str | Sequence[str] | None = None,
leeway: float | timedelta = 0, leeway: float | timedelta = 0,
# kwargs # kwargs
**kwargs: Any, **kwargs: Any,
@ -207,6 +217,7 @@ class PyJWT:
"and will be removed in pyjwt version 3. " "and will be removed in pyjwt version 3. "
f"Unsupported kwargs: {tuple(kwargs.keys())}", f"Unsupported kwargs: {tuple(kwargs.keys())}",
RemovedInPyjwt3Warning, RemovedInPyjwt3Warning,
stacklevel=2,
) )
decoded = self.decode_complete( decoded = self.decode_complete(
jwt, jwt,
@ -216,6 +227,7 @@ class PyJWT:
verify=verify, verify=verify,
detached_payload=detached_payload, detached_payload=detached_payload,
audience=audience, audience=audience,
subject=subject,
issuer=issuer, issuer=issuer,
leeway=leeway, leeway=leeway,
) )
@ -227,6 +239,7 @@ class PyJWT:
options: dict[str, Any], options: dict[str, Any],
audience=None, audience=None,
issuer=None, issuer=None,
subject: str | None = None,
leeway: float | timedelta = 0, leeway: float | timedelta = 0,
) -> None: ) -> None:
if isinstance(leeway, timedelta): if isinstance(leeway, timedelta):
@ -256,6 +269,12 @@ class PyJWT:
payload, audience, strict=options.get("strict_aud", False) payload, audience, strict=options.get("strict_aud", False)
) )
if options["verify_sub"]:
self._validate_sub(payload, subject)
if options["verify_jti"]:
self._validate_jti(payload)
def _validate_required_claims( def _validate_required_claims(
self, self,
payload: dict[str, Any], payload: dict[str, Any],
@ -265,6 +284,39 @@ class PyJWT:
if payload.get(claim) is None: if payload.get(claim) is None:
raise MissingRequiredClaimError(claim) raise MissingRequiredClaimError(claim)
def _validate_sub(self, payload: dict[str, Any], subject=None) -> None:
"""
Checks whether "sub" if in the payload is valid ot not.
This is an Optional claim
:param payload(dict): The payload which needs to be validated
:param subject(str): The subject of the token
"""
if "sub" not in payload:
return
if not isinstance(payload["sub"], str):
raise InvalidSubjectError("Subject must be a string")
if subject is not None:
if payload.get("sub") != subject:
raise InvalidSubjectError("Invalid subject")
def _validate_jti(self, payload: dict[str, Any]) -> None:
"""
Checks whether "jti" if in the payload is valid ot not
This is an Optional claim
:param payload(dict): The payload which needs to be validated
"""
if "jti" not in payload:
return
if not isinstance(payload.get("jti"), str):
raise InvalidJTIError("JWT ID must be a string")
def _validate_iat( def _validate_iat(
self, self,
payload: dict[str, Any], payload: dict[str, Any],
@ -274,7 +326,9 @@ class PyJWT:
try: try:
iat = int(payload["iat"]) iat = int(payload["iat"])
except ValueError: except ValueError:
raise InvalidIssuedAtError("Issued At claim (iat) must be an integer.") raise InvalidIssuedAtError(
"Issued At claim (iat) must be an integer."
) from None
if iat > (now + leeway): if iat > (now + leeway):
raise ImmatureSignatureError("The token is not yet valid (iat)") raise ImmatureSignatureError("The token is not yet valid (iat)")
@ -287,7 +341,7 @@ class PyJWT:
try: try:
nbf = int(payload["nbf"]) nbf = int(payload["nbf"])
except ValueError: except ValueError:
raise DecodeError("Not Before claim (nbf) must be an integer.") raise DecodeError("Not Before claim (nbf) must be an integer.") from None
if nbf > (now + leeway): if nbf > (now + leeway):
raise ImmatureSignatureError("The token is not yet valid (nbf)") raise ImmatureSignatureError("The token is not yet valid (nbf)")
@ -301,7 +355,9 @@ class PyJWT:
try: try:
exp = int(payload["exp"]) exp = int(payload["exp"])
except ValueError: except ValueError:
raise DecodeError("Expiration Time claim (exp) must be an integer.") raise DecodeError(
"Expiration Time claim (exp) must be an integer."
) from None
if exp <= (now - leeway): if exp <= (now - leeway):
raise ExpiredSignatureError("Signature has expired") raise ExpiredSignatureError("Signature has expired")
@ -363,7 +419,7 @@ class PyJWT:
if "iss" not in payload: if "iss" not in payload:
raise MissingRequiredClaimError("iss") raise MissingRequiredClaimError("iss")
if isinstance(issuer, list): if isinstance(issuer, Sequence):
if payload["iss"] not in issuer: if payload["iss"] not in issuer:
raise InvalidIssuerError("Invalid issuer") raise InvalidIssuerError("Invalid issuer")
else: else:

8
lib/jwt/exceptions.py
View file

@ -72,3 +72,11 @@ class PyJWKClientError(PyJWTError):
class PyJWKClientConnectionError(PyJWKClientError): class PyJWKClientConnectionError(PyJWKClientError):
pass pass
class InvalidSubjectError(InvalidTokenError):
pass
class InvalidJTIError(InvalidTokenError):
pass

5
lib/jwt/help.py
View file

@ -39,7 +39,10 @@ def info() -> Dict[str, Dict[str, str]]:
) )
if pypy_version_info.releaselevel != "final": if pypy_version_info.releaselevel != "final":
implementation_version = "".join( implementation_version = "".join(
[implementation_version, pypy_version_info.releaselevel] [
implementation_version,
pypy_version_info.releaselevel,
]
) )
else: else:
implementation_version = "Unknown" implementation_version = "Unknown"

6
lib/jwt/jwks_client.py
View file

@ -45,7 +45,9 @@ class PyJWKClient:
if cache_keys: if cache_keys:
# Cache signing keys # Cache signing keys
# Ignore mypy (https://github.com/python/mypy/issues/2427) # Ignore mypy (https://github.com/python/mypy/issues/2427)
self.get_signing_key = lru_cache(maxsize=max_cached_keys)(self.get_signing_key) # type: ignore self.get_signing_key = lru_cache(maxsize=max_cached_keys)(
self.get_signing_key
) # type: ignore
def fetch_data(self) -> Any: def fetch_data(self) -> Any:
jwk_set: Any = None jwk_set: Any = None
@ -58,7 +60,7 @@ class PyJWKClient:
except (URLError, TimeoutError) as e: except (URLError, TimeoutError) as e:
raise PyJWKClientConnectionError( raise PyJWKClientConnectionError(
f'Fail to fetch data from the url, err: "{e}"' f'Fail to fetch data from the url, err: "{e}"'
) ) from e
else: else:
return jwk_set return jwk_set
finally: finally:

17
lib/jwt/utils.py
View file

@ -1,7 +1,7 @@
import base64 import base64
import binascii import binascii
import re import re
from typing import Union from typing import Optional, Union
try: try:
from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurve from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurve
@ -37,11 +37,11 @@ def base64url_encode(input: bytes) -> bytes:
return base64.urlsafe_b64encode(input).replace(b"=", b"") return base64.urlsafe_b64encode(input).replace(b"=", b"")
def to_base64url_uint(val: int) -> bytes: def to_base64url_uint(val: int, *, bit_length: Optional[int] = None) -> bytes:
if val < 0: if val < 0:
raise ValueError("Must be a positive integer") raise ValueError("Must be a positive integer")
int_bytes = bytes_from_int(val) int_bytes = bytes_from_int(val, bit_length=bit_length)
if len(int_bytes) == 0: if len(int_bytes) == 0:
int_bytes = b"\x00" int_bytes = b"\x00"
@ -63,13 +63,10 @@ def bytes_to_number(string: bytes) -> int:
return int(binascii.b2a_hex(string), 16) return int(binascii.b2a_hex(string), 16)
def bytes_from_int(val: int) -> bytes: def bytes_from_int(val: int, *, bit_length: Optional[int] = None) -> bytes:
remaining = val if bit_length is None:
byte_length = 0 bit_length = val.bit_length()
byte_length = (bit_length + 7) // 8
while remaining != 0:
remaining >>= 8
byte_length += 1
return val.to_bytes(byte_length, "big", signed=False) return val.to_bytes(byte_length, "big", signed=False)

2
requirements.txt
View file

@ -28,7 +28,7 @@ platformdirs==4.3.6
plexapi==4.16.0 plexapi==4.16.0
portend==3.2.0 portend==3.2.0
profilehooks==1.13.0 profilehooks==1.13.0
PyJWT==2.9.0 PyJWT==2.10.0
pyparsing==3.2.0 pyparsing==3.2.0
python-dateutil==2.9.0.post0 python-dateutil==2.9.0.post0
python-twitter==3.5 python-twitter==3.5