httpauth.py: Abstract out setting the various cookie attributes.

We'll want to use them elsewhere.

diff --git a/httpauth.py b/httpauth.py
index e29686c97731c46abb5fbe4a5306780e8e4260f9..4a41e4fcb16267b7242f79c6366bcef507bc6b20 100644 (file)
--- a/httpauth.py
+++ b/httpauth.py
@@ -227,6 +227,16 @@ def check_auth(token, nonce = None):
   ## Done.
   return user
 
   ## Done.
   return user
 

+def bake_cookie(value):
+  """
+  Return a properly baked authentication-token cookie with the given VALUE.
+  """
+  return CGI.cookie('chpwd-token', value,
+                    httponly = True,
+                    secure = CGI.SSLP,
+                    path = CFG.SCRIPT_NAME,
+                    max_age = (CFG.SECRETLIFE - CFG.SECRETFRESH))
+

 ###--------------------------------------------------------------------------
 ### Authentication commands.
 
 ###--------------------------------------------------------------------------
 ### Authentication commands.
 


@@ -258,11 +268,6 @@ def cmd_auth(u, pw):
   else:
     t = mint_token(u)
     CGI.redirect(CGI.action('list', u),
   else:
     t = mint_token(u)
     CGI.redirect(CGI.action('list', u),

-                 set_cookie = CGI.cookie('chpwd-token', t,
-                                         httponly = True,
-                                         secure = CGI.SSLP,
-                                         path = CFG.SCRIPT_NAME,
-                                         max_age = (CFG.SECRETLIFE -
-                                                    CFG.SECRETFRESH)))
+                 set_cookie = bake_cookie(t))

 
 ###----- That's all, folks --------------------------------------------------
 
 ###----- That's all, folks --------------------------------------------------