summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRishabh Arya <rishabharya32@gmail.com>2021-02-18 19:48:14 +0530
committerGitHub <noreply@github.com>2021-02-18 09:18:14 -0500
commite17553e185aa6054b229524ac04a2743fe8c6fa9 (patch)
tree73134fca53629d233d3746c553cdf20edb675e2a /synapse
parentDeprecate old admin API `GET /_synapse/admin/v1/users/<user_id>` (#9429) (diff)
downloadsynapse-e17553e185aa6054b229524ac04a2743fe8c6fa9.tar.xz
Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#9426)
Diffstat (limited to '')
-rw-r--r--synapse/config/auth.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/config/auth.py b/synapse/config/auth.py
index 7fa64b821a..9aabaadf9e 100644
--- a/synapse/config/auth.py
+++ b/synapse/config/auth.py
@@ -37,7 +37,9 @@ class AuthConfig(Config):
 
         # User-interactive authentication
         ui_auth = config.get("ui_auth") or {}
-        self.ui_auth_session_timeout = ui_auth.get("session_timeout", 0)
+        self.ui_auth_session_timeout = self.parse_duration(
+            ui_auth.get("session_timeout", 0)
+        )
 
     def generate_config_section(self, config_dir_path, server_name, **kwargs):
         return """\
@@ -93,8 +95,8 @@ class AuthConfig(Config):
               #require_uppercase: true
 
         ui_auth:
-            # The number of milliseconds to allow a user-interactive authentication
-            # session to be active.
+            # The amount of time to allow a user-interactive authentication session
+            # to be active.
             #
             # This defaults to 0, meaning the user is queried for their credentials
             # before every action, but this can be overridden to allow a single
@@ -105,5 +107,5 @@ class AuthConfig(Config):
             # Uncomment below to allow for credential validation to last for 15
             # seconds.
             #
-            #session_timeout: 15000
+            #session_timeout: "15s"
         """