spla/Mastodonplus.py
1
0
Fork 0
Codi Incidències Sol·licituds Pull repo.project Llançaments Paquets Wiki Activitat

Merge pull request #139 from DeeUnderscore/scopes-subset-check

Explorar la Font 
Make log_in() check if granted scopes are a superset of the requested scopes
This commit is contained in:
Lorenz Diener 2018-06-27 20:25:38 +02:00 cometido por GitHub
commit 58c3f745c3
No se encontró ninguna clave conocida en la base de datos para esta firma
ID de clave GPG: 4AEE18F83AFDEB23
S'han modificat 1 arxius amb 6 adicions i 6 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

12
mastodon/Mastodon.py
Veure arxiu

@ -342,8 +342,9 @@ class Mastodon:
Handles password and OAuth-based authorization. Handles password and OAuth-based authorization.
Will throw a `MastodonIllegalArgumentError` if username / password Will throw a `MastodonIllegalArgumentError` if the OAuth or the
are wrong, scopes are not valid or granted scopes differ from requested. username / password credentials given are incorrect, and
`MastodonAPIError` if all of the requested scopes were not granted.
For OAuth2 documentation, compare For OAuth2 documentation, compare
https://github.com/doorkeeper-gem/doorkeeper/wiki/Interacting-as-an-OAuth-client-with-Doorkeeper https://github.com/doorkeeper-gem/doorkeeper/wiki/Interacting-as-an-OAuth-client-with-Doorkeeper
@ -379,12 +380,11 @@ class Mastodon:
else: else:
raise MastodonIllegalArgumentError('Invalid request: %s' % e) raise MastodonIllegalArgumentError('Invalid request: %s' % e)
requested_scopes = " ".join(sorted(scopes)) received_scopes = response["scope"].split(" ")
received_scopes = " ".join(sorted(response["scope"].split(" ")))
if requested_scopes != received_scopes: if not set(scopes) <= set(received_scopes):
raise MastodonAPIError( raise MastodonAPIError(
'Granted scopes "' + received_scopes + '" differ from requested scopes "' + requested_scopes + '".') 'Granted scopes "' + " ".join(received_scopes) + '" do not contain all of the requested scopes "' + " ".join(scopes) + '".')
if to_file is not None: if to_file is not None:
with open(to_file, 'w') as token_file: with open(to_file, 'w') as token_file: