simplification

Author: Brian McCallister

Makefile

@@ -0,0 +1,37 @@
+DOCKER_TEST_SSHD_VERSION := 4
+
+.PHONY: all
+all: test build		## run tests and build binaries
+
+epithet-agent:
+	go build ./cmd/epithet-agent
+
+epithet-ca:
+	go build ./cmd/epithet-ca
+
+.PHONY: build
+build: epithet-agent epithet-ca
+
+.PHONY: test
+test: test-support	## build and run test plumbing
+	go test ./...
+
+test/test_sshd/.built_$(DOCKER_TEST_SSHD_VERSION):
+	cd test/test_sshd; docker build -t brianm/epithet-test-sshd:$(DOCKER_TEST_SSHD_VERSION) .; touch .built_$(DOCKER_TEST_SSHD_VERSION)
+
+.PHONY: test-support
+test-support: test/test_sshd/.built_$(DOCKER_TEST_SSHD_VERSION)
+
+.PHONY: clean
+clean:			## clean all local resources
+	go clean ./...
+	rm -f epithet-*
+	
+.PHONY: clean-all
+clean-all: clean
+	rm -f test/test_sshd/.built_*
+	docker rmi -f brianm/epithet-test-sshd:$(DOCKER_TEST_SSHD_VERSION)
+
+.PHONY: help
+help:			## Show this help.
+	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'

cmd/epithet-agent/epithet-agent.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"os/exec"
@@ -26,15 +25,12 @@ func main() {
 }
 
 func run(cc *cobra.Command, args []string) error {
+	a, err := agent.Start()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	a, err := agent.Start(agent.WithContext(ctx))
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		<-sigs
-		fmt.Println("exiting")
-		cancel()
 		a.Close()
 	}()
 
@@ -62,7 +58,7 @@ func run(cc *cobra.Command, args []string) error {
 	cmd.Env = fixEnv(a.AuthSocketPath(), os.Environ())
 
 	err = cmd.Run()
-	cancel()
+	a.Close()
 	return err
 }
 

internal/agent/agent_test.go

@@ -1,7 +1,6 @@
 package agent
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"net"
@@ -15,32 +14,27 @@ import (
 )
 
 func TestBasics(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	closer, port, err := startServer()
+	a, err := Start()
 	require.NoError(t, err)
-	defer closer()
 
-	a, err := Start(WithContext(ctx))
+	server, err := startServer()
 	require.NoError(t, err)
+	defer server.Close()
 
 	err = a.UseCredential(Credential{
 		PrivateKey:  []byte(privateKey),
 		Certificate: []byte(certificate),
 	})
 	require.NoError(t, err)
 
-	cmd := exec.Command("ssh", "-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no", "-p", port, "root@localhost", "ls", "/etc/ssh/")
-	cmd.Env = fixEnv(a.AuthSocketPath(), os.Environ())
-
-	out, err := cmd.CombinedOutput()
+	out, err := server.ssh(a, "ls", "/etc/ssh/")
 
+	fmt.Printf(out)
 	require.NoError(t, err)
 
-	require.Contains(t, string(out), "sshd_config")
-	require.Contains(t, string(out), "auth_principals")
-	require.Contains(t, string(out), "ca.pub")
+	require.Contains(t, out, "sshd_config")
+	require.Contains(t, out, "auth_principals")
+	require.Contains(t, out, "ca.pub")
 
 	err = a.Close()
 	require.NoError(t, err)
@@ -61,13 +55,32 @@ func fixEnv(path string, env []string) []string {
 	return append(newEnv, fmt.Sprintf("SSH_AUTH_SOCK=%s", path))
 }
 
-func startServer() (closer func(), port string, err error) {
+type sshServer struct {
+	*dockertest.Resource
+}
+
+func (s sshServer) Port() string {
+	return s.GetPort("22/tcp")
+}
+
+func (s sshServer) ssh(a *Agent, args ...string) (string, error) {
+	argv := []string{"-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no", "-p", s.Port(), "root@localhost"}
+	for _, v := range args {
+		argv = append(argv, v)
+	}
+	cmd := exec.Command("ssh", argv...)
+	cmd.Env = fixEnv(a.AuthSocketPath(), os.Environ())
+	bs, err := cmd.CombinedOutput()
+	return string(bs), err
+}
+
+func startServer() (*sshServer, error) {
 	pool, err := dockertest.NewPool("")
 	if err != nil {
 		log.Fatalf("Could not connect to docker: %s", err)
 	}
 	// pulls an image, creates a container based on it and runs it
-	resource, err := pool.Run("sshd", "3", []string{})
+	resource, err := pool.Run("brianm/epithet-test-sshd", "4", []string{})
 	if err != nil {
 		log.Fatalf("Could not start resource: %s", err)
 	}
@@ -83,10 +96,10 @@ func startServer() (closer func(), port string, err error) {
 		conn.Close()
 		return nil
 	}); err != nil {
-		return nil, "", fmt.Errorf("Could not connect to docker: %w", err)
+		return nil, fmt.Errorf("Could not connect to docker: %w", err)
 	}
 
-	return func() { resource.Close() }, resource.GetPort("22/tcp"), err
+	return &sshServer{resource}, err
 }
 
 const privateKey = `-----BEGIN OPENSSH PRIVATE KEY-----

play/PLAY.md

@@ -0,0 +1 @@
+.built_*