Fix authz for use with twisted's distrib proxy.

The PB remote proxy for addCookie only accepts two positional arguments, and the rest must be keyword arguments.
buildbot · Sep 22, 2012 · c61e59b · c61e59b
1 parent 0070ad2
commit c61e59b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/master/buildbot/status/web/authz.py b/master/buildbot/status/web/authz.py
@@ -168,7 +168,7 @@ def login(self, request):
         def check_authenticate(res):
             if res:
                 cookie, s = self.sessions.new(user, self.auth.getUserInfo(user))
-                request.addCookie(COOKIE_KEY, cookie, s.getExpiration(),path="/")
+                request.addCookie(COOKIE_KEY, cookie, expires=s.getExpiration(),path="/")
                 request.received_cookies = {COOKIE_KEY:cookie}
                 return cookie
             else:

diff --git a/master/buildbot/test/unit/test_status_web_authz_Authz.py b/master/buildbot/test/unit/test_status_web_authz_Authz.py
@@ -34,8 +34,8 @@ def getUser(self):
 
     def getPassword(self):
         return None
-    def addCookie(self, key, cookie, expiration, path):
-        self.send_cookies.append((key, cookie, expiration, path))
+    def addCookie(self, key, cookie, expires, path):
+        self.send_cookies.append((key, cookie, expires, path))
 
 class StubHttpAuthRequest(object):
     # all we need from a request is username/password