[#1943] Add timeout and reissue_time to who.ini

ckan/config/middleware.py

@@ -1,4 +1,5 @@
 """Pylons middleware initialization"""
+import math
 import urllib
 import urllib2
 import logging
@@ -195,6 +196,8 @@ def make_app(conf, full_stack=True, static_files=True, **app_conf):
 def ckan_auth_tkt_make_app(**kw):
     if not len(kw.get('secret', '')) or kw.get('secret') == 'somesecret':
         kw['secret'] = config['beaker.session.secret']
+    if kw.get('timeout') and not kw.get('reissue_time'):
+        kw['reissue_time'] = int(math.ceil(int(kw.get('timeout')) * 0.1))
     return auth_tkt_make_plugin(**kw)
 
 

ckan/config/who.ini

@@ -2,6 +2,11 @@
 use = ckan.config.middleware:ckan_auth_tkt_make_app
 # If no secret key is defined here, beaker.session.secret will be used
 #secret = somesecret
+# Timeout set in seconds before a non-active session expires (optional).
+timeout = 3600 ;One hour
+# Time before a session ticket is reissued (optional). If not defined,
+# this will be set to 1/10th the timeout value.
+# reissue_time = 360
 
 [plugin:friendlyform]
 use = repoze.who.plugins.friendlyform:FriendlyFormPlugin
@@ -49,7 +54,7 @@ plugins =
     auth_tkt
 
 [authenticators]
-plugins = 
+plugins =
     ckan.lib.authenticator:OpenIDAuthenticator
     ckan.lib.authenticator:UsernamePasswordAuthenticator
 
@@ -58,4 +63,3 @@ plugins =
     openid
     friendlyform;browser
 #   basicauth
-