mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-06 13:11:15 -07:00
Update oauthlib-3.1.1
This commit is contained in:
parent
e58aa40099
commit
d76838a607
64 changed files with 4329 additions and 1421 deletions
|
@ -6,12 +6,13 @@ oauthlib.oauth2.rfc6749
|
|||
This module is an implementation of various logic needed
|
||||
for consuming and providing OAuth 2.0 RFC6749.
|
||||
"""
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
import warnings
|
||||
|
||||
from ..parameters import (
|
||||
parse_authorization_code_response, prepare_grant_uri,
|
||||
prepare_token_request,
|
||||
)
|
||||
from .base import Client
|
||||
from ..parameters import prepare_grant_uri, prepare_token_request
|
||||
from ..parameters import parse_authorization_code_response
|
||||
from ..parameters import parse_token_response
|
||||
|
||||
|
||||
class WebApplicationClient(Client):
|
||||
|
@ -32,9 +33,11 @@ class WebApplicationClient(Client):
|
|||
browser) and capable of receiving incoming requests (via redirection)
|
||||
from the authorization server.
|
||||
"""
|
||||
|
||||
grant_type = 'authorization_code'
|
||||
|
||||
def __init__(self, client_id, code=None, **kwargs):
|
||||
super(WebApplicationClient, self).__init__(client_id, **kwargs)
|
||||
super().__init__(client_id, **kwargs)
|
||||
self.code = code
|
||||
|
||||
def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
|
||||
|
@ -76,26 +79,24 @@ class WebApplicationClient(Client):
|
|||
>>> client.prepare_request_uri('https://example.com', foo='bar')
|
||||
'https://example.com?client_id=your_id&response_type=code&foo=bar'
|
||||
|
||||
.. _`Appendix B`: http://tools.ietf.org/html/rfc6749#appendix-B
|
||||
.. _`Section 2.2`: http://tools.ietf.org/html/rfc6749#section-2.2
|
||||
.. _`Section 3.1.2`: http://tools.ietf.org/html/rfc6749#section-3.1.2
|
||||
.. _`Section 3.3`: http://tools.ietf.org/html/rfc6749#section-3.3
|
||||
.. _`Section 10.12`: http://tools.ietf.org/html/rfc6749#section-10.12
|
||||
.. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
|
||||
.. _`Section 2.2`: https://tools.ietf.org/html/rfc6749#section-2.2
|
||||
.. _`Section 3.1.2`: https://tools.ietf.org/html/rfc6749#section-3.1.2
|
||||
.. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
|
||||
.. _`Section 10.12`: https://tools.ietf.org/html/rfc6749#section-10.12
|
||||
"""
|
||||
scope = self.scope if scope is None else scope
|
||||
return prepare_grant_uri(uri, self.client_id, 'code',
|
||||
redirect_uri=redirect_uri, scope=scope, state=state, **kwargs)
|
||||
|
||||
def prepare_request_body(self, client_id=None, code=None, body='',
|
||||
redirect_uri=None, **kwargs):
|
||||
def prepare_request_body(self, code=None, redirect_uri=None, body='',
|
||||
include_client_id=True, **kwargs):
|
||||
"""Prepare the access token request body.
|
||||
|
||||
The client makes a request to the token endpoint by adding the
|
||||
following parameters using the "application/x-www-form-urlencoded"
|
||||
format in the HTTP request entity-body:
|
||||
|
||||
:param client_id: REQUIRED, if the client is not authenticating with the
|
||||
authorization server as described in `Section 3.2.1`_.
|
||||
|
||||
:param code: REQUIRED. The authorization code received from the
|
||||
authorization server.
|
||||
|
||||
|
@ -103,6 +104,15 @@ class WebApplicationClient(Client):
|
|||
authorization request as described in `Section 4.1.1`_, and their
|
||||
values MUST be identical.
|
||||
|
||||
:param body: Existing request body (URL encoded string) to embed parameters
|
||||
into. This may contain extra paramters. Default ''.
|
||||
|
||||
:param include_client_id: `True` (default) to send the `client_id` in the
|
||||
body of the upstream request. This is required
|
||||
if the client is not authenticating with the
|
||||
authorization server as described in `Section 3.2.1`_.
|
||||
:type include_client_id: Boolean
|
||||
|
||||
:param kwargs: Extra parameters to include in the token request.
|
||||
|
||||
In addition OAuthLib will add the ``grant_type`` parameter set to
|
||||
|
@ -120,12 +130,31 @@ class WebApplicationClient(Client):
|
|||
>>> client.prepare_request_body(code='sh35ksdf09sf', foo='bar')
|
||||
'grant_type=authorization_code&code=sh35ksdf09sf&foo=bar'
|
||||
|
||||
.. _`Section 4.1.1`: http://tools.ietf.org/html/rfc6749#section-4.1.1
|
||||
.. _`Section 3.2.1`: http://tools.ietf.org/html/rfc6749#section-3.2.1
|
||||
`Section 3.2.1` also states:
|
||||
In the "authorization_code" "grant_type" request to the token
|
||||
endpoint, an unauthenticated client MUST send its "client_id" to
|
||||
prevent itself from inadvertently accepting a code intended for a
|
||||
client with a different "client_id". This protects the client from
|
||||
substitution of the authentication code. (It provides no additional
|
||||
security for the protected resource.)
|
||||
|
||||
.. _`Section 4.1.1`: https://tools.ietf.org/html/rfc6749#section-4.1.1
|
||||
.. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
|
||||
"""
|
||||
code = code or self.code
|
||||
return prepare_token_request('authorization_code', code=code, body=body,
|
||||
client_id=self.client_id, redirect_uri=redirect_uri, **kwargs)
|
||||
if 'client_id' in kwargs:
|
||||
warnings.warn("`client_id` has been deprecated in favor of "
|
||||
"`include_client_id`, a boolean value which will "
|
||||
"include the already configured `self.client_id`.",
|
||||
DeprecationWarning)
|
||||
if kwargs['client_id'] != self.client_id:
|
||||
raise ValueError("`client_id` was supplied as an argument, but "
|
||||
"it does not match `self.client_id`")
|
||||
|
||||
kwargs['client_id'] = self.client_id
|
||||
kwargs['include_client_id'] = include_client_id
|
||||
return prepare_token_request(self.grant_type, code=code, body=body,
|
||||
redirect_uri=redirect_uri, **kwargs)
|
||||
|
||||
def parse_request_uri_response(self, uri, state=None):
|
||||
"""Parse the URI query for code and state.
|
||||
|
@ -172,5 +201,5 @@ class WebApplicationClient(Client):
|
|||
oauthlib.oauth2.rfc6749.errors.MismatchingStateError
|
||||
"""
|
||||
response = parse_authorization_code_response(uri, state=state)
|
||||
self._populate_attributes(response)
|
||||
self.populate_code_attributes(response)
|
||||
return response
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue