Move bind filter to different package

Signed-off-by: Gabriel Adrian Samfira <[email protected]>

.github/workflows/ci.yml

@@ -70,7 +70,12 @@ jobs:
       - uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
-      - run: go test -gcflags=all=-d=checkptr -v ./...
+      - name: Run tests on ltsc 2019
+        if: matrix.os == 'windows-2019'
+        run: go test -gcflags=all=-d=checkptr -v --test.run="[^TestEnsureOnlyOneTargetCanBeMounted|^TestGetBindMappings|^TestRemoveFileBinding]" ./...
+      - name: Run tests
+        if: matrix.os != 'windows-2019'
+        run: go test -gcflags=all=-d=checkptr -v ./...
 
   build:
     name: Build Repo

bind_filter.go → pkg/bindfilter/bind_filter.go

@@ -1,7 +1,7 @@
 //go:build windows
 // +build windows
 
-package winio
+package bindfilter
 
 import (
 	"bytes"
@@ -18,12 +18,15 @@ import (
 	"golang.org/x/sys/windows"
 )
 
+//go:generate go run github.com/Microsoft/go-winio/tools/mkwinsyscall -output zsyscall_windows.go ./bind_filter.go
 //sys bfSetupFilter(jobHandle windows.Handle, flags uint32, virtRootPath *uint16, virtTargetPath *uint16, virtExceptions **uint16, virtExceptionPathCount uint32) (hr error) = bindfltapi.BfSetupFilter?
 //sys bfRemoveMapping(jobHandle windows.Handle, virtRootPath *uint16)  (hr error) = bindfltapi.BfRemoveMapping?
 //sys bfGetMappings(flags uint32, jobHandle windows.Handle, virtRootPath *uint16, sid *windows.SID, bufferSize *uint32, outBuffer uintptr)  (hr error) = bindfltapi.BfGetMappings?
 
 // BfSetupFilter flags. See:
 // https://github.com/microsoft/BuildXL/blob/a6dce509f0d4f774255e5fbfb75fa6d5290ed163/Public/Src/Utilities/Native/Processes/Windows/NativeContainerUtilities.cs#L193-L240
+//
+//nolint:revive // var-naming: ALL_CAPS
 const (
 	BINDFLT_FLAG_READ_ONLY_MAPPING uint32 = 0x00000001
 	// Generates a merged binding, mapping target entries to the virtualization root.
@@ -48,6 +51,7 @@ const (
 	BINDFLT_FLAG_BATCHED_REMOVE_MAPPINGS uint32 = 0x20000000
 )
 
+//nolint:revive // var-naming: ALL_CAPS
 const (
 	BINDFLT_GET_MAPPINGS_FLAG_VOLUME uint32 = 0x00000001
 	BINDFLT_GET_MAPPINGS_FLAG_SILO   uint32 = 0x00000002
@@ -128,7 +132,7 @@ func GetBindMappings(volumePath string) ([]BindMapping, error) {
 		return nil, err
 	}
 
-	var flags uint32 = BINDFLT_GET_MAPPINGS_FLAG_VOLUME
+	flags := BINDFLT_GET_MAPPINGS_FLAG_VOLUME
 	// allocate a large buffer for results
 	var outBuffSize uint32 = 256 * 1024
 	buf := make([]byte, outBuffSize)
@@ -224,7 +228,7 @@ func getTargetsFromBuffer(buffer []byte, offset, count int) ([]string, error) {
 		if len(buffer) < int(tgt.TargetRootOffset)+int(tgt.TargetRootLength) {
 			return nil, fmt.Errorf("invalid buffer")
 		}
-		decoded, err := decodeEntry(buffer[tgt.TargetRootOffset : uint32(tgt.TargetRootOffset)+uint32(tgt.TargetRootLength)])
+		decoded, err := decodeEntry(buffer[tgt.TargetRootOffset : tgt.TargetRootOffset+tgt.TargetRootLength])
 		if err != nil {
 			return nil, fmt.Errorf("decoding name: %w", err)
 		}

bind_filter_test.go → pkg/bindfilter/bind_filter_test.go

@@ -1,7 +1,7 @@
 //go:build windows
 // +build windows
 
-package winio
+package bindfilter
 
 import (
 	"errors"
@@ -23,11 +23,11 @@ func TestApplyFileBinding(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer RemoveFileBinding(destination)
+	defer removeFileBinding(t, destination)
 
 	data := []byte("bind filter test")
 
-	if err := os.WriteFile(srcFile, data, 0755); err != nil {
+	if err := os.WriteFile(srcFile, data, 0600); err != nil {
 		t.Fatal(err)
 	}
 
@@ -51,6 +51,12 @@ func TestApplyFileBinding(t *testing.T) {
 	}
 }
 
+func removeFileBinding(t *testing.T, mountpoint string) {
+	if err := RemoveFileBinding(mountpoint); err != nil {
+		t.Logf("failed to remove file binding from %s: %q", mountpoint, err)
+	}
+}
+
 func TestApplyFileBindingReadOnly(t *testing.T) {
 	source := t.TempDir()
 	destination := t.TempDir()
@@ -62,11 +68,11 @@ func TestApplyFileBindingReadOnly(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer RemoveFileBinding(destination)
+	defer removeFileBinding(t, destination)
 
 	data := []byte("bind filter test")
 
-	if err := os.WriteFile(srcFile, data, 0755); err != nil {
+	if err := os.WriteFile(srcFile, data, 0600); err != nil {
 		t.Fatal(err)
 	}
 
@@ -99,10 +105,11 @@ func TestEnsureOnlyOneTargetCanBeMounted(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	defer RemoveFileBinding(destination)
+	defer removeFileBinding(t, destination)
+
 	err = ApplyFileBinding(destination, secondarySource, false)
 	if err == nil {
-		RemoveFileBinding(destination)
+		removeFileBinding(t, destination)
 		t.Fatalf("we should not be able to mount multiple targets in the same destination")
 	}
 }
@@ -150,7 +157,7 @@ func TestGetBindMappings(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer RemoveFileBinding(destination)
+	defer removeFileBinding(t, destination)
 
 	hasMapping, err := checkSourceIsMountedOnDestination(source, destination)
 	if err != nil {
@@ -177,32 +184,30 @@ func TestRemoveFileBinding(t *testing.T) {
 		t.Fatalf("failed to get long path")
 	}
 
-	err = ApplyFileBinding(destination, source, false)
-	if err != nil {
+	fileName := "testFile.txt"
+	srcFile := filepath.Join(source, fileName)
+	dstFile := filepath.Join(destination, fileName)
+	data := []byte("bind filter test")
+
+	if err := os.WriteFile(srcFile, data, 0600); err != nil {
 		t.Fatal(err)
 	}
 
-	hasMapping, err := checkSourceIsMountedOnDestination(source, destination)
+	err = ApplyFileBinding(destination, source, false)
 	if err != nil {
-		RemoveFileBinding(destination)
 		t.Fatal(err)
 	}
+	defer removeFileBinding(t, destination)
 
-	if !hasMapping {
-		RemoveFileBinding(destination)
-		t.Fatalf("expected to find %s mounted on %s, but could not", source, destination)
+	if _, err := os.Stat(dstFile); err != nil {
+		t.Fatalf("expected to find %s, but did not", dstFile)
 	}
 
 	if err := RemoveFileBinding(destination); err != nil {
 		t.Fatal(err)
 	}
 
-	hasMapping, err = checkSourceIsMountedOnDestination(source, destination)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if hasMapping {
-		t.Fatalf("expected to find %s unmounted from %s, but it seems to still be mounted", source, destination)
+	if _, err := os.Stat(dstFile); err == nil {
+		t.Fatalf("expected %s to be gone, but it not", dstFile)
 	}
 }