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

Extra changes to support non-root in CIP

Browse Source
This commit is contained in:
Robert Parker
2019-03-19 11:29:33 +00:00
parent 350b8318ee
commit c3f40c84a7
10 changed files with 88 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/runmqdevserver/tls.go
View File

@@ -20,7 +20,6 @@ import (
"os"
"path/filepath"
"github.com/ibm-messaging/mq-container/internal/command"
"github.com/ibm-messaging/mq-container/internal/keystore"
"github.com/ibm-messaging/mq-container/internal/mqtemplate"
)
@@ -58,16 +57,6 @@ func configureWebTLS(cms *keystore.KeyStore) error {
if err != nil {
return err
}
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(tlsConfig, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err
}
return nil
}
@@ -84,29 +73,6 @@ func configureTLS(qmName string, inputFile string, passPhrase string) error {
dir := "/run/runmqdevserver/tls"
keyFile := filepath.Join(dir, "key.kdb")
_, err = os.Stat(dir)
if err != nil {
if os.IsNotExist(err) {
// #nosec G301
err = os.MkdirAll(dir, 0770)
if err != nil {
return err
}
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(dir, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err
}
} else {
return err
}
}
cms := keystore.NewCMSKeyStore(keyFile, passPhrase)
err = cms.Create(log)