Merge lp:~alecu/ubuntu-sso-client/the-compleat-libsoup into lp:ubuntu-sso-client

[Alejandro J. Cura]

- libsoup bindings need flattening to work around nul bytes in content (LP: #921822).

- libsoup bindings need flattening to work around nul bytes in content (LP: #921822).

[lp:~alecu/ubuntu-sso-client/the-compleat-libsoup]

850. By Alejandro J. Cura on 2012-02-03

do not forget to make run-tests executable

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

Looks good to me.

review: Approve

=== modified file 'run-tests'
--- run-tests	2012-02-03 17:22:20 +0000
+++ run-tests	2012-02-03 19:10:45 +0000
@@ -45,17 +45,13 @@
     XVFB_CMDLINE="$XVFB -a"
 fi
 
-echo "*** Running test suite for ""$MODULE"" ***"
-$XVFB_CMDLINE u1trial --reactor=gi -p "$QT_TESTS_PATH, $GTK_TESTS_PATH" -i "test_windows.py" "$MODULE"
-rm -rf _trial_temp
-
-echo "*** Running GTK test suite ***"
-$XVFB_CMDLINE u1trial --reactor=gi --gui "$GTK_TESTS_PATH"
-rm -rf _trial_temp
-
-echo "*** Running QT test suite ***"
+echo "*** Running GTK test suite for ""$MODULE"" ***"
+$XVFB_CMDLINE u1trial --reactor=gi --gui -p "$QT_TESTS_PATH" -i "test_windows.py" "$MODULE"
+rm -rf _trial_temp
+
+echo "*** Running QT test suite for ""$MODULE"" ***"
 ./setup.py build
-USE_QT_MAINLOOP=True $XVFB_CMDLINE u1trial --reactor=qt4 --gui "$QT_TESTS_PATH"
+USE_QT_MAINLOOP=True $XVFB_CMDLINE u1trial --reactor=qt4 --gui -p "$GTK_TESTS_PATH" -i "test_windows.py" "$MODULE"
 rm -rf _trial_temp
 rm -rf build
 

=== modified file 'ubuntu_sso/utils/webclient/libsoup.py'
--- ubuntu_sso/utils/webclient/libsoup.py	2012-01-17 20:44:33 +0000
+++ ubuntu_sso/utils/webclient/libsoup.py	2012-02-03 19:10:45 +0000
@@ -51,7 +51,8 @@
             response_headers = message.get_property("response-headers")
             add_header = lambda key, value, _: headers[key].append(value)
             response_headers.foreach(add_header, None)
-            response = Response(message.response_body.data, headers)
+            content = message.response_body.flatten().get_data()
+            response = Response(content, headers)
             d.callback(response)
         elif message.status_code == httplib.UNAUTHORIZED:
             e = UnauthorizedError(message.reason_phrase)

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-02-02 18:50:55 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-02-03 19:10:45 +0000
@@ -45,9 +45,11 @@
 )
 SAMPLE_HEADERS = {SAMPLE_KEY: SAMPLE_VALUE}
 SAMPLE_POST_PARAMS = {"param1": "value1", "param2": "value2"}
+SAMPLE_JPEG_HEADER = '\xff\xd8\xff\xe0\x00\x10JFIF'
 
 SIMPLERESOURCE = "simpleresource"
-POSTABLERESOURECE = "postableresourece"
+BYTEZERORESOURCE = "bytezeroresource"
+POSTABLERESOURCE = "postableresource"
 THROWERROR = "throwerror"
 UNAUTHORIZED = "unauthorized"
 HEADONLY = "headonly"
@@ -75,6 +77,14 @@
         return SAMPLE_RESOURCE
 
 
+class ByteZeroResource(resource.Resource):
+    """A resource that has a nul byte in the middle of it."""
+
+    def render_GET(self, request):
+        """Return the content of this resource."""
+        return SAMPLE_JPEG_HEADER
+
+
 class PostableResource(resource.Resource):
     """A resource that only answers to POST requests."""
 
@@ -155,7 +165,8 @@
         """Get the root resource with all the children."""
         root = resource.Resource()
         root.putChild(SIMPLERESOURCE, SimpleResource())
-        root.putChild(POSTABLERESOURECE, PostableResource())
+        root.putChild(BYTEZERORESOURCE, ByteZeroResource())
+        root.putChild(POSTABLERESOURCE, PostableResource())
 
         root.putChild(THROWERROR, resource.NoResource())
 
@@ -248,9 +259,15 @@
                                  webclient.WebClientError)
 
     @defer.inlineCallbacks
+    def test_zero_byte_in_content(self):
+        """Test a reply with a nul byte in the middle of it."""
+        result = yield self.wc.request(self.base_iri + BYTEZERORESOURCE)
+        self.assertEqual(SAMPLE_JPEG_HEADER, result.content)
+
+    @defer.inlineCallbacks
     def test_post(self):
         """Test a post request."""
-        result = yield self.wc.request(self.base_iri + POSTABLERESOURECE,
+        result = yield self.wc.request(self.base_iri + POSTABLERESOURCE,
                                        method="POST")
         self.assertEqual(SAMPLE_RESOURCE, result.content)