Merge lp:~dobey/ubuntu/karmic/python-oauth/svn1124 into lp:ubuntu/karmic/python-oauth

[dobey]

[James Westby (james-w)]

Looks good, thanks.

Please use "merge-upstream" for new upstream versions in future.
It makes everyone's lives easier, and will allow LP to build the
package from the branch one day. I'm currently writing up tutorial
documentation on it, you can find usage documentation in
/usr/share/doc/bzr-builddeb/user_manual/

Thanks,

James

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-10 17:45:33 +0000
+++ debian/changelog	2009-09-24 18:25:19 +0000
@@ -1,3 +1,20 @@
+python-oauth (1.0a~svn1124-0ubuntu2) karmic; urgency=low
+
+  * oauth/oauth.py: Fix typo and argument handling creating invalid
+    OAuthRequests with from_consumer_and_token staticmethod().
+    (LP: #435994, http://code.google.com/p/oauth/issues/detail?id=117)
+  * oauth/oauth.py: Fix HMAC-SHA1 verification to follow OAuth Core 1.0 spec
+    (LP: #435992, http://code.google.com/p/oauth/issues/detail?id=125)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 24 Sep 2009 14:15:33 -0400
+
+python-oauth (1.0a~svn1124-0ubuntu1) karmic; urgency=low
+
+  * New upsream snapshot, includes partial fix for issue 117, and fixes
+    an error being raised when no verifier is sent to the server
+
+ -- Rodney Dawes <[e-mail]>  Thu, 24 Sep 2009 14:09:33 -0400
+
 python-oauth (1.0~svn1092-0ubuntu2) karmic; urgency=low
 
   * oauth/oauth.py: Fix invalid OAuthRequests being constructed by

=== modified file 'oauth/oauth.py'
--- oauth/oauth.py	2009-09-10 17:45:33 +0000
+++ oauth/oauth.py	2009-09-24 18:25:19 +0000
@@ -320,10 +320,13 @@
                 parameters['oauth_callback'] = token.callback
             # 1.0a support for verifier.
             if token.verifier:
+                parameters['oauth_verifier'] = token.verifier
+        else:
+            if callback:
+                # 1.0a support for callback in the request token request.
+                parameters['oauth_callback'] = callback
+            if verifier:
                 parameters['oauth_verifier'] = verifier
-        elif callback:
-            # 1.0a support for callback in the request token request.
-            parameters['oauth_callback'] = callback
 
         return OAuthRequest(http_method, http_url, parameters)
     from_consumer_and_token = staticmethod(from_consumer_and_token)
@@ -413,7 +416,10 @@
         """
         version = self._get_version(oauth_request)
         consumer = self._get_consumer(oauth_request)
-        verifier = self._get_verifier(oauth_request)
+        try:
+            verifier = self._get_verifier(oauth_request)
+        except OAuthError:
+            verifier = None
         # Get the request token.
         token = self._get_token(oauth_request, 'request')
         self._check_signature(oauth_request, consumer, token)
@@ -617,8 +623,8 @@
         raw = '&'.join(sig)
         return key, raw
 
-    def build_signature(self, oauth_request, consumer, token):
-        """Builds the base signature string."""
+    def _build_digest(self, oauth_request, consumer, token):
+        '''Generates the HMAC digest for the signature.'''
         key, raw = self.build_signature_base_string(oauth_request, consumer,
             token)
 
@@ -629,9 +635,18 @@
         except:
             import sha # Deprecated
             hashed = hmac.new(key, raw, sha)
+        return hashed.digest()
 
+    def build_signature(self, oauth_request, consumer, token):
+        """Builds the base signature string."""
+        digest = self._build_digest(oauth_request, consumer, token)
         # Calculate the digest base 64.
-        return binascii.b2a_base64(hashed.digest())[:-1]
+        return binascii.b2a_base64(digest)[:-1]
+
+    def check_signature(self, oauth_request, consumer, token, signature):
+        '''Verify the signature.'''
+        digest = self._build_digest(oauth_request, consumer, token)
+        return digest == binascii.a2b_base64(signature)
 
 
 class OAuthSignatureMethod_PLAINTEXT(OAuthSignatureMethod):

=== modified file 'setup.py'
--- setup.py	2009-06-15 15:19:57 +0000
+++ setup.py	2009-09-24 18:25:19 +0000
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name="oauth",
-      version="1.0",
+      version="1.0a",
       description="Library for OAuth",
       author="Leah Culver",
       author_email="[e-mail]",