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

36
cmd/runmqserver/webserver.go
View File

@@ -136,34 +136,14 @@ func configureSSO_TLS() error {
// Create tls directory
dir := "/run/tls"
_, err := os.Stat(dir)
if err != nil {
if os.IsNotExist(err) {
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
}
}
mntdir := "/mnt/tls/"
// Setup key store & trust store
ks := keystore.NewJKSKeyStore(filepath.Join(dir, "key.jks"), "password")
ts := keystore.NewJKSKeyStore(filepath.Join(dir, "trust.jks"), "password")
log.Debug("Creating key store")
err = ks.Create(log)
err := ks.Create(log)
if err != nil {
return err
}
@@ -173,12 +153,12 @@ func configureSSO_TLS() error {
return err
}
log.Debug("Generating PKCS12 file")
err = ks.GeneratePKCS12("/mnt/tls/tls.key", "/mnt/tls/tls.crt", "/run/tls/tls.p12", "default", "password")
err = ks.GeneratePKCS12(filepath.Join(mntdir, "tls.key"), filepath.Join(mntdir, "tls.crt"), filepath.Join(dir, "tls.p12"), "default", "password")
if err != nil {
return err
}
log.Debug("Importing certificate into key store")
err = ks.Import("/run/tls/tls.p12", "password")
err = ks.Import(filepath.Join(dir, "tls.p12"), "password")
if err != nil {
return err
}
@@ -203,10 +183,6 @@ func configureWebServer() error {
}
return err
}
uid, gid, err := command.LookupMQM()
if err != nil {
return err
}
const prefix string = "/etc/mqm/web"
err = filepath.Walk(prefix, func(from string, info os.FileInfo, err error) error {
if err != nil {
@@ -242,10 +218,6 @@ func configureWebServer() error {
return err
}
}
err = os.Chown(to, uid, gid)
if err != nil {
return err
}
return nil
})
return err