Merge lp:~alecu/ubuntu-sso-client/fix-wrong-credentials into lp:ubuntu-sso-client

[Alejandro J. Cura]

- Handle wrong credentials properly in qtnetwork webclient (LP: #957317)

- Handle wrong credentials properly in qtnetwork webclient (LP: #957317)

[Roberto Alsina (ralsina)]

+5

review: Approve

[Manuel de la Peña (mandel)]

Wow, that was simple! I have done an IRL with this branch giving the wrong creds and worked. Nice!

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-03-09 12:04:31 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-03-16 21:06:17 +0000
@@ -188,8 +188,10 @@
 
     def _handle_authentication(self, reply, authenticator):
         """The reply needs authentication."""
-        authenticator.setUser(self.username)
-        authenticator.setPassword(self.password)
+        if authenticator.user() != self.username:
+            authenticator.setUser(self.username)
+        if authenticator.password() != self.password:
+            authenticator.setPassword(self.password)
 
     @defer.inlineCallbacks
     def _handle_bad_proxy_authentication(self, proxy, authenticator):

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-12 23:15:45 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-16 21:06:17 +0000
@@ -318,13 +318,22 @@
     @defer.inlineCallbacks
     def test_send_basic_auth(self):
         """The basic authentication headers are sent."""
-        other_wc = webclient.webclient_factory(username=SAMPLE_USERNAME,
-                                               password=SAMPLE_PASSWORD)
+        other_wc = self.webclient_factory(username=SAMPLE_USERNAME,
+                                          password=SAMPLE_PASSWORD)
         self.addCleanup(other_wc.shutdown)
         result = yield other_wc.request(self.base_iri + GUARDED)
         self.assertEqual(SAMPLE_RESOURCE, result.content)
 
     @defer.inlineCallbacks
+    def test_send_basic_auth_wrong_credentials(self):
+        """Wrong credentials returns a webclient error."""
+        other_wc = self.webclient_factory(username=SAMPLE_USERNAME,
+                                          password="wrong password!")
+        self.addCleanup(other_wc.shutdown)
+        yield self.assertFailure(other_wc.request(self.base_iri + GUARDED),
+                                 webclient.UnauthorizedError)
+
+    @defer.inlineCallbacks
     def test_request_is_oauth_signed(self):
         """The request is oauth signed."""
         tsc = self.wc.get_timestamp_checker()