Fix to revocation endpoint

This commit updates the validator (`MyRequestValidator`) object, so the method
`authenticate_client`, now is overridden and checks if a client is
public before checking if client secrets match.

Signed-off-by: Jonas Brunsgaard <jonas.brunsgaard@gmail.com>

Author: brunsgaard

models.py

@@ -162,6 +162,10 @@ class Token(db.Model):
     expires = db.Column(db.DateTime)
     scopes = ['']
 
+    def delete(self):
+        db.session.delete(self)
+        db.session.commit()
+
     @staticmethod
     def find(access_token=None, refresh_token=None):
         """ Retrieve a token record using submitted access token or

requirements.txt

@@ -1,8 +1,5 @@
 Flask
 Flask-SQLAlchemy
+Flask-Oauthlib
 bcrypt
 pyOpenSSL
-
-# We need pull #151, which are not in version 0.7.0, thus we get flask-oauthlib
-# directly from git.
--e git+https://github.com/lepture/flask-oauthlib.git#egg=flask-oauthlib

validator.py

@@ -2,6 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from flask_oauthlib.provider import OAuth2RequestValidator
+from flask_oauthlib.provider.oauth2 import log
+from flask_oauthlib.utils import decode_base64
+from oauthlib.common import to_unicode
 from models import User, Client, Token
 
 
@@ -16,3 +19,28 @@ def __init__(self):
         self._usergetter = User.find_with_password
         self._tokengetter = Token.find
         self._tokensetter = Token.save
+
+    def authenticate_client(self, request, *args, **kwargs):
+
+        auth = request.headers.get('Authorization', None)
+        if auth:
+            try:
+                _, s = auth.split(' ')
+                client_id, client_secret = decode_base64(s).split(':')
+                client_id = to_unicode(client_id, 'utf-8')
+            except Exception as e:
+                log.debug('Authenticate client failed with exception: %r', e)
+                return False
+        else:
+            client_id = request.client_id
+
+        client = self._clientgetter(client_id)
+        if not client:
+            log.debug('Authenticate client failed, client not found.')
+            return False
+
+        if client.client_type == 'public':
+            return self.authenticate_client_id(client_id, request)
+        else:
+            return OAuth2RequestValidator.authenticate_client(
+                self, request, *args, **kwargs)