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>
67 lines
2.1 KiB
Go
67 lines
2.1 KiB
Go
package mountinfo
|
|
|
|
import (
|
|
"os"
|
|
)
|
|
|
|
// GetMounts retrieves a list of mounts for the current running process,
|
|
// with an optional filter applied (use nil for no filter).
|
|
func GetMounts(f FilterFunc) ([]*Info, error) {
|
|
return parseMountTable(f)
|
|
}
|
|
|
|
// Mounted determines if a specified path is a mount point. In case of any
|
|
// error, false (and an error) is returned.
|
|
//
|
|
// 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).
|
|
func Mounted(path string) (bool, error) {
|
|
// root is always mounted
|
|
if path == string(os.PathSeparator) {
|
|
return true, nil
|
|
}
|
|
return mounted(path)
|
|
}
|
|
|
|
// Info reveals information about a particular mounted filesystem. This
|
|
// struct is populated from the content in the /proc/<pid>/mountinfo file.
|
|
type Info struct {
|
|
// ID is a unique identifier of the mount (may be reused after umount).
|
|
ID int
|
|
|
|
// Parent is the ID of the parent mount (or of self for the root
|
|
// of this mount namespace's mount tree).
|
|
Parent int
|
|
|
|
// Major and Minor are the major and the minor components of the Dev
|
|
// field of unix.Stat_t structure returned by unix.*Stat calls for
|
|
// files on this filesystem.
|
|
Major, Minor int
|
|
|
|
// Root is the pathname of the directory in the filesystem which forms
|
|
// the root of this mount.
|
|
Root string
|
|
|
|
// Mountpoint is the pathname of the mount point relative to the
|
|
// process's root directory.
|
|
Mountpoint string
|
|
|
|
// Options is a comma-separated list of mount options.
|
|
Options string
|
|
|
|
// Optional are zero or more fields of the form "tag[:value]",
|
|
// separated by a space. Currently, the possible optional fields are
|
|
// "shared", "master", "propagate_from", and "unbindable". For more
|
|
// information, see mount_namespaces(7) Linux man page.
|
|
Optional string
|
|
|
|
// FSType is the filesystem type in the form "type[.subtype]".
|
|
FSType string
|
|
|
|
// Source is filesystem-specific information, or "none".
|
|
Source string
|
|
|
|
// VFSOptions is a comma-separated list of superblock options.
|
|
VFSOptions string
|
|
}
|