rootFS tests

Author: evict

internal/servegit/gitservice.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"context"
+	"io"
 	"net/http"
 	"os"
 	"os/exec"
@@ -77,7 +78,7 @@ type Handler struct {
 	// failed, it will pass in a non-nil error.
 	Trace func(ctx context.Context, svc, repo, protocol string) func(error)
 
-	// RootFS is a traversal safe API that ensures file outside of the
+	// RootFS is a traversal safe API that ensures files outside of the
 	// root cannot be opened.
 	RootFS *os.Root
 }
@@ -108,7 +109,10 @@ func (s *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if _, err = s.RootFS.Stat(dir); os.IsNotExist(err) {
+	// os.Root only accepts relative paths from it's root. So we trim the
+	// prefix.
+	relDir := strings.TrimPrefix(dir, s.RootFS.Name()+string(os.PathSeparator))
+	if _, err = s.RootFS.Stat(relDir); os.IsNotExist(err) {
 		http.Error(w, "repository not found", http.StatusNotFound)
 		return
 	} else if err != nil {

internal/servegit/gitservice_test.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"net/http/httptest"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -31,10 +32,16 @@ func TestHandler(t *testing.T) {
 		runCmd(t, repo, "git", "tag", fmt.Sprintf("v%d", i+1))
 	}
 
+	rootFS, err := os.OpenRoot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	ts := httptest.NewServer(&Handler{
 		Dir: func(_ context.Context, s string) (string, error) {
 			return filepath.Join(root, s, ".git"), nil
 		},
+		RootFS: rootFS,
 	})
 	defer ts.Close()
 

internal/servegit/serve_test.go

@@ -36,13 +36,20 @@ func TestReposHandler(t *testing.T) {
 	}}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+
 			root := gitInitRepos(t, tc.repos...)
 
+			rootFS, err := os.OpenRoot(root)
+			if err != nil {
+				t.Fatal(err)
+			}
+
 			h := (&Serve{
-				Info:  testLogger(t),
-				Debug: discardLogger,
-				Addr:  testAddress,
-				Root:  root,
+				Info:   testLogger(t),
+				Debug:  discardLogger,
+				Addr:   testAddress,
+				Root:   root,
+				RootFS: rootFS,
 			}).handler()
 
 			var want []Repo
@@ -134,6 +141,11 @@ func gitInitRepos(t *testing.T, names ...string) string {
 	root := t.TempDir()
 	root = filepath.Join(root, "repos-root")
 
+	err := os.Mkdir(root, 0755)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	for _, name := range names {
 		p := filepath.Join(root, name)
 		if err := os.MkdirAll(p, 0755); err != nil {
@@ -161,10 +173,16 @@ func TestIgnoreGitSubmodules(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	rootFS, err := os.OpenRoot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	repos, err := (&Serve{
-		Info:  testLogger(t),
-		Debug: discardLogger,
-		Root:  root,
+		Info:   testLogger(t),
+		Debug:  discardLogger,
+		Root:   root,
+		RootFS: rootFS,
 	}).Repos()
 	if err != nil {
 		t.Fatal(err)
@@ -201,6 +219,6 @@ type testWriter struct {
 }
 
 func (tw testWriter) Write(p []byte) (n int, err error) {
-	tw.T.Log(string(p))
+	tw.Log(string(p))
 	return len(p), nil
 }