launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:http-translatePath-new-style into turnip:master.

Commit message:
Fix translatePath call for cgit requests

When I rearranged the way authentication parameters are passed, I forgot
to also update HTTPAuthRootResource.render_GET to use the new
translatePath signature.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/308574
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:http-translatePath-new-style into turnip:master.

diff --git a/turnip/pack/http.py b/turnip/pack/http.py
index d0e8967..ada6b5f 100644
--- a/turnip/pack/http.py
+++ b/turnip/pack/http.py
@@ -638,7 +638,8 @@ class HTTPAuthRootResource(BaseHTTPAuthResource):
         identity_url = session.get('identity_url', self.anonymous_id)
         proxy = xmlrpc.Proxy(self.root.virtinfo_endpoint, allowNone=True)
         d = proxy.callRemote(
-            b'translatePath', request.path, b'read', identity_url, True)
+            b'translatePath', request.path, b'read',
+            {'uid': identity_url, 'can-authenticate': True})
         d.addCallback(self._translatePathCallback, request)
         d.addErrback(self._translatePathErrback, request, session)
         return server.NOT_DONE_YET