Merge pull request #7881 from ckan/allow-none-as-session-timeout

fix: Allow `None` for `beaker.session.timeout`

changes/7881.bugfix

@@ -0,0 +1 @@
+Empty string in `beaker.session.timeout` produces an error instead of never-expiring session

ckan/cli/shell.py

@@ -28,7 +28,7 @@ def ipython(namespace: Mapping[str, Any], banner: str) -> None:
     from traitlets.config.loader import Config
 
     c = Config()
-    c.TerminalInteractiveShell.banner2 = banner  # type: ignore
+    c.TerminalInteractiveShell.banner2 = banner
 
     IPython.start_ipython([], user_ns=namespace, config=c)
 

ckan/config/config_declaration.yaml

@@ -312,8 +312,7 @@ groups:
           browsers are instructed to not send the cookie over anything other than an SSL connection.
 
       - key: beaker.session.timeout
-        type: int
-        default: 600
+        validators: int_validator
         description: |
           Seconds until the session is considered invalid, after which it will be ignored and invalidated.
           This number is based on the time since the session was last accessed, not from when the session was created.

ckan/tests/config/test_sessions.py

@@ -82,3 +82,21 @@ def get_blueprint(self):
             blueprint.add_url_rule(*rule)
 
         return blueprint
+
+
+@pytest.mark.parametrize("timeout,normalized", [
+    (None, None),
+    ("", None),
+    ("123", 123),
+    ("1_000_000", 1_000_000),
+    ("-1", -1),
+])
+def test_beaker_session_timeout(
+        monkeypatch, ckan_config, make_app, timeout, normalized
+):
+    """Beaker timeout accepts `None`(never expires) and int(expires in
+    n-seconds) values.
+
+    """
+    monkeypatch.setitem(ckan_config, "beaker.session.timeout", timeout)
+    make_app()