Merge pull request #86 from xibz/jailer_update

Updating jailer to be compatible with v0.16.0

Author: xibz

.buildkite/pipeline.yml

@@ -45,8 +45,8 @@ steps:
   - label: ':hammer: root tests'
     commands:
       - 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
-      - 'cp /usr/local/bin/firecracker-v0.15.0 testdata/firecracker'
-      - 'cp /usr/local/bin/jailer-v0.15.0 testdata/jailer'
+      - 'cp /usr/local/bin/firecracker-v0.16.0 testdata/firecracker'
+      - 'cp /usr/local/bin/jailer-v0.16.0 testdata/jailer'
       - "sudo FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1'"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"

CHANGELOG.md

@@ -1,6 +1,8 @@
 # [ Unreleased ]
 
-* Fixes bug where default socketpath would always be used when not using jailer (#84)
+* Fixes bug where context was not being used at all during startVM (#86)
+* Updates the jailer's socket path to point to the unix socket in the jailer's workspace (#86)
+* Fixes bug where default socketpath would always be used when not using jailer (#84).
 
 # 0.15.1
 

jailer.go

@@ -94,6 +94,8 @@ type JailerConfig struct {
 	Stdout io.Writer
 	// Stderr specifies the IO writer for STDERR to use when spawning the jailer.
 	Stderr io.Writer
+	// Stdin specifies the IO reader for STDIN to use when spawning the jailer.
+	Stdin io.Reader
 }
 
 // JailerCommandBuilder will build a jailer command. This can be used to
@@ -288,14 +290,14 @@ func (b JailerCommandBuilder) Build(ctx context.Context) *exec.Cmd {
 // Jail will set up proper handlers and remove configuration validation due to
 // stating of files
 func jail(ctx context.Context, m *Machine, cfg *Config) error {
-	rootfs := ""
+	jailerWorkspaceDir := ""
 	if len(cfg.JailerCfg.ChrootBaseDir) > 0 {
-		rootfs = filepath.Join(cfg.JailerCfg.ChrootBaseDir, "firecracker", cfg.JailerCfg.ID)
+		jailerWorkspaceDir = filepath.Join(cfg.JailerCfg.ChrootBaseDir, "firecracker", cfg.JailerCfg.ID, rootfsFolderName)
 	} else {
-		rootfs = filepath.Join(defaultJailerPath, cfg.JailerCfg.ID)
+		jailerWorkspaceDir = filepath.Join(defaultJailerPath, cfg.JailerCfg.ID, rootfsFolderName)
 	}
 
-	cfg.SocketPath = filepath.Join(rootfs, "api.socket")
+	cfg.SocketPath = filepath.Join(jailerWorkspaceDir, "api.socket")
 
 	stdout := cfg.JailerCfg.Stdout
 	if stdout == nil {
@@ -307,6 +309,11 @@ func jail(ctx context.Context, m *Machine, cfg *Config) error {
 		stderr = os.Stderr
 	}
 
+	stdin := cfg.JailerCfg.Stdin
+	if stdin == nil {
+		stdin = os.Stdin
+	}
+
 	m.cmd = NewJailerCommandBuilder().
 		WithID(cfg.JailerCfg.ID).
 		WithUID(*cfg.JailerCfg.UID).
@@ -318,6 +325,7 @@ func jail(ctx context.Context, m *Machine, cfg *Config) error {
 		WithSeccompLevel(cfg.JailerCfg.SeccompLevel).
 		WithStdout(stdout).
 		WithStderr(stderr).
+		WithStdin(stdin).
 		Build(ctx)
 
 	if err := cfg.JailerCfg.ChrootStrategy.AdaptHandlers(&m.Handlers); err != nil {

jailer_test.go

@@ -146,7 +146,7 @@ func TestJail(t *testing.T) {
 		t.Errorf("expected args %v, but received %v", e, a)
 	}
 
-	if e, a := filepath.Join(defaultJailerPath, cfg.JailerCfg.ID, "api.socket"), cfg.SocketPath; e != a {
+	if e, a := filepath.Join(defaultJailerPath, cfg.JailerCfg.ID, rootfsFolderName, "api.socket"), cfg.SocketPath; e != a {
 		t.Errorf("expected socket path %q, but received %q", e, a)
 	}
 

machine.go

@@ -366,8 +366,13 @@ func (m *Machine) startVMM(ctx context.Context) error {
 		return err
 	}
 	go func() {
-		err := <-errCh
-		m.err = err
+		select {
+		case <-ctx.Done():
+			m.err = ctx.Err()
+		case err := <-errCh:
+			m.err = err
+		}
+
 		close(m.exitCh)
 	}()