working commit

app/server/server.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/signal"
@@ -37,6 +38,7 @@ type Server struct {
 	x509key  []byte
 	state    descr.Server
 	sfile    string
+	logf     *os.File
 }
 
 func NewServer() (*Server, error) {
@@ -117,26 +119,88 @@ func (srv *Server) Build() error {
 	var err error
 	srv.log.Infof("Build server")
 
+	currUser, err := user.Current()
+	if err != nil {
+		err = fmt.Errorf("Error getting current user: %v\n", err)
+		return err
+	}
+	cuid64, err := strconv.ParseInt(currUser.Uid, 10, 64)
+	if err != nil {
+		return err
+	}
+	cgid64, err := strconv.ParseInt(currUser.Gid, 10, 64)
+	if err != nil {
+		return err
+	}
+	euid := int(cuid64)
+	egid := int(cgid64)
+
+	if cuid64 == 0 {
+		usr, err := user.Lookup(srv.conf.RunUser)
+		if err != nil {
+			return err
+		}
+		uid64, err := strconv.ParseInt(usr.Uid, 10, 64)
+		if err != nil {
+			return err
+		}
+		gid64, err := strconv.ParseInt(usr.Gid, 10, 64)
+		if err != nil {
+			return err
+		}
+		euid = int(uid64)
+		egid = int(gid64)
+	}
+
 	// Mkdir log and data dir
-	srv.log.Infof("Create %s dir", srv.conf.DataDir)
+	datadir := srv.conf.DataDir
+	srv.log.Infof("Create %s dir", datadir)
 	err = os.MkdirAll(srv.conf.DataDir, 0750)
 	if err != nil {
 		return err
 	}
-	if srv.conf.Daemon {
-		logDir := filepath.Dir(srv.conf.LogPath)
-		srv.log.Infof("Create %s dir", logDir)
-		err = os.MkdirAll(logDir, 0750)
-		if err != nil {
-			return err
-		}
-		runDir := filepath.Dir(srv.conf.RunPath)
-		srv.log.Infof("Create %s dir", runDir)
-		err = os.MkdirAll(runDir, 0750)
-		if err != nil {
-			return err
-		}
+	err = os.Chown(datadir, euid, egid)
+	if err != nil {
+		return err
 	}
+
+	if srv.conf.AsDaemon {
+		logdir := filepath.Dir(srv.conf.LogPath)
+		//srv.logg.Infof("Creating log directory %s", logdir)
+		err = os.MkdirAll(logdir, 0750)
+		if err != nil {
+			return err
+		}
+		err = os.Chown(logdir, euid, egid)
+		if err != nil {
+			return err
+		}
+		rundir := filepath.Dir(srv.conf.RunPath)
+		//srv.logg.Infof("Creating run directory %s", rundir)
+		err = os.MkdirAll(rundir, 0750)
+		if err != nil {
+			return err
+		}
+		err = os.Chown(rundir, euid, egid)
+		if err != nil {
+			return err
+		}
+		// Redirect stderr and stout
+		logFile, err := os.OpenFile(srv.conf.LogPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0640)
+		if err != nil {
+			return err
+		}
+		err = syscall.Dup2(int(logFile.Fd()), int(os.Stdout.Fd()))
+		if err != nil {
+			return err
+		}
+		err = syscall.Dup2(int(logFile.Fd()), int(os.Stderr.Fd()))
+		if err != nil {
+			return err
+		}
+		srv.logf = logFile
+	}
+
 	// Create X509 certs
 	srv.x509cert, srv.x509key, err = aux509.CreateX509SelfSignedCert(srv.conf.Hostname)
 	if err != nil {
@@ -305,13 +369,12 @@ func (srv *Server) PseudoFork() error {
 
 func (srv *Server) Daemonize() error {
 	var err error
-	if srv.conf.Daemon {
+	if srv.conf.AsDaemon {
 		// Restart process process
 		err = srv.PseudoFork()
 		if err != nil {
 			return err
 		}
-
 		// Redirect stdin
 		nullFile, err := os.OpenFile("/dev/null", os.O_RDWR, 0)
 		if err != nil {