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

undo some changes mqwebauth

Browse Source
This commit is contained in:
mamgainp
2020-01-09 11:44:02 +05:30
parent b4a3d7d732
commit 3ba37b2b2b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/runmqserver/webserver.go
View File

@@ -22,10 +22,12 @@ import (
"os/user" "os/user"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings"
"syscall" "syscall"
"github.com/ibm-messaging/mq-container/internal/command" "github.com/ibm-messaging/mq-container/internal/command"
"github.com/ibm-messaging/mq-container/internal/copy" "github.com/ibm-messaging/mq-container/internal/copy"
"github.com/ibm-messaging/mq-container/internal/mqtemplate"
"github.com/ibm-messaging/mq-container/internal/tls" "github.com/ibm-messaging/mq-container/internal/tls"
) )
@@ -108,6 +110,15 @@ func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) {
return "", err return "", err
} }
// Process SSO template for generating file mqwebuser.xml
/* The variable adminUsers is expected to have a empty string as we are no longer
passing any value in the charts */
adminUsers := strings.Split(os.Getenv("MQ_WEB_ADMIN_USERS"), "\n")
err = mqtemplate.ProcessTemplateFile(mqwebDir+"/mqwebuser.xml.tpl", mqwebDir+"/mqwebuser.xml", map[string][]string{"AdminUser": adminUsers}, log)
if err != nil {
return "", err
}
// Configure SSO TLS // Configure SSO TLS
return tls.ConfigureWebKeystore(p12TrustStore) return tls.ConfigureWebKeystore(p12TrustStore)
} }