Fix building/running of permissions tests on Windows

Author: chrissawer

extractor_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/arduino/go-paths-helper"
 	"github.com/codeclysm/extract/v4"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/sys/unix"
 )
 
 func TestExtractors(t *testing.T) {
@@ -264,8 +263,8 @@ func TestSymLinkMazeHardening(t *testing.T) {
 
 func TestUnixPermissions(t *testing.T) {
 	// Disable user's umask to enable creation of files with any permission, restore it after the test
-	userUmask := unix.Umask(0)
-	defer unix.Umask(userUmask)
+	userUmask := UnixUmaskZero()
+	defer UnixUmask(userUmask)
 
 	archiveFilenames := []string{
 		"testdata/permissions.zip",
@@ -287,11 +286,11 @@ func TestUnixPermissions(t *testing.T) {
 			if strings.HasPrefix(filename, "dir") {
 				desiredPermString, _ := strings.CutPrefix(filename, "dir")
 				desiredPerms, _ := strconv.ParseUint(desiredPermString, 8, 32)
-				require.Equal(t, os.ModeDir|os.FileMode(desiredPerms), info.Mode())
+				require.Equal(t, os.ModeDir|os.FileMode(OsDirPerms(desiredPerms)), info.Mode())
 			} else if strings.HasPrefix(filename, "file") {
 				desiredPermString, _ := strings.CutPrefix(filename, "file")
 				desiredPerms, _ := strconv.ParseUint(desiredPermString, 8, 32)
-				require.Equal(t, os.FileMode(desiredPerms), info.Mode())
+				require.Equal(t, os.FileMode(OsFilePerms(desiredPerms)), info.Mode())
 			}
 			return nil
 		})
@@ -300,8 +299,8 @@ func TestUnixPermissions(t *testing.T) {
 
 func TestZipDirectoryPermissions(t *testing.T) {
 	// Disable user's umask to enable creation of files with any permission, restore it after the test
-	userUmask := unix.Umask(0)
-	defer unix.Umask(userUmask)
+	userUmask := UnixUmaskZero()
+	defer UnixUmask(userUmask)
 
 	// This arduino library has files before their containing directories in the zip,
 	// so a good test case that these directory permissions are created correctly
@@ -321,9 +320,9 @@ func TestZipDirectoryPermissions(t *testing.T) {
 		// Test files and directories (excluding the parent) match permissions from the zip file
 		if path != tmp.String() {
 			if info.IsDir() {
-				require.Equal(t, os.ModeDir|os.FileMode(0755), info.Mode())
+				require.Equal(t, os.ModeDir|os.FileMode(OsDirPerms(0755)), info.Mode())
 			} else {
-				require.Equal(t, os.FileMode(0644), info.Mode())
+				require.Equal(t, os.FileMode(OsFilePerms(0644)), info.Mode())
 			}
 		}
 		return nil

umask_unix_test.go

@@ -0,0 +1,21 @@
+//go:build !windows
+
+package extract_test
+
+import "golang.org/x/sys/unix"
+
+func UnixUmaskZero() int {
+	return unix.Umask(0)
+}
+
+func UnixUmask(userUmask int) {
+	unix.Umask(userUmask)
+}
+
+func OsFilePerms(unixPerms uint64) uint64 {
+	return unixPerms
+}
+
+func OsDirPerms(unixPerms uint64) uint64 {
+	return unixPerms
+}

umask_windows_test.go

@@ -0,0 +1,21 @@
+//go:build windows
+
+package extract_test
+
+func UnixUmaskZero() int {
+	return 0
+}
+
+func UnixUmask(userUmask int) {
+}
+
+func OsFilePerms(unixPerms uint64) uint64 {
+	// Go on Windows just uses 666/444 for files depending on whether "read only" is set
+	globalPerms := unixPerms >> 6
+	return globalPerms | (globalPerms << 3) | (globalPerms << 6)
+}
+
+func OsDirPerms(unixPerms uint64) uint64 {
+	// Go on Windows just uses 777 for directories
+	return 0777
+}