
Go 1.15.7 contained a security fix for CVE-2021-3115, which allowed arbitrary code to be executed at build time when using cgo on Windows. This issue also affects Unix users who have “.” listed explicitly in their PATH and are running “go get” outside of a module or with module mode disabled. This issue is not limited to the go command itself, and can also affect binaries that use `os.Command`, `os.LookPath`, etc. From the related blogpost (ttps://blog.golang.org/path-security): > Are your own programs affected? > > If you use exec.LookPath or exec.Command in your own programs, you only need to > be concerned if you (or your users) run your program in a directory with untrusted > contents. If so, then a subprocess could be started using an executable from dot > instead of from a system directory. (Again, using an executable from dot happens > always on Windows and only with uncommon PATH settings on Unix.) > > If you are concerned, then we’ve published the more restricted variant of os/exec > as golang.org/x/sys/execabs. You can use it in your program by simply replacing This patch replaces all uses of `os/exec` with `golang.org/x/sys/execabs`. While some uses of `os/exec` should not be problematic (e.g. part of tests), it is probably good to be consistent, in case code gets moved around. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
209 lines
5.7 KiB
Go
209 lines
5.7 KiB
Go
//go:build linux && !no_btrfs && cgo
|
|
// +build linux,!no_btrfs,cgo
|
|
|
|
/*
|
|
Copyright The containerd Authors.
|
|
|
|
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 btrfs
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/containerd/containerd/mount"
|
|
"github.com/containerd/containerd/pkg/testutil"
|
|
"github.com/containerd/containerd/plugin"
|
|
"github.com/containerd/containerd/snapshots"
|
|
"github.com/containerd/containerd/snapshots/testsuite"
|
|
"github.com/containerd/continuity/testutil/loopback"
|
|
"github.com/pkg/errors"
|
|
exec "golang.org/x/sys/execabs"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snapshotter, func() error, error) {
|
|
mkbtrfs, err := exec.LookPath("mkfs.btrfs")
|
|
if err != nil {
|
|
t.Skipf("could not find mkfs.btrfs: %v", err)
|
|
}
|
|
|
|
procModules, err := ioutil.ReadFile("/proc/modules")
|
|
if err == nil && !bytes.Contains(procModules, []byte("btrfs")) {
|
|
t.Skip("check for btrfs kernel module failed, skipping test")
|
|
}
|
|
|
|
return func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {
|
|
|
|
loopbackSize := int64(128 << 20) // 128 MB
|
|
// mkfs.btrfs creates a fs which has a blocksize equal to the system default pagesize. If that pagesize
|
|
// is > 4KB, mounting the fs will fail unless we increase the size of the file used by mkfs.btrfs
|
|
if os.Getpagesize() > 4096 {
|
|
loopbackSize = int64(650 << 20) // 650 MB
|
|
}
|
|
loop, err := loopback.New(loopbackSize)
|
|
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
if out, err := exec.Command(mkbtrfs, loop.Device).CombinedOutput(); err != nil {
|
|
loop.Close()
|
|
return nil, nil, errors.Wrapf(err, "failed to make btrfs filesystem (out: %q)", out)
|
|
}
|
|
// sync after a mkfs on the loopback before trying to mount the device
|
|
unix.Sync()
|
|
|
|
var snapshotter snapshots.Snapshotter
|
|
for i := 0; i < 5; i++ {
|
|
if out, err := exec.Command("mount", loop.Device, root).CombinedOutput(); err != nil {
|
|
loop.Close()
|
|
return nil, nil, errors.Wrapf(err, "failed to mount device %s (out: %q)", loop.Device, out)
|
|
}
|
|
|
|
if i > 0 {
|
|
time.Sleep(10 * time.Duration(i) * time.Millisecond)
|
|
}
|
|
|
|
snapshotter, err = NewSnapshotter(root)
|
|
if err == nil {
|
|
break
|
|
} else if !errors.Is(err, plugin.ErrSkipPlugin) {
|
|
return nil, nil, err
|
|
}
|
|
|
|
t.Logf("Attempt %d to create btrfs snapshotter failed: %#v", i+1, err)
|
|
|
|
// unmount and try again
|
|
unix.Unmount(root, 0)
|
|
}
|
|
if snapshotter == nil {
|
|
return nil, nil, errors.Wrap(err, "failed to successfully create snapshotter after 5 attempts")
|
|
}
|
|
|
|
return snapshotter, func() error {
|
|
if err := snapshotter.Close(); err != nil {
|
|
return err
|
|
}
|
|
err := mount.UnmountAll(root, unix.MNT_DETACH)
|
|
if cerr := loop.Close(); cerr != nil {
|
|
err = errors.Wrap(cerr, "device cleanup failed")
|
|
}
|
|
return err
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
func TestBtrfs(t *testing.T) {
|
|
testutil.RequiresRoot(t)
|
|
testsuite.SnapshotterSuite(t, "Btrfs", boltSnapshotter(t))
|
|
}
|
|
|
|
func TestBtrfsMounts(t *testing.T) {
|
|
testutil.RequiresRoot(t)
|
|
ctx := context.Background()
|
|
|
|
// create temporary directory for mount point
|
|
mountPoint, err := ioutil.TempDir("", "containerd-btrfs-test")
|
|
if err != nil {
|
|
t.Fatal("could not create mount point for btrfs test", err)
|
|
}
|
|
defer os.RemoveAll(mountPoint)
|
|
t.Log("temporary mount point created", mountPoint)
|
|
|
|
root, err := ioutil.TempDir(mountPoint, "TestBtrfsPrepare-")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.RemoveAll(root)
|
|
|
|
b, c, err := boltSnapshotter(t)(ctx, root)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer c()
|
|
|
|
target := filepath.Join(root, "test")
|
|
mounts, err := b.Prepare(ctx, target, "")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Log(mounts)
|
|
|
|
for _, mount := range mounts {
|
|
if mount.Type != "btrfs" {
|
|
t.Fatalf("wrong mount type: %v != btrfs", mount.Type)
|
|
}
|
|
|
|
// assumes the first, maybe incorrect in the future
|
|
if !strings.HasPrefix(mount.Options[0], "subvolid=") {
|
|
t.Fatalf("no subvolid option in %v", mount.Options)
|
|
}
|
|
}
|
|
|
|
if err := os.MkdirAll(target, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := mount.All(mounts, target); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer testutil.Unmount(t, target)
|
|
|
|
// write in some data
|
|
if err := ioutil.WriteFile(filepath.Join(target, "foo"), []byte("content"), 0777); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// TODO(stevvooe): We don't really make this with the driver, but that
|
|
// might prove annoying in practice.
|
|
if err := os.MkdirAll(filepath.Join(root, "snapshots"), 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if err := b.Commit(ctx, filepath.Join(root, "snapshots/committed"), filepath.Join(root, "test")); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
target = filepath.Join(root, "test2")
|
|
mounts, err = b.Prepare(ctx, target, filepath.Join(root, "snapshots/committed"))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if err := os.MkdirAll(target, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if err := mount.All(mounts, target); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer testutil.Unmount(t, target)
|
|
|
|
// TODO(stevvooe): Verify contents of "foo"
|
|
if err := ioutil.WriteFile(filepath.Join(target, "bar"), []byte("content"), 0777); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if err := b.Commit(ctx, filepath.Join(root, "snapshots/committed2"), target); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|