academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #151 from mq-cloudpak/zenone

Browse Source 
Small change to handle Zen SSO
This commit is contained in:
Nathaniel J King
2021-03-09 09:09:51 +00:00
committed by GitHub Enterprise
parent cecade9845 54bad805c1
commit ebbbbb04ab
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/runmqserver/webserver.go
View File

@@ -62,8 +62,11 @@ func startWebServer(webKeystore, webkeystorePW, webTruststoreRef string) error {
} }
func configureSSO(p12TrustStore tls.KeyStoreData, webKeystore string) (string, error) { func configureSSO(p12TrustStore tls.KeyStoreData, webKeystore string) (string, error) {
requiredEnvVars := []string{}
_, set := os.LookupEnv("MQ_ZEN_INTERNAL_ENDPOINT")
if !set {
// Ensure all required environment variables are set for SSO // Ensure all required environment variables are set for SSO
requiredEnvVars := []string{ requiredEnvVars = []string{
"MQ_OIDC_CLIENT_ID", "MQ_OIDC_CLIENT_ID",
"MQ_OIDC_CLIENT_SECRET", "MQ_OIDC_CLIENT_SECRET",
"MQ_OIDC_UNIQUE_USER_IDENTIFIER", "MQ_OIDC_UNIQUE_USER_IDENTIFIER",
@@ -72,6 +75,19 @@ func configureSSO(p12TrustStore tls.KeyStoreData, webKeystore string) (string, e
"MQ_OIDC_JWK_ENDPOINT", "MQ_OIDC_JWK_ENDPOINT",
"MQ_OIDC_ISSUER_IDENTIFIER", "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 { for _, envVar := range requiredEnvVars {
if len(os.Getenv(envVar)) == 0 { if len(os.Getenv(envVar)) == 0 {
return "", fmt.Errorf("%v must be set when MQ_BETA_ENABLE_SSO=true", envVar) return "", fmt.Errorf("%v must be set when MQ_BETA_ENABLE_SSO=true", envVar)