From 54bad805c121441328eaff0a059b774cfd3beb37 Mon Sep 17 00:00:00 2001 From: "nathking@uk.ibm.com" Date: Fri, 26 Feb 2021 15:05:52 +0000 Subject: [PATCH] Small change to handle Zen SSO --- cmd/runmqserver/webserver.go | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index ed26aa7..4450b03 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -62,15 +62,31 @@ func startWebServer(webKeystore, webkeystorePW, webTruststoreRef string) error { } func configureSSO(p12TrustStore tls.KeyStoreData, webKeystore string) (string, error) { - // Ensure all required environment variables are set for SSO - requiredEnvVars := []string{ - "MQ_OIDC_CLIENT_ID", - "MQ_OIDC_CLIENT_SECRET", - "MQ_OIDC_UNIQUE_USER_IDENTIFIER", - "MQ_OIDC_AUTHORIZATION_ENDPOINT", - "MQ_OIDC_TOKEN_ENDPOINT", - "MQ_OIDC_JWK_ENDPOINT", - "MQ_OIDC_ISSUER_IDENTIFIER", + requiredEnvVars := []string{} + _, set := os.LookupEnv("MQ_ZEN_INTERNAL_ENDPOINT") + if !set { + // Ensure all required environment variables are set for SSO + requiredEnvVars = []string{ + "MQ_OIDC_CLIENT_ID", + "MQ_OIDC_CLIENT_SECRET", + "MQ_OIDC_UNIQUE_USER_IDENTIFIER", + "MQ_OIDC_AUTHORIZATION_ENDPOINT", + "MQ_OIDC_TOKEN_ENDPOINT", + "MQ_OIDC_JWK_ENDPOINT", + "MQ_OIDC_ISSUER_IDENTIFIER", + } + } else { + // Ensure all required environment variables are set for Zen SSO + requiredEnvVars = []string{ + "MQ_ZEN_UNIQUE_USER_IDENTIFIER", + "MQ_ZEN_INTERNAL_ENDPOINT", + "MQ_ZEN_ISSUER_IDENTIFIER", + "MQ_ZEN_AUDIENCES", + "MQ_ZEN_CONTEXT_NAME", + "MQ_ZEN_BASE_URI", + "MQ_ZEN_CONTEXT_NAMESPACE", + "IAM_URL", + } } for _, envVar := range requiredEnvVars { if len(os.Getenv(envVar)) == 0 {