sessions: patch baker to take expire time for redis for auto session cleanup.

pkgs/patches/beaker/patch-beaker-improved-redis-2.diff

@@ -0,0 +1,18 b''
+diff -rup Beaker-1.9.1-orig/beaker/session.py Beaker-1.9.1/beaker/session.py
+--- Beaker-1.9.1-orig/beaker/session.py	2020-04-10 10:23:04.000000000 +0200
++++ Beaker-1.9.1/beaker/session.py	2020-04-10 10:23:34.000000000 +0200
+@@ -156,6 +156,14 @@ def __init__(self, request, id=None, invalidate_corrupt=False,
+         if timeout and not save_accessed_time:
+             raise BeakerException("timeout requires save_accessed_time")
+         self.timeout = timeout
++        # We want to pass timeout param to redis backend to support expiration of keys
++        # In future, I believe, we can use this param for memcached and mongo as well
++        if self.timeout is not None and self.type == 'ext:redis':
++            # The backend expiration should always be a bit longer (I decied to use 2 minutes) than the
++            # session expiration itself to prevent the case where the backend data expires while
++            # the session is being read (PR#153)
++            self.namespace_args['timeout'] = self.timeout + 60 * 2
++
+         self.save_atime = save_accessed_time
+         self.use_cookies = use_cookies
+         self.cookie_expires = cookie_expires
  No newline at end of file

pkgs/patches/beaker/patch-beaker-improved-redis.diff

@@ -0,0 +1,26 b''
+diff -rup Beaker-1.9.1-orig/beaker/ext/redisnm.py Beaker-1.9.1/beaker/ext/redisnm.py
+--- Beaker-1.9.1-orig/beaker/ext/redisnm.py	2018-04-10 10:23:04.000000000 +0200
++++ Beaker-1.9.1/beaker/ext/redisnm.py	2018-04-10 10:23:34.000000000 +0200
+@@ -30,9 +30,10 @@ class RedisNamespaceManager(NamespaceManager):
+
+     clients = SyncDict()
+
+-    def __init__(self, namespace, url, **kw):
++    def __init__(self, namespace, url, timeout=None, **kw):
+         super(RedisNamespaceManager, self).__init__(namespace)
+         self.lock_dir = None  # Redis uses redis itself for locking.
++        self.timeout = timeout
+
+         if redis is None:
+             raise RuntimeError('redis is not available')
+@@ -68,6 +69,8 @@ def has_key(self, key):
+
+     def set_value(self, key, value, expiretime=None):
+         value = pickle.dumps(value)
++        if expiretime is None and self.timeout is not None:
++            expiretime = self.timeout
+         if expiretime is not None:
+             self.client.setex(self._format_key(key), int(expiretime), value)
+         else:
+
+

pkgs/python-packages-overrides.nix

@@ -1,279 +1,281 b''
 # Overrides for the generated python-packages.nix
 #
 # This function is intended to be used as an extension to the generated file
 # python-packages.nix. The main objective is to add needed dependencies of C
 # libraries and tweak the build instructions where needed.
 
 { pkgs
 , basePythonPackages
 }:
 
 let
   sed = "sed -i";
 
   localLicenses = {
     repoze = {
       fullName = "Repoze License";
       url =  http://www.repoze.org/LICENSE.txt;
     };
   };
 
 in
 
 self: super: {
 
   "appenlight-client" = super."appenlight-client".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   });
 
   "beaker" = super."beaker".override (attrs: {
     patches = [
       ./patches/beaker/patch-beaker-lock-func-debug.diff
       ./patches/beaker/patch-beaker-metadata-reuse.diff
+      ./patches/beaker/patch-beaker-improved-redis.diff
+      ./patches/beaker/patch-beaker-improved-redis-2.diff
     ];
   });
 
   "cffi" = super."cffi".override (attrs: {
     buildInputs = [
       pkgs.libffi
     ];
   });
 
   "cryptography" = super."cryptography".override (attrs: {
     buildInputs = [
       pkgs.openssl
     ];
   });
 
   "gevent" = super."gevent".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # NOTE: (marcink) odd requirements from gevent aren't set properly,
       # thus we need to inject psutil manually
       self."psutil"
     ];
   });
 
   "future" = super."future".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
   "testpath" = super."testpath".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
   "gnureadline" = super."gnureadline".override (attrs: {
     buildInputs = [
       pkgs.ncurses
     ];
     patchPhase = ''
       substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash"
     '';
   });
 
   "gunicorn" = super."gunicorn".override (attrs: {
     propagatedBuildInputs = [
       # johbo: futures is needed as long as we are on Python 2, otherwise
       # gunicorn explodes if used with multiple threads per worker.
       self."futures"
     ];
   });
 
   "nbconvert" = super."nbconvert".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # marcink: plug in jupyter-client for notebook rendering
       self."jupyter-client"
     ];
   });
 
   "ipython" = super."ipython".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       self."gnureadline"
     ];
   });
 
   "lxml" = super."lxml".override (attrs: {
     buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
     ];
     propagatedBuildInputs = [
       # Needed, so that "setup.py bdist_wheel" does work
       self."wheel"
     ];
   });
 
   "mysql-python" = super."mysql-python".override (attrs: {
     buildInputs = [
       pkgs.openssl
     ];
     propagatedBuildInputs = [
       pkgs.libmysql
       pkgs.zlib
     ];
   });
 
   "psycopg2" = super."psycopg2".override (attrs: {
     propagatedBuildInputs = [
       pkgs.postgresql
     ];
     meta = {
       license = pkgs.lib.licenses.lgpl3Plus;
     };
   });
 
   "pycurl" = super."pycurl".override (attrs: {
     propagatedBuildInputs = [
       pkgs.curl
       pkgs.openssl
     ];
 
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
       export PYCURL_SSL_LIBRARY=openssl
     '';
 
     meta = {
       license = pkgs.lib.licenses.mit;
     };
   });
 
   "pyramid" = super."pyramid".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "pyramid-debugtoolbar" = super."pyramid-debugtoolbar".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ];
     };
   });
 
   "pysqlite" = super."pysqlite".override (attrs: {
     propagatedBuildInputs = [
       pkgs.sqlite
     ];
     meta = {
       license = [ pkgs.lib.licenses.zlib pkgs.lib.licenses.libpng ];
     };
   });
 
   "python-ldap" = super."python-ldap".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.openldap
       pkgs.cyrus_sasl
       pkgs.openssl
     ];
   });
 
   "python-pam" = super."python-pam".override (attrs: {
     propagatedBuildInputs = [
         pkgs.pam
     ];
 
     # TODO: johbo: Check if this can be avoided, or transform into
     # a real patch
     patchPhase = ''
       substituteInPlace pam.py \
         --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
     '';
 
     });
 
   "python-saml" = super."python-saml".override (attrs: {
     buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
     ];
   });
 
   "dm.xmlsec.binding" = super."dm.xmlsec.binding".override (attrs: {
     buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
       pkgs.xmlsec
       pkgs.libtool
     ];
   });
 
   "pyzmq" = super."pyzmq".override (attrs: {
     buildInputs = [
       pkgs.czmq
     ];
   });
 
   "urlobject" = super."urlobject".override (attrs: {
     meta = {
       license = {
         spdxId = "Unlicense";
         fullName = "The Unlicense";
         url = http://unlicense.org/;
       };
     };
   });
 
   "docutils" = super."docutils".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.bsd2;
     };
   });
 
   "colander" = super."colander".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "pyramid-beaker"  = super."pyramid-beaker".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "pyramid-mako" = super."pyramid-mako".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "repoze.lru" = super."repoze.lru".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "python-editor" = super."python-editor".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.asl20;
     };
   });
 
   "translationstring" = super."translationstring".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "venusian" = super."venusian".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "supervisor" = super."supervisor".override (attrs: {
     patches = [
       ./patches/supervisor/patch-rlimits-old-kernel.diff
     ];
   });
 
   # Avoid that base packages screw up the build process
   inherit (basePythonPackages)
     setuptools;
 
 }