Merge branch 'develop' of github.com:semaphoreui/semaphore into develop

Author: fiftin

util/config.go

@@ -157,6 +157,7 @@ type ConfigProcess struct {
 	User   string `json:"user,omitempty" env:"SEMAPHORE_PROCESS_USER"`
 	UID    *int   `json:"uid,omitempty" env:"SEMAPHORE_PROCESS_UID"`
 	Chroot string `json:"chroot,omitempty" env:"SEMAPHORE_PROCESS_CHROOT"`
+	GID    *int   `json:"gid,omitempty" env:"SEMAPHORE_PROCESS_GID"`
 }
 
 // ConfigType mapping between Config and the json file that sets it
@@ -318,22 +319,40 @@ func (conf *ConfigType) GetSysProcAttr() (res *syscall.SysProcAttr) {
 		res.Chroot = conf.Process.Chroot
 	}
 
+	var uid *int
+	var gid *int
+
+	uid = nil
+	gid = conf.Process.GID
+
 	if conf.Process.User != "" {
-		if res == nil {
-			res = &syscall.SysProcAttr{}
+		usr, err := user.Lookup(conf.Process.User)
+		if err != nil {
+			return
 		}
 
-		u, err := user.Lookup(conf.Process.User)
+		u, err := strconv.Atoi(usr.Uid)
 		if err != nil {
 			return
 		}
 
-		uid, _ := strconv.Atoi(u.Uid)
-		gid, _ := strconv.Atoi(u.Gid)
+		g, err := strconv.Atoi(usr.Gid)
+		if err != nil {
+			return
+		}
+
+		uid = &u
+		gid = &g
+	}
+
+	if uid != nil && gid != nil {
+		if res == nil {
+			res = &syscall.SysProcAttr{}
+		}
 
 		res.Credential = &syscall.Credential{
-			Uid: uint32(uid),
-			Gid: uint32(gid),
+			Uid: uint32(*uid),
+			Gid: uint32(*gid),
 		}
 	}