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>
82 lines
1.9 KiB
Go
82 lines
1.9 KiB
Go
// Copyright 2019+ Klaus Post. All rights reserved.
|
|
// License information can be found in the LICENSE file.
|
|
// Based on work by Yann Collet, released under BSD License.
|
|
|
|
package zstd
|
|
|
|
// byteReader provides a byte reader that reads
|
|
// little endian values from a byte stream.
|
|
// The input stream is manually advanced.
|
|
// The reader performs no bounds checks.
|
|
type byteReader struct {
|
|
b []byte
|
|
off int
|
|
}
|
|
|
|
// advance the stream b n bytes.
|
|
func (b *byteReader) advance(n uint) {
|
|
b.off += int(n)
|
|
}
|
|
|
|
// overread returns whether we have advanced too far.
|
|
func (b *byteReader) overread() bool {
|
|
return b.off > len(b.b)
|
|
}
|
|
|
|
// Int32 returns a little endian int32 starting at current offset.
|
|
func (b byteReader) Int32() int32 {
|
|
b2 := b.b[b.off:]
|
|
b2 = b2[:4]
|
|
v3 := int32(b2[3])
|
|
v2 := int32(b2[2])
|
|
v1 := int32(b2[1])
|
|
v0 := int32(b2[0])
|
|
return v0 | (v1 << 8) | (v2 << 16) | (v3 << 24)
|
|
}
|
|
|
|
// Uint8 returns the next byte
|
|
func (b *byteReader) Uint8() uint8 {
|
|
v := b.b[b.off]
|
|
return v
|
|
}
|
|
|
|
// Uint32 returns a little endian uint32 starting at current offset.
|
|
func (b byteReader) Uint32() uint32 {
|
|
if r := b.remain(); r < 4 {
|
|
// Very rare
|
|
v := uint32(0)
|
|
for i := 1; i <= r; i++ {
|
|
v = (v << 8) | uint32(b.b[len(b.b)-i])
|
|
}
|
|
return v
|
|
}
|
|
b2 := b.b[b.off:]
|
|
b2 = b2[:4]
|
|
v3 := uint32(b2[3])
|
|
v2 := uint32(b2[2])
|
|
v1 := uint32(b2[1])
|
|
v0 := uint32(b2[0])
|
|
return v0 | (v1 << 8) | (v2 << 16) | (v3 << 24)
|
|
}
|
|
|
|
// Uint32NC returns a little endian uint32 starting at current offset.
|
|
// The caller must be sure if there are at least 4 bytes left.
|
|
func (b byteReader) Uint32NC() uint32 {
|
|
b2 := b.b[b.off:]
|
|
b2 = b2[:4]
|
|
v3 := uint32(b2[3])
|
|
v2 := uint32(b2[2])
|
|
v1 := uint32(b2[1])
|
|
v0 := uint32(b2[0])
|
|
return v0 | (v1 << 8) | (v2 << 16) | (v3 << 24)
|
|
}
|
|
|
|
// unread returns the unread portion of the input.
|
|
func (b byteReader) unread() []byte {
|
|
return b.b[b.off:]
|
|
}
|
|
|
|
// remain will return the number of bytes remaining.
|
|
func (b byteReader) remain() int {
|
|
return len(b.b) - b.off
|
|
}
|