From 4319283bcdc4d9c1cef8e846bd43659f83e90c12 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Tue, 26 Jun 2018 14:48:59 +0200 Subject: log_in(): check if granted scopes are a superset of requested Currently, Pleroma does not actually have scopes, but grants "read write follow" in all cases. For compatibility, log_in() now checks if the granted scopes include all of the requested scopes, instead of checking if they match exactly. --- mastodon/Mastodon.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index a649349..2f7868b 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py @@ -342,8 +342,9 @@ class Mastodon: Handles password and OAuth-based authorization. - Will throw a `MastodonIllegalArgumentError` if username / password - are wrong, scopes are not valid or granted scopes differ from requested. + Will throw a `MastodonIllegalArgumentError` if the OAuth or the + username / password credentials given are incorrect, and + `MastodonAPIError` if all of the requested scopes were not granted. For OAuth2 documentation, compare https://github.com/doorkeeper-gem/doorkeeper/wiki/Interacting-as-an-OAuth-client-with-Doorkeeper @@ -379,12 +380,11 @@ class Mastodon: else: raise MastodonIllegalArgumentError('Invalid request: %s' % e) - requested_scopes = " ".join(sorted(scopes)) - received_scopes = " ".join(sorted(response["scope"].split(" "))) + received_scopes = response["scope"].split(" ") - if requested_scopes != received_scopes: + if not set(scopes) <= set(received_scopes): 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: with open(to_file, 'w') as token_file: -- cgit v1.2.3