Fixing merge for branch 'rh-cleanup' of https://github.com/rickhanlonii/python-oauth2

Author: TimSC

oauth10a/__init__.py

@@ -509,6 +509,8 @@ def sign_request(self, signature_method, consumer, token):
             # section 4.1.1 "OAuth Consumers MUST NOT include an
             # oauth_body_hash parameter on requests with form-encoded
             # request bodies."
+            if not self.body:
+               self.body = ''.encode('utf-8')
             self['oauth_body_hash'] = base64.b64encode(
                 sha1(self.body).digest()
             )
@@ -683,7 +685,7 @@ def request(self, uri, method="GET", body=b'', headers=None,
                                                   DEFAULT_POST_CONTENT_TYPE)
 
         is_form_encoded = \
-            headers.get('Content-Type') == 'application/x-www-form-urlencoded'
+            headers.get('Content-Type', '').startswith('application/x-www-form-urlencoded')
 
         if is_form_encoded and body:
             parameters = parse_qs(body)
@@ -784,6 +786,8 @@ def _check_signature(self, request, consumer, token):
         signature = request.get('oauth_signature')
         if signature is None:
             raise MissingSignature('Missing oauth_signature.')
+        if isinstance(signature, str):
+            signature = signature.encode('ascii', 'ignore')
 
         # Validate the signature.
         valid = signature_method.check(request, consumer, token, signature)

oauth10a/clients/imap.py

@@ -30,14 +30,14 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
     """IMAP wrapper for imaplib.IMAP4_SSL that implements XOAUTH."""
 
     def authenticate(self, url, consumer, token):
-        if consumer is not None and not isinstance(consumer, oauth2.Consumer):
+        if consumer is not None and not isinstance(consumer, oauth10a.Consumer):
             raise ValueError("Invalid consumer.")
 
-        if token is not None and not isinstance(token, oauth2.Token):
+        if token is not None and not isinstance(token, oauth10a.Token):
             raise ValueError("Invalid token.")
 
         imaplib.IMAP4_SSL.authenticate(
-            self, 'XOAUTH', lambda x: oauth2.build_xoauth_string(url,
+            self, 'XOAUTH', lambda x: oauth10a.build_xoauth_string(url,
                                                                  consumer,
                                                                  token)
         )

setup.py

@@ -30,10 +30,10 @@
 
 setup(name=PKG,
       version=verstr,
-      description="library for OAuth version 1.9",
-      author="Joe Stump",
-      author_email="joe@simplegeo.com",
-      url="http://github.com/joestump/python-oauth2",
+      description="library for OAuth 1.0a version 1.9",
+      author="Tim Sheerman-Chase",
+      author_email="orders2008@sheerman-chase.org.uk",
+      url="https://github.com/TimSC/python-oauth10a",
       classifiers=[
           "Intended Audience :: Developers",
           "Programming Language :: Python :: 2",

tests/test_oauth.py

@@ -1269,7 +1269,7 @@ def sign(self, request, consumer, token):
 
 class TestServer(unittest.TestCase):
     def setUp(self):
-        url = "http://sp.example.com/"
+        self.url = "http://sp.example.com/"
 
         params = {
             'oauth_version': "1.0",
@@ -1286,7 +1286,7 @@ def setUp(self):
 
         params['oauth_token'] = self.token.key
         params['oauth_consumer_key'] = self.consumer.key
-        self.request = oauth.Request(method="GET", url=url, parameters=params)
+        self.request = oauth.Request(method="GET", url=self.url, parameters=params)
 
         signature_method = oauth.SignatureMethod_HMAC_SHA1()
         self.request.sign_request(signature_method, self.consumer, self.token)
@@ -1329,8 +1329,20 @@ def test_verify_request(self):
         self.assertEqual(parameters['foo'], 59)
         self.assertEqual(parameters['multi'], ['FOO', 'BAR'])
 
+    def test_verify_request_query_string(self):
+        server = oauth.Server()
+        server.add_signature_method(oauth.SignatureMethod_HMAC_SHA1())
+
+        signature_method = oauth.SignatureMethod_HMAC_SHA1()
+        request2 = oauth.Request.from_request("GET", self.url, query_string=urlencode(dict(self.request)))
+        request2.sign_request(signature_method, self.consumer, self.token)
+        request3 = oauth.Request.from_request("GET", self.url, query_string=urlencode(dict(request2)))        
+
+        parameters = server.verify_request(request3, self.consumer,
+                                           self.token)
+
     def test_verify_request_missing_signature(self):
-        from oauth2 import MissingSignature
+        from oauth10a import MissingSignature
         server = oauth.Server()
         server.add_signature_method(oauth.SignatureMethod_PLAINTEXT())
         del self.request['oauth_signature_method']
@@ -1679,7 +1691,7 @@ def mockrequest(cl, ur, **kw):
         client.request(uri, 'GET')
 
     @mock.patch('httplib2.Http.request')
-    @mock.patch('oauth2.Request.from_consumer_and_token')
+    @mock.patch('oauth10a.Request.from_consumer_and_token')
     def test_multiple_values_for_a_key(self, mockReqConstructor,
                                        mockHttpRequest):
         client = oauth.Client(self.consumer, None)