diff options
author | Dariusz <github@smigiel.dev> | 2022-06-21 07:53:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 07:53:36 -0700 |
commit | f52f641d763e4958d108e875e0cd6fca50d110f2 (patch) | |
tree | 62b0c653973035c88d4044105fde43a25397ef53 /oauthlib | |
parent | ed0cb63945c4a5940b185823809693b7f97989ad (diff) | |
parent | bdc486e2bc3a188027a4ebec3a3013e64023ce62 (diff) | |
download | oauthlib-f52f641d763e4958d108e875e0cd6fca50d110f2.tar.gz |
Merge branch 'oauthlib:master' into master
Diffstat (limited to 'oauthlib')
-rw-r--r-- | oauthlib/common.py | 6 | ||||
-rw-r--r-- | oauthlib/oauth1/__init__.py | 35 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/base.py | 11 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/signature.py | 3 | ||||
-rw-r--r-- | oauthlib/oauth2/rfc6749/clients/base.py | 8 | ||||
-rw-r--r-- | oauthlib/oauth2/rfc8628/clients/device.py | 3 | ||||
-rw-r--r-- | oauthlib/openid/connect/core/grant_types/base.py | 1 | ||||
-rw-r--r-- | oauthlib/openid/connect/core/tokens.py | 4 |
8 files changed, 31 insertions, 40 deletions
diff --git a/oauthlib/common.py b/oauthlib/common.py index b5fbf52..395e75e 100644 --- a/oauthlib/common.py +++ b/oauthlib/common.py @@ -18,11 +18,9 @@ from urllib.parse import ( from . import get_debug try: - from secrets import randbits - from secrets import SystemRandom + from secrets import SystemRandom, randbits except ImportError: - from random import getrandbits as randbits - from random import SystemRandom + from random import SystemRandom, getrandbits as randbits UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' diff --git a/oauthlib/oauth1/__init__.py b/oauthlib/oauth1/__init__.py index 07ef422..9caf12a 100644 --- a/oauthlib/oauth1/__init__.py +++ b/oauthlib/oauth1/__init__.py @@ -5,24 +5,19 @@ oauthlib.oauth1 This module is a wrapper for the most recent implementation of OAuth 1.0 Client and Server classes. """ -from .rfc5849 import Client -from .rfc5849 import (SIGNATURE_HMAC, - SIGNATURE_HMAC_SHA1, - SIGNATURE_HMAC_SHA256, - SIGNATURE_HMAC_SHA512, - SIGNATURE_RSA, - SIGNATURE_RSA_SHA1, - SIGNATURE_RSA_SHA256, - SIGNATURE_RSA_SHA512, - SIGNATURE_PLAINTEXT) -from .rfc5849 import SIGNATURE_TYPE_AUTH_HEADER, SIGNATURE_TYPE_QUERY -from .rfc5849 import SIGNATURE_TYPE_BODY +from .rfc5849 import ( + SIGNATURE_HMAC, SIGNATURE_HMAC_SHA1, SIGNATURE_HMAC_SHA256, + SIGNATURE_HMAC_SHA512, SIGNATURE_PLAINTEXT, SIGNATURE_RSA, + SIGNATURE_RSA_SHA1, SIGNATURE_RSA_SHA256, SIGNATURE_RSA_SHA512, + SIGNATURE_TYPE_AUTH_HEADER, SIGNATURE_TYPE_BODY, SIGNATURE_TYPE_QUERY, + Client, +) +from .rfc5849.endpoints import ( + AccessTokenEndpoint, AuthorizationEndpoint, RequestTokenEndpoint, + ResourceEndpoint, SignatureOnlyEndpoint, WebApplicationServer, +) +from .rfc5849.errors import ( + InsecureTransportError, InvalidClientError, InvalidRequestError, + InvalidSignatureMethodError, OAuth1Error, +) from .rfc5849.request_validator import RequestValidator -from .rfc5849.endpoints import RequestTokenEndpoint, AuthorizationEndpoint -from .rfc5849.endpoints import AccessTokenEndpoint, ResourceEndpoint -from .rfc5849.endpoints import SignatureOnlyEndpoint, WebApplicationServer -from .rfc5849.errors import (InsecureTransportError, - InvalidClientError, - InvalidRequestError, - InvalidSignatureMethodError, - OAuth1Error) diff --git a/oauthlib/oauth1/rfc5849/endpoints/base.py b/oauthlib/oauth1/rfc5849/endpoints/base.py index 3a8c267..7831be7 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/base.py +++ b/oauthlib/oauth1/rfc5849/endpoints/base.py @@ -11,12 +11,11 @@ import time from oauthlib.common import CaseInsensitiveDict, Request, generate_token from .. import ( - CONTENT_TYPE_FORM_URLENCODED, - SIGNATURE_HMAC_SHA1, SIGNATURE_HMAC_SHA256, SIGNATURE_HMAC_SHA512, - SIGNATURE_RSA_SHA1, SIGNATURE_RSA_SHA256, SIGNATURE_RSA_SHA512, - SIGNATURE_PLAINTEXT, - SIGNATURE_TYPE_AUTH_HEADER, SIGNATURE_TYPE_BODY, - SIGNATURE_TYPE_QUERY, errors, signature, utils) + CONTENT_TYPE_FORM_URLENCODED, SIGNATURE_HMAC_SHA1, SIGNATURE_HMAC_SHA256, + SIGNATURE_HMAC_SHA512, SIGNATURE_PLAINTEXT, SIGNATURE_RSA_SHA1, + SIGNATURE_RSA_SHA256, SIGNATURE_RSA_SHA512, SIGNATURE_TYPE_AUTH_HEADER, + SIGNATURE_TYPE_BODY, SIGNATURE_TYPE_QUERY, errors, signature, utils, +) class BaseEndpoint: diff --git a/oauthlib/oauth1/rfc5849/signature.py b/oauthlib/oauth1/rfc5849/signature.py index 7e8044a..862c3f3 100644 --- a/oauthlib/oauth1/rfc5849/signature.py +++ b/oauthlib/oauth1/rfc5849/signature.py @@ -39,14 +39,13 @@ import hashlib import hmac import ipaddress import logging +import urllib.parse as urlparse import warnings from oauthlib.common import extract_params, safe_string_equals, urldecode -import urllib.parse as urlparse from . import utils - log = logging.getLogger(__name__) diff --git a/oauthlib/oauth2/rfc6749/clients/base.py b/oauthlib/oauth2/rfc6749/clients/base.py index 6a5d0dc..0dbf1c0 100644 --- a/oauthlib/oauth2/rfc6749/clients/base.py +++ b/oauthlib/oauth2/rfc6749/clients/base.py @@ -6,12 +6,12 @@ oauthlib.oauth2.rfc6749 This module is an implementation of various logic needed for consuming OAuth 2.0 RFC6749. """ +import base64 +import hashlib +import re +import secrets import time import warnings -import secrets -import re -import hashlib -import base64 from oauthlib.common import generate_token from oauthlib.oauth2.rfc6749 import tokens diff --git a/oauthlib/oauth2/rfc8628/clients/device.py b/oauthlib/oauth2/rfc8628/clients/device.py index 4707cc5..b9ba215 100644 --- a/oauthlib/oauth2/rfc8628/clients/device.py +++ b/oauthlib/oauth2/rfc8628/clients/device.py @@ -5,12 +5,11 @@ oauthlib.oauth2.rfc8628 This module is an implementation of various logic needed for consuming and providing OAuth 2.0 Device Authorization RFC8628. """ - +from oauthlib.common import add_params_to_uri from oauthlib.oauth2 import BackendApplicationClient, Client from oauthlib.oauth2.rfc6749.errors import InsecureTransportError from oauthlib.oauth2.rfc6749.parameters import prepare_token_request from oauthlib.oauth2.rfc6749.utils import is_secure_transport, list_to_scope -from oauthlib.common import add_params_to_uri class DeviceClient(Client): diff --git a/oauthlib/openid/connect/core/grant_types/base.py b/oauthlib/openid/connect/core/grant_types/base.py index 76173e6..33411da 100644 --- a/oauthlib/openid/connect/core/grant_types/base.py +++ b/oauthlib/openid/connect/core/grant_types/base.py @@ -8,7 +8,6 @@ from oauthlib.oauth2.rfc6749.errors import ( ConsentRequired, InvalidRequestError, LoginRequired, ) - log = logging.getLogger(__name__) diff --git a/oauthlib/openid/connect/core/tokens.py b/oauthlib/openid/connect/core/tokens.py index a312e2d..936ab52 100644 --- a/oauthlib/openid/connect/core/tokens.py +++ b/oauthlib/openid/connect/core/tokens.py @@ -4,7 +4,9 @@ authlib.openid.connect.core.tokens This module contains methods for adding JWT tokens to requests. """ -from oauthlib.oauth2.rfc6749.tokens import TokenBase, random_token_generator, get_token_from_header +from oauthlib.oauth2.rfc6749.tokens import ( + TokenBase, get_token_from_header, random_token_generator, +) class JWTToken(TokenBase): |