Fix logs permissions with the kernel

adapter/docker_cli.go

@@ -20,7 +20,7 @@ type DockerCliAdapter struct {
 func NewDockerCliAdapter() DockerCliAdapter {
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
-		log.WarnKernel("couldn't connect with the Docker cli.",
+		log.Warn("couldn't connect with the Docker cli.",
 			vlog.String("error", err.Error()),
 		)
 

cmd/main/main.go

@@ -28,6 +28,8 @@ func main() {
 
 	parseArgs()
 
+	checkNotRoot()
+
 	err := setupDependencies()
 	if err != nil {
 		log.Error(fmt.Errorf("failed to setup dependencies: %v", err))
@@ -94,6 +96,12 @@ func parseArgs() {
 	config.Current.Port = *flagPort
 }
 
+func checkNotRoot() {
+	if os.Getuid() == 0 {
+		log.Warn("while vertex-kernel must be run as root, the vertex user should not be root")
+	}
+}
+
 func setupDependencies() error {
 	for _, dep := range services.Dependencies {
 		err := setupDependency(dep.Updater)

pkg/log/log.go

@@ -8,34 +8,30 @@ import (
 )
 
 var Default vlog.Logger
-var DefaultKernel vlog.Logger
 
 func init() {
+	var p string
+	if strings.Contains(os.Args[0], "kernel") || strings.Contains(os.Args[0], "Kernel") {
+		p = "live_kernel/logs"
+	} else {
+		p = "live/logs"
+	}
+
 	if strings.HasSuffix(os.Args[0], ".test") {
 		Default = *vlog.New(
 			vlog.WithOutputStd(),
 		)
-		DefaultKernel = *vlog.New(
-			vlog.WithOutputStd(),
-		)
 		Default.Info("test logger initialized")
 	} else {
 		Default = *vlog.New(
 			vlog.WithOutputStd(),
-			vlog.WithOutputFile("live/logs", vlog.LogFormatText),
-			vlog.WithOutputFile("live/logs", vlog.LogFormatJson),
-		)
-		DefaultKernel = *vlog.New(
-			vlog.WithOutputStd(),
-			vlog.WithOutputFile("live_kernel/logs", vlog.LogFormatText),
-			vlog.WithOutputFile("live_kernel/logs", vlog.LogFormatJson),
+			vlog.WithOutputFile(p, vlog.LogFormatText),
+			vlog.WithOutputFile(p, vlog.LogFormatJson),
 		)
 		Default.Info("full logger initialized")
 	}
 }
 
-// Vertex
-
 func Debug(msg string, fields ...vlog.KeyValue) {
 	Default.Debug(msg, fields...)
 }
@@ -55,25 +51,3 @@ func Error(err error, fields ...vlog.KeyValue) {
 func Request(msg string, fields ...vlog.KeyValue) {
 	Default.Request(msg, fields...)
 }
-
-// Kernel
-
-func DebugKernel(msg string, fields ...vlog.KeyValue) {
-	Default.Debug(msg, fields...)
-}
-
-func InfoKernel(msg string, fields ...vlog.KeyValue) {
-	Default.Info(msg, fields...)
-}
-
-func WarnKernel(msg string, fields ...vlog.KeyValue) {
-	Default.Warn(msg, fields...)
-}
-
-func ErrorKernel(err error, fields ...vlog.KeyValue) {
-	Default.Error(err, fields...)
-}
-
-func RequestKernel(msg string, fields ...vlog.KeyValue) {
-	Default.Request(msg, fields...)
-}

router/docker_kernel.go

@@ -147,7 +147,7 @@ func handleLogsStdoutDockerContainer(c *gin.Context) {
 
 		_, err := fmt.Fprintln(w, scanner.Text())
 		if err != nil {
-			log.ErrorKernel(err)
+			log.Error(err)
 			return false
 		}
 		return true
@@ -179,7 +179,7 @@ func handleLogsStderrDockerContainer(c *gin.Context) {
 
 		_, err := fmt.Fprintln(w, scanner.Text())
 		if err != nil {
-			log.ErrorKernel(err)
+			log.Error(err)
 			return false
 		}
 		return true
@@ -250,7 +250,7 @@ func handlePullDockerImage(c *gin.Context) {
 
 		_, err := fmt.Fprintln(w, scanner.Text())
 		if err != nil {
-			log.ErrorKernel(err)
+			log.Error(err)
 			return false
 		}
 		return true
@@ -282,7 +282,7 @@ func handleBuildDockerImage(c *gin.Context) {
 
 	c.Stream(func(w io.Writer) bool {
 		if scanner.Err() != nil {
-			log.ErrorKernel(scanner.Err())
+			log.Error(scanner.Err())
 			return false
 		}
 
@@ -292,7 +292,7 @@ func handleBuildDockerImage(c *gin.Context) {
 
 		_, err := io.WriteString(w, scanner.Text()+"\n")
 		if err != nil {
-			log.ErrorKernel(err)
+			log.Error(err)
 			return false
 		}
 		return true

router/router_kernel.go

@@ -52,7 +52,7 @@ func (r *KernelRouter) Start() error {
 	}
 
 	url := "http://localhost:6131"
-	log.InfoKernel("vertex-kernel started",
+	log.Info("vertex-kernel started",
 		vlog.String("url", url),
 	)
 

services/ssk_kernel.go

@@ -35,7 +35,7 @@ func NewSSHKernelService(params *SSHKernelServiceParams) SSHKernelService {
 		var err error
 		s.authorizedKeysPath, err = getAuthorizedKeysPath()
 		if err != nil {
-			log.ErrorKernel(err)
+			log.Error(err)
 		}
 	}
 
@@ -45,7 +45,7 @@ func NewSSHKernelService(params *SSHKernelServiceParams) SSHKernelService {
 func (s *SSHKernelService) GetAll() ([]types.PublicKey, error) {
 	bytes, err := os.ReadFile(s.authorizedKeysPath)
 	if err != nil && errors.Is(err, os.ErrNotExist) {
-		log.InfoKernel("authorized_keys file does not exist")
+		log.Info("authorized_keys file does not exist")
 		return []types.PublicKey{}, nil
 	} else if err != nil {
 		return nil, err