Version 5.22 introduced a new option to /etc/containers/policy.json called
keyPaths, see
https://github.com/containers/image/pull/1609
EL9 immediately took advantage of this new feature and started using it, see
04645c4a84
This quickly became an issue in our code: The go library (containers/image)
parses the configuration file very strictly and refuses to create a client
when policy.json with an unknown key is present on the filesystem. As we
used 5.21.1 that doesn't know the new key, our unit tests started to
failing when containers-common was present.
Reproducer:
podman run --pull=always --rm -it centos:stream9
dnf install -y dnf-plugins-core
dnf config-manager --set-enabled crb
dnf install -y gpgme-devel libassuan-devel krb5-devel golang git-core
git clone https://github.com/osbuild/osbuild-composer
cd osbuild-composer
# install the new containers-common and run the test
dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/44.el9/x86_64/containers-common-1-44.el9.x86_64.rpm
go test -count 1 ./...
# this returns:
--- FAIL: TestClientResolve (0.00s)
client_test.go:31:
Error Trace: client_test.go:31
Error: Received unexpected error:
Unknown key "keyPaths"
invalid policy in "/etc/containers/policy.json"
github.com/containers/image/v5/signature.NewPolicyFromFile
/osbuild-composer/vendor/github.com/containers/image/v5/signature/policy_config.go:88
github.com/osbuild/osbuild-composer/internal/container.NewClient
/osbuild-composer/internal/container/client.go:123
github.com/osbuild/osbuild-composer/internal/container_test.TestClientResolve
/osbuild-composer/internal/container/client_test.go:29
testing.tRunner
/usr/lib/golang/src/testing/testing.go:1439
runtime.goexit
/usr/lib/golang/src/runtime/asm_amd64.s:1571
Test: TestClientResolve
client_test.go:32:
Error Trace: client_test.go:32
Error: Expected value not to be nil.
Test: TestClientResolve
When run with an older containers-common, it succeeds:
dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/40.el9/x86_64/containers-common-1-40.el9.x86_64.rpm
go test -count 1 ./...
PASS
To sum it up, I had to upgrade github.com/containers/image/v5 to v5.22.0.
Unfortunately, this wasn't so simple, see
go get github.com/containers/image/v5@latest
go: github.com/containers/image/v5@v5.22.0 requires
github.com/letsencrypt/boulder@v0.0.0-20220331220046-b23ab962616e requires
github.com/honeycombio/beeline-go@v1.1.1 requires
github.com/gobuffalo/pop/v5@v5.3.1 requires
github.com/mattn/go-sqlite3@v2.0.3+incompatible: reading github.com/mattn/go-sqlite3/go.mod at revision v2.0.3: unknown revision v2.0.3
It turns out that github.com/mattn/go-sqlite3@v2.0.3+incompatible has been
recently retracted https://github.com/mattn/go-sqlite3/pull/998 and this
broke a ton of packages depending on it. I was able to fix it by adding
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
to our go.mod, see
https://github.com/mattn/go-sqlite3/issues/975#issuecomment-955661657
After adding it,
go get github.com/containers/image/v5@latest
succeeded and tools/prepare-source.sh took care of the rest.
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
101 lines
3 KiB
Go
101 lines
3 KiB
Go
package mountinfo
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
// MountedFast is a method of detecting a mount point without reading
|
|
// mountinfo from procfs. A caller can only trust the result if no error
|
|
// and sure == true are returned. Otherwise, other methods (e.g. parsing
|
|
// /proc/mounts) have to be used. If unsure, use Mounted instead (which
|
|
// uses MountedFast, but falls back to parsing mountinfo if needed).
|
|
//
|
|
// If a non-existent path is specified, an appropriate error is returned.
|
|
// In case the caller is not interested in this particular error, it should
|
|
// be handled separately using e.g. errors.Is(err, fs.ErrNotExist).
|
|
//
|
|
// This function is only available on Linux. When available (since kernel
|
|
// v5.6), openat2(2) syscall is used to reliably detect all mounts. Otherwise,
|
|
// the implementation falls back to using stat(2), which can reliably detect
|
|
// normal (but not bind) mounts.
|
|
func MountedFast(path string) (mounted, sure bool, err error) {
|
|
// Root is always mounted.
|
|
if path == string(os.PathSeparator) {
|
|
return true, true, nil
|
|
}
|
|
|
|
path, err = normalizePath(path)
|
|
if err != nil {
|
|
return false, false, err
|
|
}
|
|
mounted, sure, err = mountedFast(path)
|
|
return
|
|
}
|
|
|
|
// mountedByOpenat2 is a method of detecting a mount that works for all kinds
|
|
// of mounts (incl. bind mounts), but requires a recent (v5.6+) linux kernel.
|
|
func mountedByOpenat2(path string) (bool, error) {
|
|
dir, last := filepath.Split(path)
|
|
|
|
dirfd, err := unix.Openat2(unix.AT_FDCWD, dir, &unix.OpenHow{
|
|
Flags: unix.O_PATH | unix.O_CLOEXEC,
|
|
})
|
|
if err != nil {
|
|
return false, &os.PathError{Op: "openat2", Path: dir, Err: err}
|
|
}
|
|
fd, err := unix.Openat2(dirfd, last, &unix.OpenHow{
|
|
Flags: unix.O_PATH | unix.O_CLOEXEC | unix.O_NOFOLLOW,
|
|
Resolve: unix.RESOLVE_NO_XDEV,
|
|
})
|
|
_ = unix.Close(dirfd)
|
|
switch err { //nolint:errorlint // unix errors are bare
|
|
case nil: // definitely not a mount
|
|
_ = unix.Close(fd)
|
|
return false, nil
|
|
case unix.EXDEV: // definitely a mount
|
|
return true, nil
|
|
}
|
|
// not sure
|
|
return false, &os.PathError{Op: "openat2", Path: path, Err: err}
|
|
}
|
|
|
|
// mountedFast is similar to MountedFast, except it expects a normalized path.
|
|
func mountedFast(path string) (mounted, sure bool, err error) {
|
|
// Root is always mounted.
|
|
if path == string(os.PathSeparator) {
|
|
return true, true, nil
|
|
}
|
|
|
|
// Try a fast path, using openat2() with RESOLVE_NO_XDEV.
|
|
mounted, err = mountedByOpenat2(path)
|
|
if err == nil {
|
|
return mounted, true, nil
|
|
}
|
|
|
|
// Another fast path: compare st.st_dev fields.
|
|
mounted, err = mountedByStat(path)
|
|
// This does not work for bind mounts, so false negative
|
|
// is possible, therefore only trust if return is true.
|
|
if mounted && err == nil {
|
|
return true, true, nil
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func mounted(path string) (bool, error) {
|
|
path, err := normalizePath(path)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
mounted, sure, err := mountedFast(path)
|
|
if sure && err == nil {
|
|
return mounted, nil
|
|
}
|
|
|
|
// Fallback to parsing mountinfo.
|
|
return mountedByMountinfo(path)
|
|
}
|