Provide system dependend wrapper for unix.Mknod

FreeBSD support 64bit inodes so it requires that dev provided to
unix.Mknod is type uint64. This commit creates wrapper for unix.Mknod
to fix this issue.

Signed-off-by: Mateusz Kwiatkowski <[email protected]>

oci/layer/generate_linux_test.go

@@ -32,7 +32,7 @@ func TestInsertLayerTranslateOverlayWhiteouts(t *testing.T) {
 	}
 
 	testNode := path.Join(dir, "test")
-	err = unix.Mknod(testNode, unix.S_IFCHR|0666, int(unix.Mkdev(0, 0)))
+	err = system.Mknod(testNode, unix.S_IFCHR|0666, int(unix.Mkdev(0, 0)))
 	assert.NoError(err)
 
 	packOptions := RepackOptions{TranslateOverlayWhiteouts: true}
@@ -69,7 +69,7 @@ func TestGenerateLayerTranslateOverlayWhiteouts(t *testing.T) {
 	}
 
 	testNode := path.Join(dir, "test")
-	err = unix.Mknod(testNode, unix.S_IFCHR|0666, int(unix.Mkdev(0, 0)))
+	err = system.Mknod(testNode, unix.S_IFCHR|0666, int(unix.Mkdev(0, 0)))
 	assert.NoError(err)
 
 	packOptions := RepackOptions{TranslateOverlayWhiteouts: true}

oci/layer/tar_extract_linux_test.go

@@ -31,7 +31,7 @@ import (
 
 func canMknod(dir string) (bool, error) {
 	testNode := filepath.Join(dir, "test")
-	err := unix.Mknod(testNode, unix.S_IFCHR|0666, int(unix.Mkdev(0, 0)))
+	err := system.Mknod(testNode, unix.S_IFCHR|0666, int(unix.Mkdev(0, 0)))
 	if err != nil {
 		if os.IsPermission(err) {
 			return false, nil

pkg/fseval/fseval_default.go

@@ -105,7 +105,7 @@ func (fs osFsEval) RemoveAll(path string) error {
 
 // Mknod is equivalent to unix.Mknod.
 func (fs osFsEval) Mknod(path string, mode os.FileMode, dev uint64) error {
-	return unix.Mknod(path, uint32(mode), int(dev))
+	return unix.Mknod(path, uint32(mode), dev)
 }
 
 // MkdirAll is equivalent to os.MkdirAll.

pkg/system/mknod_unix.go → pkg/system/mknod_freebsd.go

@@ -23,6 +23,10 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+func Mknod(path string, mode uint32, dev uint64) error {
+        return unix.Mknod(path, mode, dev)
+}
+
 // Tarmode takes a Typeflag (from a tar.Header for example) and returns the
 // corresponding os.Filemode bit. Unknown typeflags are treated like regular
 // files.

pkg/system/mknod_linux.go

@@ -0,0 +1,47 @@
+/*
+ * umoci: Umoci Modifies Open Containers' Images
+ * Copyright (C) 2016-2020 SUSE LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package system
+
+import (
+	"archive/tar"
+
+	"golang.org/x/sys/unix"
+)
+
+func Mknod(path string, mode uint32, dev uint64) error {
+        return unix.Mknod(path, mode, dev)
+}
+
+// Tarmode takes a Typeflag (from a tar.Header for example) and returns the
+// corresponding os.Filemode bit. Unknown typeflags are treated like regular
+// files.
+func Tarmode(typeflag byte) uint32 {
+	switch typeflag {
+	case tar.TypeSymlink:
+		return unix.S_IFLNK
+	case tar.TypeChar:
+		return unix.S_IFCHR
+	case tar.TypeBlock:
+		return unix.S_IFBLK
+	case tar.TypeFifo:
+		return unix.S_IFIFO
+	case tar.TypeDir:
+		return unix.S_IFDIR
+	}
+	return 0
+}

pkg/system/mknod_linux_test.go

@@ -0,0 +1,45 @@
+/*
+ * umoci: Umoci Modifies Open Containers' Images
+ * Copyright (C) 2016-2020 SUSE LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package system
+
+import (
+	"archive/tar"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+// Exhaustive test for Tarmode mapping.
+func TestTarmode(t *testing.T) {
+	for _, test := range []struct {
+		typeflag byte
+		mode     uint32
+	}{
+		{tar.TypeReg, 0},
+		{tar.TypeSymlink, unix.S_IFLNK},
+		{tar.TypeChar, unix.S_IFCHR},
+		{tar.TypeBlock, unix.S_IFBLK},
+		{tar.TypeFifo, unix.S_IFIFO},
+		{tar.TypeDir, unix.S_IFDIR},
+	} {
+		mode := Tarmode(test.typeflag)
+		if mode != test.mode {
+			t.Errorf("got unexpected mode %x with tar typeflag %x, expected %x", mode, test.typeflag, test.mode)
+		}
+	}
+}

pkg/unpriv/unpriv.go

@@ -451,7 +451,7 @@ func MkdirAll(path string, perm os.FileMode) error {
 // required access bits to modify or resolve the path.
 func Mknod(path string, mode os.FileMode, dev uint64) error {
 	return errors.Wrap(Wrap(path, func(path string) error {
-		return unix.Mknod(path, uint32(mode), int(dev))
+		return system.Mknod(path, uint32(mode), dev)
 	}), "unpriv.mknod")
 }