16679: Adds Workbench.IdleTimeout config setting for WB2.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 80294afaf35f1f701928f0c1ce99c3c09ca35e09..07cde3200145d0289904338599bd2b9c17097208 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1332,6 +1332,10 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Idle time after which the user's session will be auto closed.
+      # This feature is disabled when set to zero.
+      IdleTimeout: 0s
+
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |

diff --git a/lib/config/export.go b/lib/config/export.go
index b203dff26a1b80272be29f41dd747c8108beb272..6ab69d21fe13eaec3dff84a3ef74e8febc88ff1b 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -237,6 +237,7 @@ var whitelist = map[string]bool{
        "Workbench.EnableGettingStartedPopup":          true,
        "Workbench.EnablePublicProjectsPage":           true,
        "Workbench.FileViewersConfigURL":               true,
+       "Workbench.IdleTimeout":                        true,
        "Workbench.InactivePageHTML":                   true,
        "Workbench.LogViewerMaxBytes":                  true,
        "Workbench.MultiSiteSearch":                    true,

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 57204cf36a2dbe49731c2d7cc32ad51f09522f0a..4e7e5468cb5237db5d46f8ea301cec853afe3fe6 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1338,6 +1338,10 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Idle time after which the user's session will be auto closed.
+      # This feature is disabled when set to zero.
+      IdleTimeout: 0s
+
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 6e1549224b79c15e3674b76091c06a229589f16d..20b7ee0d0cbed38dddde77b7e7943b8096d72557 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -259,6 +259,7 @@ type Cluster struct {
                InactivePageHTML       string
                SSHHelpPageHTML        string
                SSHHelpHostSuffix      string
+               IdleTimeout            Duration
        }
 
        ForceLegacyAPI14 bool