chore: wip - writing output to file

internal/commands/create.go

@@ -127,31 +127,39 @@ func Create(opts *CreateOpts, log *zerolog.Logger) error {
 
 		cloneFlags = cloneFlags | flag
 	}
+
+	var capabilityFlags []uintptr
+	// for _, cap := range spec.Process.Capabilities.Ambient {
+	// 	capabilityFlags = append(capabilityFlags, uintptr(pkg.Capabilities[cap]))
+	// }
+
 	log.Info().Msg("set sysprocattr")
 	// apply configuration, e.g. devices, proc, etc...
 	forkCmd.SysProcAttr = &syscall.SysProcAttr{
+		AmbientCaps: capabilityFlags,
 		// TODO: presumably this should be clone flags from namespaces in the config spec??
 		Cloneflags: cloneFlags,
 		// Cloneflags: syscall.CLONE_NEWUTS |
 		// 	syscall.CLONE_NEWPID |
 		// 	syscall.CLONE_NEWUSER |
 		// 	syscall.CLONE_NEWNET |
 		// 	syscall.CLONE_NEWNS,
-		Unshareflags: syscall.CLONE_NEWNS,
-		UidMappings: []syscall.SysProcIDMap{
-			{
-				ContainerID: int(spec.Process.User.UID),
-				HostID:      os.Geteuid(),
-				Size:        1,
-			},
-		},
-		GidMappings: []syscall.SysProcIDMap{
-			{
-				ContainerID: int(spec.Process.User.GID),
-				HostID:      os.Getegid(),
-				Size:        1,
-			},
-		},
+		Unshareflags:               syscall.CLONE_NEWNS,
+		GidMappingsEnableSetgroups: false,
+		// UidMappings: []syscall.SysProcIDMap{
+		// 	{
+		// 		ContainerID: int(spec.Process.User.UID),
+		// 		HostID:      os.Geteuid(),
+		// 		Size:        1,
+		// 	},
+		// },
+		// GidMappings: []syscall.SysProcIDMap{
+		// 	{
+		// 		ContainerID: int(spec.Process.User.GID),
+		// 		HostID:      os.Getegid(),
+		// 		Size:        1,
+		// 	},
+		// },
 	}
 
 	forkCmd.Env = spec.Process.Env

internal/commands/fork.go

@@ -19,12 +19,13 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func server(conn net.Conn, spec specs.Spec) {
+func server(conn net.Conn, containerID string, spec specs.Spec, log *zerolog.Logger) {
 	defer conn.Close()
 
 	b := make([]byte, 128)
 
 	for {
+		log.Info().Msg("reading in fork...")
 		n, err := conn.Read(b)
 		if err != nil {
 			// TODO: log it
@@ -37,12 +38,31 @@ func server(conn net.Conn, spec specs.Spec) {
 
 		switch string(b[:n]) {
 		case "start":
+			log.Info().Msg("fork received 'start' command")
+			log.Info().Str("command", spec.Process.Args[0]).Msg("command")
+			log.Info().Str("args", strings.Join(spec.Process.Args[:1], ",")).Msg("args")
 			cmd := exec.Command(spec.Process.Args[0], spec.Process.Args[1:]...)
-			cmd.Stdout = conn
-			cmd.Stderr = conn
+
+			log.Info().Msg("opening out.txt for writing")
+			f, err := os.OpenFile(
+				"out.txt",
+				os.O_APPEND|os.O_CREATE|os.O_WRONLY,
+				0644,
+			)
+			if err != nil {
+				log.Error().Err(err).Msg("open out file")
+			}
+			abs, _ := filepath.Abs(f.Name())
+			log.Info().Str("name", abs).Msg("out file")
+			cmd.Stdout = f
+			cmd.Stderr = f
 			if err := cmd.Run(); err != nil {
+				log.Error().Err(err).Msg("error executing underlying command")
 				conn.Write([]byte(err.Error()))
+			} else {
+				conn.Write([]byte("apparently executed successfully???"))
 			}
+
 			return
 		}
 	}
@@ -261,8 +281,7 @@ func Fork(opts *ForkOpts, log *zerolog.Logger) error {
 			continue
 		}
 
-		go server(containerConn, spec)
+		go server(containerConn, opts.ID, spec, log)
 	}
 
-	return nil
 }

internal/commands/start.go

@@ -73,6 +73,11 @@ func Start(opts *StartOpts, log *zerolog.Logger) error {
 		return fmt.Errorf("send start over ipc: %w", err)
 	}
 
+	state.Status = specs.StateRunning
+	if err := internal.SaveState(state); err != nil {
+		log.Error().Err(err).Msg("failed to save state")
+	}
+
 	log.Info().Msg("reading from connection")
 	b, err := io.ReadAll(conn)
 	if err != nil {
@@ -84,12 +89,6 @@ func Start(opts *StartOpts, log *zerolog.Logger) error {
 	// presumably this needs to be redirected to the pty (if specified in config)?
 	log.Info().Str("output", string(b)).Msg("run command output")
 	fmt.Fprint(os.Stdout, string(b))
-	f, _ := os.OpenFile(
-		"out.txt",
-		os.O_APPEND|os.O_CREATE|os.O_WRONLY,
-		0644,
-	)
-	f.Write(b)
 	conn.Write(b)
 
 	// 9. Invoke poststart hooks
@@ -101,5 +100,10 @@ func Start(opts *StartOpts, log *zerolog.Logger) error {
 		}
 	}
 
+	state.Status = specs.StateStopped
+	if err := internal.SaveState(state); err != nil {
+		return fmt.Errorf("save state: %w", err)
+	}
+
 	return nil
 }

main.go

@@ -23,7 +23,8 @@ func main() {
 
 	log := zerolog.New(logfile).With().Timestamp().Logger()
 
-	if err := cmd.RootCmd(&log).Execute(); err != nil {
+	rootCmd := cmd.RootCmd(&log)
+	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}

pkg/capabilities.go

@@ -0,0 +1,3 @@
+package pkg
+
+var Capabilities = map[string]uintptr{}