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

When pushed, this commit will replace hard-coded values with calls to LookupMQM

Browse Source
This commit is contained in:
Stephen Marshall
2018-04-25 14:09:23 +01:00
parent bf36f8bb2c
commit 3aa46e0793
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/runmqdevserver/keystore.go
View File

@@ -64,8 +64,12 @@ func (ks *KeyStore) Create() error {
}
}
}
// TODO: Lookup value for MQM user here?
err = os.Chown(ks.Filename, 999, 999)
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(ks.Filename, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err
@@ -88,8 +92,12 @@ func (ks *KeyStore) CreateStash() error {
}
return err
}
// TODO: Lookup value for MQM user here?
err = os.Chown(stashFile, 999, 999)
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(stashFile, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err

18
cmd/runmqdevserver/template.go
View File

@@ -19,6 +19,8 @@ import (
"os"
"path"
"text/template"
"github.com/ibm-messaging/mq-container/internal/command"
)
// processTemplateFile takes a Go templateFile, and processes it with the
@@ -35,8 +37,12 @@ func processTemplateFile(templateFile, destFile string, data interface{}) error
if err != nil {
if os.IsNotExist(err) {
os.MkdirAll(dir, 0660)
// TODO: Lookup value for MQM user here?
err = os.Chown(dir, 999, 999)
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
@@ -52,8 +58,12 @@ func processTemplateFile(templateFile, destFile string, data interface{}) error
log.Error(err)
return err
}
// TODO: Lookup value for MQM user here?
err = os.Chown(destFile, 999, 999)
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(destFile, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err

11
cmd/runmqdevserver/tls.go
View File

@@ -19,6 +19,8 @@ import (
"fmt"
"os"
"path/filepath"
"github.com/ibm-messaging/mq-container/internal/command"
)
func configureWebTLS(cms *KeyStore) error {
@@ -76,9 +78,14 @@ func configureTLS(qmName string, inputFile string, passPhrase string) error {
if err != nil {
return err
}
err = os.Chown(dir, 999, 999)
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Debug(err)
log.Error(err)
return err
}
err = os.Chown(dir, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err
}
} else {

22
cmd/runmqserver/crtmqvol.go
View File

@@ -17,28 +17,12 @@ package main
import (
"os"
"os/user"
"path/filepath"
"runtime"
"strconv"
"syscall"
)
func lookupMQM() (int, int, error) {
mqm, err := user.Lookup("mqm")
if err != nil {
return -1, -1, err
}
mqmUID, err := strconv.Atoi(mqm.Uid)
if err != nil {
return -1, -1, err
}
mqmGID, err := strconv.Atoi(mqm.Gid)
if err != nil {
return -1, -1, err
}
return mqmUID, mqmGID, nil
}
"github.com/ibm-messaging/mq-container/internal/command"
)
func createVolume(path string) error {
dataPath := filepath.Join(path, "data")
@@ -60,7 +44,7 @@ func createVolume(path string) error {
sys := fi.Sys()
if sys != nil && runtime.GOOS == "linux" {
stat := sys.(*syscall.Stat_t)
mqmUID, mqmGID, err := lookupMQM()
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
return err
}

2
cmd/runmqserver/webserver.go
View File

@@ -78,7 +78,7 @@ func configureWebServer() error {
}
return err
}
uid, gid, err := lookupMQM()
uid, gid, err := command.LookupMQM()
if err != nil {
return err
}

6
internal/command/command.go
View File

@@ -60,7 +60,7 @@ func Run(name string, arg ...string) (string, int, error) {
func RunAsMQM(name string, arg ...string) (string, int, error) {
cmd := exec.Command(name, arg...)
cmd.SysProcAttr = &syscall.SysProcAttr{}
uid, gid, err := lookupMQM()
uid, gid, err := LookupMQM()
if err != nil {
return "", 0, err
}
@@ -68,8 +68,8 @@ func RunAsMQM(name string, arg ...string) (string, int, error) {
return RunCmd(cmd)
}
// TODO: Duplicated code
func lookupMQM() (int, int, error) {
// LookupMQM looks up the UID & GID of the mqm user
func LookupMQM() (int, int, error) {
mqm, err := user.Lookup("mqm")
if err != nil {
return -1, -1, err