dependency inject stdio from serpent cli

cli/cli.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"context"
 	"fmt"
+	"io"
 	"log/slog"
 	"os"
 	"os/signal"
@@ -61,7 +62,7 @@ Examples:
 			},
 		},
 		Handler: func(inv *serpent.Invocation) error {
-			return Run(config, inv.Args)
+			return Run(config, inv.Stdin, inv.Stdout, inv.Stderr, inv.Args)
 		},
 	}
 }
@@ -91,7 +92,7 @@ func setupLogging(logLevel string) *slog.Logger {
 }
 
 // Run executes the jail command with the given configuration and arguments
-func Run(config Config, args []string) error {
+func Run(config Config, stdin io.Reader, stdout, stderr io.Writer, args []string) error {
 	logger := setupLogging(config.LogLevel)
 
 	// Get command arguments
@@ -211,7 +212,14 @@ func Run(config Config, args []string) error {
 	// Execute command in jail
 	go func() {
 		defer cancel()
-		err := jailInstance.Command(args).Run()
+		cmd := jailInstance.Command(args)
+
+		// Inject the stdout and stderr from the serpent cli.
+		cmd.Stdout = stdout
+		cmd.Stderr = stderr
+		cmd.Stdin = stdin
+
+		err := cmd.Run()
 		if err != nil {
 			logger.Error("Command execution failed", "error", err)
 		}

cli/cli_test.go

@@ -46,27 +46,15 @@ func (m *MockPTY) Clear() {
 	m.stderr = strings.Builder{}
 }
 
-func (m *MockPTY) ExpectMatch(content string) {
+func (m *MockPTY) ExpectInStdout(content string) {
 	if !strings.Contains(m.stdout.String(), content) {
 		m.t.Fatalf("expected \"%s\", got: %s", content, m.stdout.String())
 	}
 }
 
-func (m *MockPTY) ExpectError(content string) {
+func (m *MockPTY) ExpectInStderr(content string) {
 	if !strings.Contains(m.stderr.String(), content) {
-		m.t.Fatalf("expected error with \"%s\", got: %s", content, m.stderr.String())
-	}
-}
-
-func (m *MockPTY) RequireError() {
-	if m.stderr.String() == "" {
-		m.t.Fatal("expected error")
-	}
-}
-
-func (m *MockPTY) RequireNoError() {
-	if m.stderr.String() != "" {
-		m.t.Fatalf("expected nothing in stderr, but got: %s", m.stderr.String())
+		m.t.Fatalf("expected \"%s\", got: %s", content, m.stderr.String())
 	}
 }
 
@@ -81,22 +69,30 @@ func TestPtySetupWorks(t *testing.T) {
 		t.Fatalf("could not run with simple --help arg: %v", err)
 	}
 
-	pty.RequireNoError()
-	pty.ExpectMatch("Monitor and restrict HTTP/HTTPS requests from processes")
+	pty.ExpectInStdout("Monitor and restrict HTTP/HTTPS requests from processes")
 }
 
-func TestCurlGithub(t *testing.T) {
+// For these tests, I have a fixture in the form of a pastebin: https://pastebin.com/raw/2q6kyAyQ
+func TestCurlPastebin(t *testing.T) {
 	ensureRoot(t)
-
 	cmd := NewCommand()
-	inv := cmd.Invoke("--allow", "\"github.com\"", "--", "curl", "https://github.com")
+	inv := cmd.Invoke("--allow", "\"pastebin.com\"", "--", "curl", "https://pastebin.com/raw/2q6kyAyQ")
 
 	pty := NewMockPTY(t)
 	pty.Attach(inv)
 
 	if err := inv.Run(); err != nil {
-		t.Fatalf("error curling github: %v", err)
+		t.Fatalf("error curling pastebin test fixture: %v", err)
 	}
+	pty.ExpectInStdout("foo")
+	pty.Clear()
 
-	pty.RequireNoError()
+	// Allowing all with a glob should allow the request
+	inv = cmd.Invoke("--allow", "*", "--", "curl", "https://pastebin.com/raw/2q6kyAyQ")
+	pty.Attach(inv)
+	if err := inv.Run(); err != nil {
+		t.Fatalf("error curling pastebin test fixture: %v", err)
+	}
+	pty.ExpectInStdout("foo")
+	pty.Clear()
 }

namespace/linux.go

@@ -142,9 +142,6 @@ func (l *Linux) Command(command []string) *exec.Cmd {
 		env = append(env, fmt.Sprintf("%s=%s", key, value))
 	}
 	cmd.Env = env
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
 
 	// Use prepared process attributes from Open method
 	cmd.SysProcAttr = l.procAttr
@@ -300,4 +297,4 @@ func (l *Linux) removeNamespace() error {
 		return fmt.Errorf("failed to remove namespace: %v", err)
 	}
 	return nil
-}
+}

namespace/macos.go

@@ -143,9 +143,6 @@ func (m *MacOSNetJail) Command(command []string) *exec.Cmd {
 		env = append(env, fmt.Sprintf("%s=%s", key, value))
 	}
 	cmd.Env = env
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Stdin = os.Stdin
 
 	// Use prepared process attributes from Open method
 	cmd.SysProcAttr = m.procAttr
@@ -367,4 +364,4 @@ func (m *MacOSNetJail) cleanupTempFiles() {
 	if m.mainRulesPath != "" {
 		os.Remove(m.mainRulesPath)
 	}
-}
+}

namespace/namespace.go

@@ -33,4 +33,4 @@ func New(config Config, logger *slog.Logger) (jail.Commander, error) {
 
 func newNamespaceName() string {
 	return fmt.Sprintf("%s_%d", namespacePrefix, time.Now().UnixNano()%10000000)
-}
+}