Merge lp:~alecu/ubuntu-sso-client/fix-ping-url into lp:ubuntu-sso-client

[Alejandro J. Cura]

- Use parameters set in the url for the OAuth signature (LP: #927664)

- Use parameters set in the url for the OAuth signature (LP: #927664)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2012-02-01 19:00:40 +0000
+++ ubuntu_sso/utils/webclient/common.py	2012-02-07 13:25:06 +0000
@@ -15,11 +15,13 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """The common bits of a webclient."""
 
+import cgi
 import collections
 
 from httplib2 import iri2uri
 from oauth import oauth
 from twisted.internet import defer
+from urlparse import urlparse
 
 from ubuntu_sso.utils.webclient.timestamp import TimestampChecker
 
@@ -114,8 +116,10 @@
                                        credentials["consumer_secret"])
         token = oauth.OAuthToken(credentials["token"],
                                  credentials["token_secret"])
-        if parameters is None:
-            parameters = {}
+        if not parameters:
+            _, _, _, _, query, _ = urlparse(uri)
+            parameters = dict(cgi.parse_qsl(query))
+
         if timestamp:
             parameters["oauth_timestamp"] = timestamp
 
 
=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-02-03 16:42:13 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-02-07 13:25:06 +0000
@@ -28,7 +28,7 @@
 from ubuntuone.devtools.testcases.squid import SquidTestCase
 
 from ubuntu_sso.utils import webclient
-from ubuntu_sso.utils.webclient.common import BaseWebClient, HeaderDict
+from ubuntu_sso.utils.webclient.common import BaseWebClient, HeaderDict, oauth
 from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
 
 ANY_VALUE = object()
@@ -533,6 +533,30 @@
         """Check that the oauth signed iri is properly built with params."""
         return self.test_build_signed_iri(params=self.sample_params)
 
+    def patch_staticmethod(self, src, attr_name, replacement):
+        """Alternate patch because self.patch fails restoring staticmethods."""
+        original = getattr(src, attr_name)
+        setattr(src, attr_name, staticmethod(replacement))
+        self.addCleanup(setattr, src, attr_name, staticmethod(original))
+
+    def test_iri_parameters_used_in_oauth_signature(self):
+        """The iri parameters are used in the oauth signature."""
+        from_consumer_and_token = oauth.OAuthRequest.from_consumer_and_token
+
+        def fake_from_consumer_and_token(parameters=None, **kwargs):
+            """Verify the parameters passed."""
+            self.assertIn("fake_param", parameters)
+            return from_consumer_and_token(
+                                        parameters=parameters, **kwargs)
+
+        self.patch_staticmethod(oauth.OAuthRequest, "from_consumer_and_token",
+                                fake_from_consumer_and_token)
+
+        self.sample_url += "?fake_param=fake_value"
+        self.wc.build_oauth_request(self.sample_method, self.sample_url,
+                                    SAMPLE_CREDENTIALS, self.timestamp,
+                                    parameters={})
+
 
 class OAuthHmacSha1TestCase(OAuthPlainTextTestCase):
     """Test for the oauth signing code using HMAC-SHA1."""