From 328cb0a076f5c075677d44ac146581c7e94c41c8 Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Mon, 21 Aug 2023 11:55:43 -0700 Subject: [PATCH] Pass environment variable to control session length to console (#17885) Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- cmd/common-main.go | 4 ++++ internal/config/constants.go | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/common-main.go b/cmd/common-main.go index e6afe3ff1..2b3d22b1a 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -175,6 +175,10 @@ func minioConfigToConsoleFeatures() { if value := env.Get(config.EnvBrowserLoginAnimation, "on"); value != "" { os.Setenv("CONSOLE_ANIMATED_LOGIN", value) } + // Pass on the session duration environment variable, else we will default to 12 hours + if value := env.Get(config.EnvBrowserSessionDuration, ""); value != "" { + os.Setenv("CONSOLE_STS_DURATION", value) + } os.Setenv("CONSOLE_MINIO_REGION", globalSite.Region) os.Setenv("CONSOLE_CERT_PASSWD", env.Get("MINIO_CERT_PASSWD", "")) diff --git a/internal/config/constants.go b/internal/config/constants.go index 93691c793..1ed41f501 100644 --- a/internal/config/constants.go +++ b/internal/config/constants.go @@ -61,10 +61,11 @@ const ( EnvMinIOCallhomeEnable = "MINIO_CALLHOME_ENABLE" EnvMinIOCallhomeFrequency = "MINIO_CALLHOME_FREQUENCY" - EnvMinIOServerURL = "MINIO_SERVER_URL" - EnvBrowserRedirectURL = "MINIO_BROWSER_REDIRECT_URL" - EnvRootDiskThresholdSize = "MINIO_ROOTDISK_THRESHOLD_SIZE" - EnvBrowserLoginAnimation = "MINIO_BROWSER_LOGIN_ANIMATION" + EnvMinIOServerURL = "MINIO_SERVER_URL" + EnvBrowserRedirectURL = "MINIO_BROWSER_REDIRECT_URL" + EnvRootDiskThresholdSize = "MINIO_ROOTDISK_THRESHOLD_SIZE" + EnvBrowserLoginAnimation = "MINIO_BROWSER_LOGIN_ANIMATION" + EnvBrowserSessionDuration = "MINIO_BROWSER_SESSION_DURATION" EnvUpdate = "MINIO_UPDATE"